Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix PseudoTerminal events #12146

Merged
merged 3 commits into from
Mar 21, 2023
Merged

Fix PseudoTerminal events #12146

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7eff40
Ensure correct pseudoterminal ID
thegecko Feb 3, 2023
8a64ece
Merge branch 'master' into terminal-events
thegecko Mar 20, 2023
9fbc668
Revert terminal-main.ts
thegecko Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/plugin-ext/src/main/browser/terminal-main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,22 @@ export class TerminalServiceMainImpl implements TerminalServiceMain, TerminalLin
protected async trackTerminal(terminal: TerminalWidget): Promise<void> {
let name = terminal.title.label;
this.extProxy.$terminalCreated(terminal.id, name);

const updateTitle = () => {
if (name !== terminal.title.label) {
name = terminal.title.label;
this.extProxy.$terminalNameChanged(terminal.id, name);
}
};
terminal.title.changed.connect(updateTitle);
this.toDispose.push(Disposable.create(() => terminal.title.changed.disconnect(updateTitle)));

const updateProcessId = () => terminal.processId.then(
processId => this.extProxy.$terminalOpened(terminal.id, processId, terminal.terminalId, terminal.dimensions.cols, terminal.dimensions.rows),
() => {/* no-op */ }
);

updateProcessId();
terminal.title.changed.connect(updateTitle);
thegecko marked this conversation as resolved.
Show resolved Hide resolved
this.toDispose.push(Disposable.create(() => terminal.title.changed.disconnect(updateTitle)));
this.toDispose.push(terminal.onDidOpen(() => updateProcessId()));
this.toDispose.push(terminal.onTerminalDidClose(term => this.extProxy.$terminalClosed(term.id, term.exitStatus)));
this.toDispose.push(terminal.onSizeChanged(({ cols, rows }) => {
Expand Down
13 changes: 12 additions & 1 deletion packages/plugin-ext/src/plugin/terminal-ext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
thegecko marked this conversation as resolved.
Show resolved Hide resolved
this._pseudoTerminals.set(id, pseudo);
}
this._pseudoTerminals.delete(tId);
}

const pseudoTerminal = this._pseudoTerminals.get(id);
if (pseudoTerminal) {
pseudoTerminal.emitOnOpen(cols, rows);
}
Expand Down