@codingame/monaco-vscode-api 1.81.8-next.3 → 1.82.0-next.0

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.js

@@ -11,11 +11,10 @@ import { debounce } from 'monaco-editor/esm/vs/base/common/decorators.js';
 import { onUnexpectedError, ErrorNoTelemetry } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { template } from 'monaco-editor/esm/vs/base/common/labels.js';
-import { Disposable, toDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable, MutableDisposable, toDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import * as path from 'monaco-editor/esm/vs/base/common/path.js';
 import { OS, isMacintosh, isWindows } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { TabFocus } from 'monaco-editor/esm/vs/editor/browser/config/tabFocus.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
@@ -72,6 +71,7 @@ import { IPathService } from '../../../services/path/common/pathService.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { Terminal } from 'xterm';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+var TerminalInstance_1;
 let xtermConstructor;
 const shellIntegrationSupportedShellTypes = [
     "bash" ,
@@ -80,6 +80,7 @@ const shellIntegrationSupportedShellTypes = [
     "pwsh"
 ];
 let TerminalInstance = class TerminalInstance extends Disposable {
+    static { TerminalInstance_1 = this; }
     static { this._instanceIdCounter = 1; }
     get domElement() { return this._wrapperElement; }
     get usedShellIntegrationInjection() { return this._usedShellIntegrationInjection; }
@@ -130,7 +131,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     get exitCode() { return this._exitCode; }
     get exitReason() { return this._exitReason; }
     get hadFocusOnExit() { return this._hadFocusOnExit; }
-    get isTitleSetByProcess() { return !!this._messageTitleDisposable; }
+    get isTitleSetByProcess() { return !!this._messageTitleDisposable.value; }
     get shellLaunchConfig() { return this._shellLaunchConfig; }
     get shellType() { return this._shellType; }
     get os() { return this._processManager.os; }
@@ -208,7 +209,9 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._layoutSettingsChanged = true;
         this._areLinksReady = false;
         this._initialDataEvents = [];
+        this._messageTitleDisposable = this._register(( new MutableDisposable()));
         this._widgetManager = ( new TerminalWidgetManager());
+        this._dndObserver = this._register(( new MutableDisposable()));
         this._processName = '';
         this._usedShellIntegrationInjection = false;
         this.capabilities = ( new TerminalCapabilityStoreMultiplexer());
@@ -253,6 +256,8 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this.onRequestAddInstanceToGroup = this._onRequestAddInstanceToGroup.event;
         this._onDidChangeHasChildProcesses = this._register(( new Emitter()));
         this.onDidChangeHasChildProcesses = this._onDidChangeHasChildProcesses.event;
+        this._onDidRunText = this._register(( new Emitter()));
+        this.onDidRunText = this._onDidRunText.event;
         this._wrapperElement = document.createElement('div');
         this._wrapperElement.classList.add('terminal-wrapper');
         this._skipTerminalCommands = [];
@@ -260,7 +265,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._hadFocusOnExit = false;
         this._isVisible = false;
         this._isDisposed = false;
-        this._instanceId = TerminalInstance._instanceIdCounter++;
+        this._instanceId = TerminalInstance_1._instanceIdCounter++;
         this._hasHadInput = false;
         this._fixedRows = _shellLaunchConfig.attachPersistentProcess?.fixedDimensions?.rows;
         this._fixedCols = _shellLaunchConfig.attachPersistentProcess?.fixedDimensions?.cols;
@@ -280,12 +285,12 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 path: this._shellLaunchConfig.cwd
             })) : this._shellLaunchConfig.cwd;
             if (cwdUri) {
-                this._workspaceFolder = withNullAsUndefined(this._workspaceContextService.getWorkspaceFolder(cwdUri));
+                this._workspaceFolder = this._workspaceContextService.getWorkspaceFolder(cwdUri) ?? undefined;
             }
         }
         if (!this._workspaceFolder) {
             const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot();
-            this._workspaceFolder = activeWorkspaceRootUri ? withNullAsUndefined(this._workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
+            this._workspaceFolder = activeWorkspaceRootUri ? this._workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri) ?? undefined : undefined;
         }
         const scopedContextKeyService = this._register(_contextKeyService.createScoped(this._wrapperElement));
         this._scopedInstantiationService = instantiationService.createChild(( new ServiceCollection([IContextKeyService, scopedContextKeyService])));
@@ -295,7 +300,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._terminalAltBufferActiveContextKey = TerminalContextKeys.altBufferActive.bindTo(scopedContextKeyService);
         this._terminalShellIntegrationEnabledContextKey = TerminalContextKeys.terminalShellIntegrationEnabled.bindTo(scopedContextKeyService);
         this._logService.trace(`terminalInstance#ctor (instanceId: ${this.instanceId})`, this._shellLaunchConfig);
-        this._register(this.capabilities.onDidAddCapability(e => {
+        this._register(this.capabilities.onDidAddCapabilityType(e => {
             this._logService.debug('terminalInstance added capability', e);
             if (e === 0 ) {
                 this.capabilities.get(0 )?.onDidChangeCwd(e => {
@@ -313,7 +318,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 });
             }
         }));
-        this._register(this.capabilities.onDidRemoveCapability(e => this._logService.debug('terminalInstance removed capability', e)));
+        this._register(this.capabilities.onDidRemoveCapabilityType(e => this._logService.debug('terminalInstance removed capability', e)));
         if (!this.shellLaunchConfig.executable && !workbenchEnvironmentService.remoteAuthority) {
             this._terminalProfileResolverService.resolveIcon(this._shellLaunchConfig, OS);
         }
@@ -324,7 +329,6 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this.statusList = this._scopedInstantiationService.createInstance(TerminalStatusList);
         this._initDimensions();
         this._processManager = this._createProcessManager();
-        this._register(toDisposable(() => this._dndObserver?.dispose()));
         this._containerReadyBarrier = ( new AutoOpenBarrier(100 ));
         this._attachBarrier = ( new AutoOpenBarrier(1000));
         this._xtermReadyPromise = this._createXterm();
@@ -388,10 +392,10 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             if (e.affectsConfiguration("terminal.integrated.tabs.title" ) ||
                 e.affectsConfiguration("terminal.integrated.tabs.separator" ) ||
                 e.affectsConfiguration("terminal.integrated.tabs.description" )) {
-                this._labelComputer?.refreshLabel();
+                this._labelComputer?.refreshLabel(this);
             }
         }));
-        this._register(this._workspaceContextService.onDidChangeWorkspaceFolders(() => this._labelComputer?.refreshLabel()));
+        this._register(this._workspaceContextService.onDidChangeWorkspaceFolders(() => this._labelComputer?.refreshLabel(this)));
         this._register(this.onDidBlur(() => this.xterm?.suggestController?.hideSuggestWidget()));
         let initialDataEventsTimeout = window.setTimeout(() => {
             initialDataEventsTimeout = undefined;
@@ -421,6 +425,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             });
             this.onDisposed(() => {
                 contribution.dispose();
+                this._contributions.delete(desc.id);
+                if ('instance' in contribution) {
+                    delete contribution.instance;
+                }
+                if ('_instance' in contribution) {
+                    delete contribution._instance;
+                }
             });
         }
     }
@@ -482,9 +493,9 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         return dimension.width;
     }
     _setLastKnownColsAndRows() {
-        if (TerminalInstance._lastKnownGridDimensions) {
-            this._cols = TerminalInstance._lastKnownGridDimensions.cols;
-            this._rows = TerminalInstance._lastKnownGridDimensions.rows;
+        if (TerminalInstance_1._lastKnownGridDimensions) {
+            this._cols = TerminalInstance_1._lastKnownGridDimensions.cols;
+            this._rows = TerminalInstance_1._lastKnownGridDimensions.rows;
         }
     }
     _fireMaximumDimensionsChanged() {
@@ -501,8 +512,8 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         const computedStyle = window.getComputedStyle(this.xterm.raw.element);
         const horizontalPadding = parseInt(computedStyle.paddingLeft) + parseInt(computedStyle.paddingRight);
         const verticalPadding = parseInt(computedStyle.paddingTop) + parseInt(computedStyle.paddingBottom);
-        TerminalInstance._lastKnownCanvasDimensions = new dom.Dimension(Math.min(8000 , width - horizontalPadding), height + (this._hasScrollBar && !this._horizontalScrollbar ? -5  : 0) - 2  - verticalPadding);
-        return TerminalInstance._lastKnownCanvasDimensions;
+        TerminalInstance_1._lastKnownCanvasDimensions = new dom.Dimension(Math.min(8000 , width - horizontalPadding), height + (this._hasScrollBar && !this._horizontalScrollbar ? -5  : 0) - 2  - verticalPadding);
+        return TerminalInstance_1._lastKnownCanvasDimensions;
     }
     get persistentProcessId() { return this._processManager.persistentProcessId; }
     get shouldPersist() { return this._processManager.shouldPersist && !this.shellLaunchConfig.isTransient && (!this.reconnectionProperties || this._configurationService.getValue('task.reconnection') === true); }
@@ -526,7 +537,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         return xtermConstructor;
     }
     async _createXterm() {
-        const Terminal = await TerminalInstance.getXtermConstructor(this._keybindingService, this._contextKeyService);
+        const Terminal = await TerminalInstance_1.getXtermConstructor(this._keybindingService, this._contextKeyService);
         if (this._isDisposed) {
             throw new ErrorNoTelemetry('Terminal disposed of during xterm.js creation');
         }
@@ -560,11 +571,11 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this.xterm.onDidRequestFocus(() => this.focus());
         this.xterm.onDidRequestSendText(e => this.sendText(e, false));
         const initialTextWrittenPromise = this._shellLaunchConfig.initialText ? ( new Promise(r => this._writeInitialText(xterm, r))) : undefined;
-        const lineDataEventAddon = ( new LineDataEventAddon(initialTextWrittenPromise));
+        const lineDataEventAddon = this._register(( new LineDataEventAddon(initialTextWrittenPromise)));
         lineDataEventAddon.onLineData(e => this._onLineData.fire(e));
         this._lineDataEventAddon = lineDataEventAddon;
         setTimeout(() => {
-            xterm.raw.onBell(() => {
+            this._register(xterm.raw.onBell(() => {
                 if (this._configHelper.config.enableBell) {
                     this.statusList.add({
                         id: "bell" ,
@@ -574,16 +585,16 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                     }, this._configHelper.config.bellDuration);
                     this._audioCueService.playSound(AudioCue.terminalBell.sound.getSound());
                 }
-            });
+            }));
         }, 1000);
-        xterm.raw.onSelectionChange(async () => this._onSelectionChange());
-        xterm.raw.buffer.onBufferChange(() => this._refreshAltBufferContextKey());
+        this._register(xterm.raw.onSelectionChange(async () => this._onSelectionChange()));
+        this._register(xterm.raw.buffer.onBufferChange(() => this._refreshAltBufferContextKey()));
         this._processManager.onProcessData(e => this._onProcessData(e));
-        xterm.raw.onData(async (data) => {
+        this._register(xterm.raw.onData(async (data) => {
             await this._processManager.write(data);
             this._onDidInputData.fire(this);
-        });
-        xterm.raw.onBinary(data => this._processManager.processBinary(data));
+        }));
+        this._register(xterm.raw.onBinary(data => this._processManager.processBinary(data)));
         this._processManager.onProcessReady(async (processTraits) => {
             if (this._processManager.os) {
                 lineDataEventAddon.setOperatingSystem(this._processManager.os);
@@ -603,7 +614,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                     this._updateProcessCwd();
                 }
             });
-            this._register(this.capabilities.onDidAddCapability(e => {
+            this._register(this.capabilities.onDidAddCapabilityType(e => {
                 if (e === 0 ) {
                     onKeyListener?.dispose();
                     onKeyListener = undefined;
@@ -718,6 +729,10 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             if (TabFocus.getTabFocusMode("terminalFocus" ) && event.key === 'Tab') {
                 return false;
             }
+            if (event.key === 'Tab' && event.shiftKey) {
+                event.preventDefault();
+                return true;
+            }
             if (isWindows && event.altKey && event.key === 'F4' && !event.ctrlKey) {
                 return false;
             }
@@ -773,14 +788,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._terminalShellIntegrationEnabledContextKey.reset();
     }
     _initDragAndDrop(container) {
-        this._dndObserver?.dispose();
-        const dndController = this._scopedInstantiationService.createInstance(TerminalInstanceDragAndDropController, container);
+        const dndController = this._register(this._scopedInstantiationService.createInstance(TerminalInstanceDragAndDropController, container));
         dndController.onDropTerminal(e => this._onRequestAddInstanceToGroup.fire(e));
         dndController.onDropFile(async (path) => {
             this.focus();
             await this.sendPath(path, false);
         });
-        this._dndObserver = new dom.DragAndDropObserver(container, dndController);
+        this._dndObserver.value = new dom.DragAndDropObserver(container, dndController);
     }
     hasSelection() {
         return this.xterm ? this.xterm.raw.hasSelection() : false;
@@ -933,6 +947,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._onDidInputData.fire(this);
         this.xterm?.suggestController?.handleNonXtermData(text);
         this.xterm?.scrollToBottom();
+        this._onDidRunText.fire();
     }
     async sendPath(originalPath, addNewLine) {
         return this.sendText(await this.preparePathForShell(originalPath), addNewLine);
@@ -992,12 +1007,12 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             this._onProcessIdReady.fire(this);
             this._initialCwd = await this.getInitialCwd();
             if (!this._labelComputer) {
-                this._labelComputer = this._register(this._scopedInstantiationService.createInstance(TerminalLabelComputer, this._configHelper, this));
-                this._labelComputer.onDidChangeLabel(e => {
+                this._labelComputer = this._register(this._scopedInstantiationService.createInstance(TerminalLabelComputer, this._configHelper));
+                this._register(this._labelComputer.onDidChangeLabel(e => {
                     this._title = e.title;
                     this._description = e.description;
                     this._onTitleChanged.fire(this);
-                });
+                }));
             }
             if (this._shellLaunchConfig.name) {
                 this._setTitle(this._shellLaunchConfig.name, TitleEventSource.Api);
@@ -1005,7 +1020,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             else {
                 setTimeout(() => {
                     this._xtermReadyPromise.then(xterm => {
-                        this._messageTitleDisposable = xterm.raw.onTitleChange(e => this._onTitleChange(e));
+                        this._messageTitleDisposable.value = xterm.raw.onTitleChange(e => this._onTitleChange(e));
                     });
                 });
                 this._setTitle(this._shellLaunchConfig.executable, TitleEventSource.Process);
@@ -1016,7 +1031,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             switch (type) {
                 case "cwd" :
                     this._cwd = value;
-                    this._labelComputer?.refreshLabel();
+                    this._labelComputer?.refreshLabel(this);
                     break;
                 case "initialCwd" :
                     this._initialCwd = value;
@@ -1426,7 +1441,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 this._onDimensionsChanged.fire();
             }
             this.xterm.raw.resize(cols, rows);
-            TerminalInstance._lastKnownGridDimensions = { cols, rows };
+            TerminalInstance_1._lastKnownGridDimensions = { cols, rows };
             if (this._isVisible) {
                 this.xterm.forceUnpause();
             }
@@ -1465,7 +1480,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                     "Run the command: Toggle Screen Reader Accessibility Mode for an optimized screen reader experience"
                 )));
             }
-            const accessibilityHelpKeybinding = this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getLabel();
+            const accessibilityHelpKeybinding = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getLabel();
             if (this._configurationService.getValue("accessibility.verbosity.terminal" ) && accessibilityHelpKeybinding) {
                 labelParts.push(( nls.localize(
                     'terminalHelpAriaLabel',
@@ -1498,8 +1513,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 break;
             case TitleEventSource.Api:
                 this._staticTitle = title;
-                dispose(this._messageTitleDisposable);
-                this._messageTitleDisposable = undefined;
+                this._messageTitleDisposable.value = undefined;
                 break;
             case TitleEventSource.Sequence:
                 this._sequence = title;
@@ -1540,7 +1554,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return;
         }
         this._fixedCols = this._parseFixedDimension(cols);
-        this._labelComputer?.refreshLabel();
+        this._labelComputer?.refreshLabel(this);
         this._terminalHasFixedWidth.set(!!this._fixedCols);
         const rows = await this._quickInputService.input({
             title: ( nls.localize('setTerminalDimensionsRow', "Set Fixed Dimensions: Row")),
@@ -1551,7 +1565,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return;
         }
         this._fixedRows = this._parseFixedDimension(rows);
-        this._labelComputer?.refreshLabel();
+        this._labelComputer?.refreshLabel(this);
         await this._refreshScrollbar();
         this._resize();
         this.focus();
@@ -1585,7 +1599,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             }
         }
         await this._refreshScrollbar();
-        this._labelComputer?.refreshLabel();
+        this._labelComputer?.refreshLabel(this);
         this.focus();
     }
     _refreshScrollbar() {
@@ -1705,7 +1719,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         title = this._updateTitleProperties(title, eventSource);
         const titleChanged = title !== this._title;
         this._title = title;
-        this._labelComputer?.refreshLabel(reset);
+        this._labelComputer?.refreshLabel(this, reset);
         this._setAriaLabel(this.xterm?.raw, this._instanceId, this._title);
         if (titleChanged) {
             this._onTitleChanged.fire(this);
@@ -1797,7 +1811,7 @@ TerminalInstance.__decorator = ( __decorate([
 TerminalInstance.__decorator = ( __decorate([
     debounce(50)
 ], TerminalInstance.prototype, "_resize", null));
-TerminalInstance = ( __decorate([
+TerminalInstance = TerminalInstance_1 = ( __decorate([
     ( __param(5, IContextKeyService)),
     ( __param(6, IInstantiationService)),
     ( __param(7, ITerminalProfileResolverService)),
@@ -1834,8 +1848,8 @@ let TerminalInstanceDragAndDropController = class TerminalInstanceDragAndDropCon
         this._container = _container;
         this._layoutService = _layoutService;
         this._viewDescriptorService = _viewDescriptorService;
-        this._onDropFile = ( new Emitter());
-        this._onDropTerminal = ( new Emitter());
+        this._onDropFile = this._register(( new Emitter()));
+        this._onDropTerminal = this._register(( new Emitter()));
         this._register(toDisposable(() => this._clearDropOverlay()));
     }
     _clearDropOverlay() {
@@ -1933,10 +1947,9 @@ TerminalInstanceDragAndDropController = ( __decorate([
 let TerminalLabelComputer = class TerminalLabelComputer extends Disposable {
     get title() { return this._title; }
     get description() { return this._description; }
-    constructor(_configHelper, _instance, _fileService, _workspaceContextService) {
+    constructor(_configHelper, _fileService, _workspaceContextService) {
         super();
         this._configHelper = _configHelper;
-        this._instance = _instance;
         this._fileService = _fileService;
         this._workspaceContextService = _workspaceContextService;
         this._title = '';
@@ -1944,62 +1957,62 @@ let TerminalLabelComputer = class TerminalLabelComputer extends Disposable {
         this._onDidChangeLabel = this._register(( new Emitter()));
         this.onDidChangeLabel = this._onDidChangeLabel.event;
     }
-    refreshLabel(reset) {
-        this._title = this.computeLabel(this._configHelper.config.tabs.title, "title" , reset);
-        this._description = this.computeLabel(this._configHelper.config.tabs.description, "description" );
-        if (this._title !== this._instance.title || this._description !== this._instance.description || reset) {
+    refreshLabel(instance, reset) {
+        this._title = this.computeLabel(instance, this._configHelper.config.tabs.title, "title" , reset);
+        this._description = this.computeLabel(instance, this._configHelper.config.tabs.description, "description" );
+        if (this._title !== instance.title || this._description !== instance.description || reset) {
             this._onDidChangeLabel.fire({ title: this._title, description: this._description });
         }
     }
-    computeLabel(labelTemplate, labelType, reset) {
-        const type = this._instance.shellLaunchConfig.attachPersistentProcess?.type || this._instance.shellLaunchConfig.type;
+    computeLabel(instance, labelTemplate, labelType, reset) {
+        const type = instance.shellLaunchConfig.attachPersistentProcess?.type || instance.shellLaunchConfig.type;
         const templateProperties = {
-            cwd: this._instance.cwd || this._instance.initialCwd || '',
+            cwd: instance.cwd || instance.initialCwd || '',
             cwdFolder: '',
-            workspaceFolder: this._instance.workspaceFolder ? path.basename(this._instance.workspaceFolder.uri.fsPath) : undefined,
+            workspaceFolder: instance.workspaceFolder ? path.basename(instance.workspaceFolder.uri.fsPath) : undefined,
             local: type === 'Local' ? type : undefined,
-            process: this._instance.processName,
-            sequence: this._instance.sequence,
+            process: instance.processName,
+            sequence: instance.sequence,
             task: type === 'Task' ? type : undefined,
-            fixedDimensions: this._instance.fixedCols
-                ? (this._instance.fixedRows ? `\u2194${this._instance.fixedCols} \u2195${this._instance.fixedRows}` : `\u2194${this._instance.fixedCols}`)
-                : (this._instance.fixedRows ? `\u2195${this._instance.fixedRows}` : ''),
+            fixedDimensions: instance.fixedCols
+                ? (instance.fixedRows ? `\u2194${instance.fixedCols} \u2195${instance.fixedRows}` : `\u2194${instance.fixedCols}`)
+                : (instance.fixedRows ? `\u2195${instance.fixedRows}` : ''),
             separator: { label: this._configHelper.config.tabs.separator }
         };
         labelTemplate = labelTemplate.trim();
         if (!labelTemplate) {
-            return labelType === "title"  ? (this._instance.processName || '') : '';
+            return labelType === "title"  ? (instance.processName || '') : '';
         }
-        if (!reset && this._instance.staticTitle && labelType === "title" ) {
-            return this._instance.staticTitle.replace(/[\n\r\t]/g, '') || templateProperties.process?.replace(/[\n\r\t]/g, '') || '';
+        if (!reset && instance.staticTitle && labelType === "title" ) {
+            return instance.staticTitle.replace(/[\n\r\t]/g, '') || templateProperties.process?.replace(/[\n\r\t]/g, '') || '';
         }
-        const detection = ( this._instance.capabilities.has(0 )) || ( this._instance.capabilities.has(1 ));
+        const detection = ( instance.capabilities.has(0 )) || ( instance.capabilities.has(1 ));
         const folders = this._workspaceContextService.getWorkspace().folders;
         const multiRootWorkspace = folders.length > 1;
-        if (templateProperties.cwd && detection && ((!this._instance.shellLaunchConfig.isFeatureTerminal || labelType === "title") )) {
+        if (templateProperties.cwd && detection && ((!instance.shellLaunchConfig.isFeatureTerminal || labelType === "title") )) {
             const cwdUri = ( URI.from({
-                scheme: this._instance.workspaceFolder?.uri.scheme || Schemas.file,
-                path: this._instance.cwd ? path.resolve(this._instance.cwd) : undefined
+                scheme: instance.workspaceFolder?.uri.scheme || Schemas.file,
+                path: instance.cwd ? path.resolve(instance.cwd) : undefined
             }));
             let showCwd = false;
             if (multiRootWorkspace) {
                 showCwd = true;
             }
-            else if (this._instance.workspaceFolder?.uri) {
-                const caseSensitive = this._fileService.hasCapability(this._instance.workspaceFolder.uri, 1024 );
-                showCwd = cwdUri.fsPath.localeCompare(this._instance.workspaceFolder.uri.fsPath, undefined, { sensitivity: caseSensitive ? 'case' : 'base' }) !== 0;
+            else if (instance.workspaceFolder?.uri) {
+                const caseSensitive = this._fileService.hasCapability(instance.workspaceFolder.uri, 1024 );
+                showCwd = cwdUri.fsPath.localeCompare(instance.workspaceFolder.uri.fsPath, undefined, { sensitivity: caseSensitive ? 'case' : 'base' }) !== 0;
             }
             if (showCwd) {
                 templateProperties.cwdFolder = path.basename(templateProperties.cwd);
             }
         }
         const label = template(labelTemplate, templateProperties).replace(/[\n\r\t]/g, '').trim();
-        return label === '' && labelType === "title"  ? (this._instance.processName || '') : label;
+        return label === '' && labelType === "title"  ? (instance.processName || '') : label;
     }
 };
 TerminalLabelComputer = ( __decorate([
-    ( __param(2, IFileService)),
-    ( __param(3, IWorkspaceContextService))
+    ( __param(1, IFileService)),
+    ( __param(2, IWorkspaceContextService))
 ], TerminalLabelComputer));
 function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initialCwd) {
     if (exitCodeOrError === undefined || exitCodeOrError === 0) {

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.js

@@ -17,7 +17,7 @@ let TerminalInstanceService = class TerminalInstanceService extends Disposable {
         this._contextKeyService = _contextKeyService;
         this._environmentService = _environmentService;
         this._backendRegistration = ( new Map());
-        this._onDidCreateInstance = ( new Emitter());
+        this._onDidCreateInstance = this._register(( new Emitter()));
         this._terminalShellTypeContextKey = TerminalContextKeys.shellType.bindTo(this._contextKeyService);
         this._terminalInRunCommandPicker = TerminalContextKeys.inTerminalRunCommandPicker.bindTo(this._contextKeyService);
         this._terminalSuggestWidgetVisibleContextKey = TerminalContextKeys.suggestWidgetVisible.bindTo(this._contextKeyService);