Fix PseudoTerminal events (#12146)

* Ensure correct pseudoterminal ID Signed-off-by: thegecko <[email protected]> * Revert terminal-main.ts --------- Signed-off-by: thegecko <[email protected]>
eclipse-theia · Mar 21, 2023 · 1ca8131 · 1ca8131
1 parent fa1db70
commit 1ca8131
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/packages/plugin-ext/src/plugin/terminal-ext.ts b/packages/plugin-ext/src/plugin/terminal-ext.ts
@@ -189,7 +189,18 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
             terminal.deferredProcessId = new Deferred<number>();
             terminal.deferredProcessId.resolve(processId);
         }
-        const pseudoTerminal = this._pseudoTerminals.get(terminalId.toString());
+
+        // Switch the pseudoterminal keyed by terminalId to be keyed by terminal ID
+        const tId = terminalId.toString();
+        if (this._pseudoTerminals.has(tId)) {
+            const pseudo = this._pseudoTerminals.get(tId);
+            if (pseudo) {
+                this._pseudoTerminals.set(id, pseudo);
+            }
+            this._pseudoTerminals.delete(tId);
+        }
+
+        const pseudoTerminal = this._pseudoTerminals.get(id);
         if (pseudoTerminal) {
             pseudoTerminal.emitOnOpen(cols, rows);
         }