Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-28 08:04:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #230392 from microsoft/tyriar/230246

Browse Source 
Don't instantiate addons if terminal is disposed
This commit is contained in:
Daniel Imms
2024-10-03 06:17:46 -07:00
committed by GitHub
parent 966aacf4bb 62bd82385e
commit 02b78e955a
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+6 -1
View File
@@ -914,7 +914,12 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this.xterm?.refresh();
setTimeout(() => this._initDragAndDrop(container));
setTimeout(() => {
if (this._store.isDisposed) {
return;
}
this._initDragAndDrop(container);
}, 0);
}
/**
src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
+6
View File
@@ -266,6 +266,9 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
this._shellIntegrationAddon = new ShellIntegrationAddon(options.shellIntegrationNonce ?? '', options.disableShellIntegrationReporting, this._telemetryService, this._logService);
this.raw.loadAddon(this._shellIntegrationAddon);
this._xtermAddonLoader.importAddon('clipboard').then(ClipboardAddon => {
if (this._store.isDisposed) {
return;
}
this._clipboardAddon = this._instantiationService.createInstance(ClipboardAddon, undefined, {
async readText(type: ClipboardSelectionType): Promise<string> {
return _clipboardService.readText(type === 'p' ? 'selection' : 'clipboard');
@@ -470,6 +473,9 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
private _getSearchAddon(): Promise<SearchAddonType> {
if (!this._searchAddonPromise) {
this._searchAddonPromise = this._xtermAddonLoader.importAddon('search').then((AddonCtor) => {
if (this._store.isDisposed) {
return Promise.reject('Could not create search addon, terminal is disposed');
}
this._searchAddon = new AddonCtor({ highlightLimit: XtermTerminalConstants.SearchHighlightLimit });
this.raw.loadAddon(this._searchAddon);
this._searchAddon.onDidChangeResults((results: { resultIndex: number; resultCount: number }) => {