Skip to content

fix: memory leak in terminal suggest addon #72

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

Draft
SimonSiefke wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: memory leak in terminal suggest addon #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,6 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
this._logService.trace('SuggestAddon#_showCompletions setCompletionModel');
suggestWidget.setCompletionModel(model);

this._register(suggestWidget.onDidFocus(() => this._terminal?.focus()));
if (!this._promptInputModel || !explicitlyInvoked && model.items.length === 0) {
return;
}
Expand Down Expand Up @@ -819,6 +818,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
this._register(this._suggestWidget.onDidSelect(async e => this.acceptSelectedSuggestion(e)));
this._register(this._suggestWidget.onDidHide(() => this._terminalSuggestWidgetVisibleContextKey.reset()));
this._register(this._suggestWidget.onDidShow(() => this._terminalSuggestWidgetVisibleContextKey.set(true)));
this._register(this._suggestWidget.onDidFocus(() => this._terminal?.focus()));
this._register(this._configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration(TerminalSettingId.FontFamily) || e.affectsConfiguration(TerminalSettingId.FontSize) || e.affectsConfiguration(TerminalSettingId.LineHeight) || e.affectsConfiguration(TerminalSettingId.FontFamily) || e.affectsConfiguration('editor.fontSize') || e.affectsConfiguration('editor.fontFamily')) {
this._onDidFontConfigurationChange.fire();
Expand Down Expand Up @@ -873,11 +873,12 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
}));

// eslint-disable-next-line no-restricted-syntax
const element = this._terminal?.element?.querySelector('.xterm-helper-textarea');
if (element) {
this._register(dom.addDisposableListener(dom.getActiveDocument(), 'click', (event) => {
const terminalElement = this._terminal?.element;
const element = terminalElement?.querySelector('.xterm-helper-textarea');
if (element && terminalElement) {
this._register(dom.addDisposableListener(terminalElement.ownerDocument, 'click', (event) => {
const target = event.target as HTMLElement;
if (this._terminal?.element?.contains(target)) {
if (terminalElement.contains(target)) {
this._suggestWidget?.hide();
}
}));
Expand Down Expand Up @@ -1039,7 +1040,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
hideSuggestWidget(cancelAnyRequest: boolean): void {
this._discoverability?.resetTimer();
if (cancelAnyRequest) {
this._cancellationTokenSource?.cancel();
this._cancellationTokenSource?.dispose(true);
this._cancellationTokenSource = undefined;
// Also cancel any pending resolution requests
this._currentSuggestionDetails?.cancel();
Expand Down
Loading