Fix eclipse-theia#2961: Output of short-lived tasks is not shown

Signed-off-by: Esther Perelman <[email protected]>
EstherPerelman · Apr 22, 2021 · a02ae49 · a02ae49
1 parent df062f6
commit a02ae49
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/packages/process/src/node/process-manager.ts b/packages/process/src/node/process-manager.ts
@@ -42,7 +42,6 @@ export class ProcessManager implements BackendApplicationContribution {
     register(process: Process): number {
         const id = this.id;
         this.processes.set(id, process);
-        process.onExit(() => this.unregister(process));
         process.onError(() => this.unregister(process));
         this.id++;
         return id;
@@ -54,7 +53,7 @@ export class ProcessManager implements BackendApplicationContribution {
      *
      * @param process the process to unregister from this process manager.
      */
-    protected unregister(process: Process): void {
+    public unregister(process: Process): void {
         const processLabel = this.getProcessLabel(process);
         this.logger.debug(`Unregistering process. ${processLabel}`);
         if (!process.killed) {

diff --git a/packages/process/src/node/terminal-process.ts b/packages/process/src/node/terminal-process.ts
@@ -102,9 +102,10 @@ export class TerminalProcess extends Process {
                 // signal parameter will hold the signal number and code should
                 // be ignored.
                 if (signal === undefined || signal === 0) {
-                    this.emitOnExit(code, undefined);
+                    this.emitOnExit(code, undefined); // check if long task skip this
                 } else {
                     this.emitOnExit(undefined, signame(signal));
+                    this.unregisterProcess();
                 }
                 process.nextTick(() => {
                     if (signal === undefined || signal === 0) {
@@ -168,6 +169,10 @@ export class TerminalProcess extends Process {
         }
     }
 
+    unregisterProcess(): void {
+        this.processManager.unregister(this);
+    }
+
     resize(cols: number, rows: number): void {
         this.checkTerminal();
         this.terminal!.resize(cols, rows);

diff --git a/packages/terminal/src/browser/terminal-widget-impl.ts b/packages/terminal/src/browser/terminal-widget-impl.ts
@@ -380,6 +380,10 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget
     protected async attachTerminal(id: number): Promise<number> {
         const terminalId = await this.shellTerminalServer.attach(id);
         if (IBaseTerminalServer.validateId(terminalId)) {
+            const isProcessKilled = await this.shellTerminalServer.isProcessKilled(this.terminalId);
+            if (isProcessKilled) {
+                this.shellTerminalServer.unregisterProcess(this.terminalId);
+            }
             return terminalId;
         }
         this.logger.warn(`Failed attaching to terminal id ${id}, the terminal is most likely gone. Starting up a new terminal instead.`);

diff --git a/packages/terminal/src/common/base-terminal-protocol.ts b/packages/terminal/src/common/base-terminal-protocol.ts
@@ -29,9 +29,11 @@ export interface IBaseTerminalServer extends JsonRpcServer<IBaseTerminalClient>
     getProcessId(id: number): Promise<number>;
     getProcessInfo(id: number): Promise<TerminalProcessInfo>;
     getCwdURI(id: number): Promise<string>;
+    isProcessKilled(id: number): Promise<boolean>
     resize(id: number, cols: number, rows: number): Promise<void>;
     attach(id: number): Promise<number>;
     close(id: number): Promise<void>;
+    unregisterProcess(id: number): Promise<void>;
     getDefaultShell(): Promise<string>;
 
     /**
@@ -171,7 +173,7 @@ export interface MergedEnvironmentVariableCollection {
     /**
      * Applies this collection to a process environment.
      */
-    applyToProcessEnvironment(env: { [key: string]: string | null } ): void;
+    applyToProcessEnvironment(env: { [key: string]: string | null }): void;
 }
 
 export interface SerializableExtensionEnvironmentVariableCollection {

diff --git a/packages/terminal/src/node/base-terminal-server.ts b/packages/terminal/src/node/base-terminal-server.ts
@@ -87,6 +87,14 @@ export abstract class BaseTerminalServer implements IBaseTerminalServer {
         };
     }
 
+    async isProcessKilled(id: number): Promise<boolean> {
+        const terminal = this.processManager.get(id);
+        if (terminal instanceof TerminalProcess) {
+            return terminal.killed;
+        }
+        return false;
+    }
+
     async getCwdURI(id: number): Promise<string> {
         const terminal = this.processManager.get(id);
         if (!(terminal instanceof TerminalProcess)) {
@@ -103,6 +111,14 @@ export abstract class BaseTerminalServer implements IBaseTerminalServer {
         }
     }
 
+    async unregisterProcess(id: number): Promise<void> {
+        const term = this.processManager.get(id);
+
+        if (term instanceof TerminalProcess) {
+            term.unregisterProcess();
+        }
+    }
+
     async getDefaultShell(): Promise<string> {
         return ShellProcess.getShellExecutablePath();
     }