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

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

@@ -5,7 +5,7 @@ import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { KeyChord } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { isLinux, isWindows } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { isObject, isString, withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { isObject, isString } from 'monaco-editor/esm/vs/base/common/types.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
@@ -93,7 +93,7 @@ const terminalSendSequenceCommand = async (accessor, args) => {
         const workspaceContextService = accessor.get(IWorkspaceContextService);
         const historyService = accessor.get(IHistoryService);
         const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot(instance.isRemote ? Schemas.vscodeRemote : Schemas.file);
-        const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? withNullAsUndefined(workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
+        const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri) ?? undefined : undefined;
         const resolvedText = await configurationResolverService.resolveAsync(lastActiveWorkspaceRoot, text);
         instance.sendText(resolvedText, false);
     }
@@ -233,7 +233,7 @@ function registerTerminalActions() {
         run: (activeInstance, c) => c.service.moveToEditor(activeInstance)
     });
     registerTerminalAction({
-        id: "workbench.action.terminal.moveToEditorInstance" ,
+        id: "workbench.action.terminal.moveToEditorActiveTab" ,
         title: terminalStrings.moveToEditor,
         f1: false,
         precondition: ( ContextKeyExpr.and(( ContextKeyExpr.or(
@@ -265,16 +265,6 @@ function registerTerminalActions() {
             }
         }
     });
-    registerTerminalAction({
-        id: "workbench.action.terminal.showTabs" ,
-        title: { value: ( localize('workbench.action.terminal.showTabs', "Show Tabs")), original: 'Show Tabs' },
-        f1: false,
-        precondition: ( ContextKeyExpr.or(
-            TerminalContextKeys.processSupported,
-            TerminalContextKeys.terminalHasBeenCreated
-        )),
-        run: (c) => c.groupService.showTabs()
-    });
     registerTerminalAction({
         id: "workbench.action.terminal.focusPreviousPane" ,
         title: { value: ( localize(
@@ -465,6 +455,14 @@ function registerTerminalActions() {
     registerTerminalAction({
         id: "workbench.action.terminal.focus" ,
         title: terminalStrings.focus,
+        keybinding: {
+            when: ( ContextKeyExpr.and(
+                CONTEXT_ACCESSIBILITY_MODE_ENABLED,
+                TerminalContextKeys.accessibleBufferOnLastLine
+            )),
+            primary: 2048  | 18 ,
+            weight: 200
+        },
         precondition: ( ContextKeyExpr.or(
             TerminalContextKeys.processSupported,
             TerminalContextKeys.terminalHasBeenCreated
@@ -724,7 +722,7 @@ function registerTerminalActions() {
         run: (c) => c.groupService.activeInstance?.changeIcon()
     });
     registerTerminalAction({
-        id: "workbench.action.terminal.changeIconInstance" ,
+        id: "workbench.action.terminal.changeIconActiveTab" ,
         title: terminalStrings.changeIcon,
         f1: false,
         precondition: ( ContextKeyExpr.and(( ContextKeyExpr.or(
@@ -753,7 +751,7 @@ function registerTerminalActions() {
         run: (c) => c.groupService.activeInstance?.changeColor()
     });
     registerTerminalAction({
-        id: "workbench.action.terminal.changeColorInstance" ,
+        id: "workbench.action.terminal.changeColorActiveTab" ,
         title: terminalStrings.changeColor,
         f1: false,
         precondition: ( ContextKeyExpr.and(( ContextKeyExpr.or(
@@ -782,7 +780,7 @@ function registerTerminalActions() {
         run: (c, accessor) => renameWithQuickPick(c, accessor)
     });
     registerTerminalAction({
-        id: "workbench.action.terminal.renameInstance" ,
+        id: "workbench.action.terminal.renameActiveTab" ,
         title: terminalStrings.rename,
         f1: false,
         keybinding: {
@@ -1106,7 +1104,7 @@ function registerTerminalActions() {
         }
     });
     registerTerminalAction({
-        id: "workbench.action.terminal.splitInstance" ,
+        id: "workbench.action.terminal.splitActiveTab" ,
         title: terminalStrings.split,
         f1: false,
         keybinding: {
@@ -1142,7 +1140,7 @@ function registerTerminalActions() {
         run: (activeInstance, c) => c.groupService.unsplitInstance(activeInstance)
     });
     registerTerminalAction({
-        id: "workbench.action.terminal.unsplitInstance" ,
+        id: "workbench.action.terminal.unsplitActiveTab" ,
         title: terminalStrings.unsplit,
         f1: false,
         precondition: ( ContextKeyExpr.or(
@@ -1160,7 +1158,7 @@ function registerTerminalActions() {
         }
     });
     registerTerminalAction({
-        id: "workbench.action.terminal.joinInstance" ,
+        id: "workbench.action.terminal.joinActiveTab" ,
         title: { value: ( localize('workbench.action.terminal.joinInstance', "Join Terminals")), original: 'Join Terminals' },
         precondition: ( ContextKeyExpr.and(( ContextKeyExpr.or(
             TerminalContextKeys.processSupported,
@@ -1304,6 +1302,15 @@ function registerTerminalActions() {
             }
         }
     });
+    async function killInstance(c, instance) {
+        if (!instance) {
+            return;
+        }
+        await c.service.safeDisposeTerminal(instance);
+        if (c.groupService.instances.length > 0) {
+            await c.groupService.showPanel(true);
+        }
+    }
     registerTerminalAction({
         id: "workbench.action.terminal.kill" ,
         title: { value: ( localize('workbench.action.terminal.kill', "Kill the Active Terminal Instance")), original: 'Kill the Active Terminal Instance' },
@@ -1312,16 +1319,17 @@ function registerTerminalActions() {
             TerminalContextKeys.terminalHasBeenCreated
         )), TerminalContextKeys.isOpen)),
         icon: killTerminalIcon,
-        run: async (c) => {
-            const instance = c.groupService.activeInstance;
-            if (!instance) {
-                return;
-            }
-            await c.service.safeDisposeTerminal(instance);
-            if (c.groupService.instances.length > 0) {
-                await c.groupService.showPanel(true);
-            }
-        }
+        run: async (c) => killInstance(c, c.groupService.activeInstance)
+    });
+    registerTerminalAction({
+        id: "workbench.action.terminal.killViewOrEditor" ,
+        title: terminalStrings.kill,
+        f1: false,
+        precondition: ( ContextKeyExpr.or(( ContextKeyExpr.or(
+            TerminalContextKeys.processSupported,
+            TerminalContextKeys.terminalHasBeenCreated
+        )), TerminalContextKeys.isOpen)),
+        run: async (c) => killInstance(c, c.service.activeInstance)
     });
     registerTerminalAction({
         id: "workbench.action.terminal.killAll" ,
@@ -1358,7 +1366,7 @@ function registerTerminalActions() {
         run: (c, accessor) => accessor.get(ICommandService).executeCommand(CLOSE_EDITOR_COMMAND_ID)
     });
     registerTerminalAction({
-        id: "workbench.action.terminal.killInstance" ,
+        id: "workbench.action.terminal.killActiveTab" ,
         title: terminalStrings.kill,
         f1: false,
         precondition: ( ContextKeyExpr.or(( ContextKeyExpr.or(
@@ -1461,7 +1469,7 @@ function registerTerminalActions() {
         run: (instancactiveInstance) => instancactiveInstance.toggleSizeToContentWidth()
     });
     registerTerminalAction({
-        id: "workbench.action.terminal.sizeToContentWidthInstance" ,
+        id: "workbench.action.terminal.sizeToContentWidthActiveTab" ,
         title: terminalStrings.toggleSizeToContentWidth,
         f1: false,
         precondition: ( ContextKeyExpr.and(( ContextKeyExpr.or(
@@ -1719,6 +1727,11 @@ function registerTerminalActions() {
 function getSelectedInstances(accessor) {
     const listService = accessor.get(IListService);
     const terminalService = accessor.get(ITerminalService);
+    const terminalGroupService = accessor.get(ITerminalGroupService);
+    if (terminalGroupService.lastAccessedMenu === 'inline-tab') {
+        const instance = terminalGroupService.activeInstance;
+        return instance ? [terminalGroupService.activeInstance] : undefined;
+    }
     if (!listService.lastFocusedList?.getSelection()) {
         return undefined;
     }

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.d.ts

@@ -8,12 +8,13 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IXtermCore } from './xterm-private.js';
 import { IShellLaunchConfig } from '../../../../platform/terminal/common/terminal.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 /**
  * Encapsulates terminal configuration logic, the primary purpose of this file is so that platform
  * specific test cases can be written.
  */
-declare class TerminalConfigHelper implements IBrowserTerminalConfigHelper {
+declare class TerminalConfigHelper extends Disposable implements IBrowserTerminalConfigHelper {
     private readonly _configurationService;
     private readonly _extensionManagementService;
     private readonly _notificationService;

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

@@ -12,16 +12,18 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { InstallRecommendedExtensionAction } from '../../extensions/browser/extensionsActions.js';
 import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
 import { isLinux, isWindows } from 'monaco-editor/esm/vs/base/common/platform.js';
-let TerminalConfigHelper = class TerminalConfigHelper {
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+let TerminalConfigHelper = class TerminalConfigHelper extends Disposable {
     get onConfigChanged() { return this._onConfigChanged.event; }
     constructor(_configurationService, _extensionManagementService, _notificationService, _instantiationService, _productService) {
+        super();
         this._configurationService = _configurationService;
         this._extensionManagementService = _extensionManagementService;
         this._notificationService = _notificationService;
         this._instantiationService = _instantiationService;
         this._productService = _productService;
         this._linuxDistro = 1 ;
-        this._onConfigChanged = ( new Emitter());
+        this._onConfigChanged = this._register(( new Emitter()));
         this._recommendationsShown = false;
         this._updateConfig();
         this._configurationService.onDidChangeConfiguration(e => {

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

@@ -32,7 +32,7 @@ let TerminalEditor = class TerminalEditor extends EditorPane {
         this._editorInput = undefined;
         this._cancelContextMenu = false;
         this._dropdownMenu = this._register(menuService.createMenu(MenuId.TerminalNewDropdownContext, contextKeyService));
-        this._instanceMenu = this._register(menuService.createMenu(MenuId.TerminalEditorInstanceContext, contextKeyService));
+        this._instanceMenu = this._register(menuService.createMenu(MenuId.TerminalInstanceContext, contextKeyService));
     }
     async setInput(newInput, options, context, token) {
         this._editorInput?.terminalInstance?.detachFromElement();

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

@@ -16,7 +16,9 @@ import { TerminalContextKeys } from '../common/terminalContextKey.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+var TerminalEditorInput_1;
 let TerminalEditorInput = class TerminalEditorInput extends EditorInput {
+    static { TerminalEditorInput_1 = this; }
     static { this.ID = 'workbench.editors.terminal'; }
     setGroup(group) {
         this._group = group;
@@ -25,7 +27,7 @@ let TerminalEditorInput = class TerminalEditorInput extends EditorInput {
         return this._group;
     }
     get typeId() {
-        return TerminalEditorInput.ID;
+        return TerminalEditorInput_1.ID;
     }
     get editorId() {
         return terminalEditorId;
@@ -44,7 +46,7 @@ let TerminalEditorInput = class TerminalEditorInput extends EditorInput {
         const instance = this._terminalInstanceService.createInstance(this._copyLaunchConfig || {}, TerminalLocation.Editor);
         instance.focusWhenReady();
         this._copyLaunchConfig = undefined;
-        return this._instantiationService.createInstance(TerminalEditorInput, instance.resource, instance);
+        return this._instantiationService.createInstance(TerminalEditorInput_1, instance.resource, instance);
     }
     setCopyLaunchConfig(launchConfig) {
         this._copyLaunchConfig = launchConfig;
@@ -188,7 +190,7 @@ let TerminalEditorInput = class TerminalEditorInput extends EditorInput {
         };
     }
 };
-TerminalEditorInput = ( __decorate([
+TerminalEditorInput = TerminalEditorInput_1 = ( __decorate([
     ( __param(2, IThemeService)),
     ( __param(3, ITerminalInstanceService)),
     ( __param(4, IInstantiationService)),

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

@@ -25,15 +25,15 @@ let TerminalEditorService = class TerminalEditorService extends Disposable {
         this._isShuttingDown = false;
         this._editorInputs = ( new Map());
         this._instanceDisposables = ( new Map());
-        this._onDidDisposeInstance = ( new Emitter());
+        this._onDidDisposeInstance = this._register(( new Emitter()));
         this.onDidDisposeInstance = this._onDidDisposeInstance.event;
-        this._onDidFocusInstance = ( new Emitter());
+        this._onDidFocusInstance = this._register(( new Emitter()));
         this.onDidFocusInstance = this._onDidFocusInstance.event;
-        this._onDidChangeInstanceCapability = ( new Emitter());
+        this._onDidChangeInstanceCapability = this._register(( new Emitter()));
         this.onDidChangeInstanceCapability = this._onDidChangeInstanceCapability.event;
-        this._onDidChangeActiveInstance = ( new Emitter());
+        this._onDidChangeActiveInstance = this._register(( new Emitter()));
         this.onDidChangeActiveInstance = this._onDidChangeActiveInstance.event;
-        this._onDidChangeInstances = ( new Emitter());
+        this._onDidChangeInstances = this._register(( new Emitter()));
         this.onDidChangeInstances = this._onDidChangeInstances.event;
         this._terminalEditorActive = TerminalContextKeys.terminalEditorActive.bindTo(contextKeyService);
         this._register(toDisposable(() => {
@@ -146,8 +146,8 @@ let TerminalEditorService = class TerminalEditorService extends Disposable {
         this._instanceDisposables.set(inputKey, [
             instance.onDidFocus(this._onDidFocusInstance.fire, this._onDidFocusInstance),
             instance.onDisposed(this._onDidDisposeInstance.fire, this._onDidDisposeInstance),
-            instance.capabilities.onDidAddCapability(() => this._onDidChangeInstanceCapability.fire(instance)),
-            instance.capabilities.onDidRemoveCapability(() => this._onDidChangeInstanceCapability.fire(instance)),
+            instance.capabilities.onDidAddCapabilityType(() => this._onDidChangeInstanceCapability.fire(instance)),
+            instance.capabilities.onDidRemoveCapabilityType(() => this._onDidChangeInstanceCapability.fire(instance)),
         ]);
         this.instances.push(instance);
         this._onDidChangeInstances.fire();

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

@@ -0,0 +1,47 @@
+import { EventMultiplexer, Event, DynamicListEventMultiplexer } from 'monaco-editor/esm/vs/base/common/event.js';
+import { DisposableMap, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+function createInstanceCapabilityEventMultiplexer(currentInstances, onAddInstance, onRemoveInstance, capabilityId, getEvent) {
+    const store = ( new DisposableStore());
+    const multiplexer = store.add(( new EventMultiplexer()));
+    const capabilityListeners = store.add(( new DisposableMap()));
+    function addCapability(instance, capability) {
+        const listener = multiplexer.add(( Event.map(getEvent(capability), data => ({ instance, data }))));
+        capabilityListeners.set(capability, listener);
+    }
+    for (const instance of currentInstances) {
+        const capability = instance.capabilities.get(capabilityId);
+        if (capability) {
+            addCapability(instance, capability);
+        }
+    }
+    const addCapabilityMultiplexer = ( new DynamicListEventMultiplexer(
+        currentInstances,
+        onAddInstance,
+        onRemoveInstance,
+        instance => ( Event.map(
+            instance.capabilities.onDidAddCapability,
+            changeEvent => ({ instance, changeEvent })
+        ))
+    ));
+    addCapabilityMultiplexer.event(e => {
+        if (e.changeEvent.id === capabilityId) {
+            addCapability(e.instance, e.changeEvent.capability);
+        }
+    });
+    const removeCapabilityMultiplexer = ( new DynamicListEventMultiplexer(
+        currentInstances,
+        onAddInstance,
+        onRemoveInstance,
+        instance => instance.capabilities.onDidRemoveCapability
+    ));
+    removeCapabilityMultiplexer.event(e => {
+        if (e.id === capabilityId) {
+            capabilityListeners.deleteAndDispose(e.capability);
+        }
+    });
+    return {
+        dispose: () => store.dispose(),
+        event: multiplexer.event
+    };
+}
+export { createInstanceCapabilityEventMultiplexer };

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

@@ -1,6 +1,6 @@
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-function registerTerminalContribution(id, ctor) {
-    TerminalContributionRegistry.INSTANCE.registerTerminalContribution(id, ctor);
+function registerTerminalContribution(id, ctor, canRunInDetachedTerminals = false) {
+    TerminalContributionRegistry.INSTANCE.registerTerminalContribution({ id, ctor, canRunInDetachedTerminals });
 }
 var TerminalExtensionsRegistry;
 ( (function(TerminalExtensionsRegistry) {
@@ -14,8 +14,8 @@ class TerminalContributionRegistry {
     constructor() {
         this._terminalContributions = [];
     }
-    registerTerminalContribution(id, ctor) {
-        this._terminalContributions.push({ id, ctor: ctor });
+    registerTerminalContribution(description) {
+        this._terminalContributions.push(description);
     }
     getTerminalContributions() {
         return this._terminalContributions.slice(0);

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

@@ -220,9 +220,9 @@ let TerminalGroup = class TerminalGroup extends Disposable {
         this.onDisposed = this._onDisposed.event;
         this._onInstancesChanged = this._register(( new Emitter()));
         this.onInstancesChanged = this._onInstancesChanged.event;
-        this._onDidChangeActiveInstance = ( new Emitter());
+        this._onDidChangeActiveInstance = this._register(( new Emitter()));
         this.onDidChangeActiveInstance = this._onDidChangeActiveInstance.event;
-        this._onPanelOrientationChanged = ( new Emitter());
+        this._onPanelOrientationChanged = this._register(( new Emitter()));
         this.onPanelOrientationChanged = this._onPanelOrientationChanged.event;
         if (shellLaunchConfigOrInstance) {
             this.addInstance(shellLaunchConfigOrInstance);
@@ -293,8 +293,8 @@ let TerminalGroup = class TerminalGroup extends Disposable {
                 this._setActiveInstance(instance);
                 this._onDidFocusInstance.fire(instance);
             }),
-            instance.capabilities.onDidAddCapability(() => this._onDidChangeInstanceCapability.fire(instance)),
-            instance.capabilities.onDidRemoveCapability(() => this._onDidChangeInstanceCapability.fire(instance)),
+            instance.capabilities.onDidAddCapabilityType(() => this._onDidChangeInstanceCapability.fire(instance)),
+            instance.capabilities.onDidRemoveCapabilityType(() => this._onDidChangeInstanceCapability.fire(instance)),
         ]);
     }
     _handleOnDidDisposeInstance(instance) {
@@ -302,11 +302,6 @@ let TerminalGroup = class TerminalGroup extends Disposable {
     }
     removeInstance(instance) {
         this._removeInstance(instance);
-        const disposables = this._instanceDisposables.get(instance.instanceId);
-        if (disposables) {
-            dispose(disposables);
-            this._instanceDisposables.delete(instance.instanceId);
-        }
     }
     _removeInstance(instance) {
         const index = this._terminalInstances.indexOf(instance);
@@ -331,6 +326,11 @@ let TerminalGroup = class TerminalGroup extends Disposable {
         else {
             this._onInstancesChanged.fire();
         }
+        const disposables = this._instanceDisposables.get(instance.instanceId);
+        if (disposables) {
+            dispose(disposables);
+            this._instanceDisposables.delete(instance.instanceId);
+        }
     }
     moveInstance(instance, index) {
         const sourceIndex = this.terminalInstances.indexOf(instance);

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

@@ -2,7 +2,6 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { timeout } from 'monaco-editor/esm/vs/base/common/async.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { IViewsService, IViewDescriptorService } from '../../../common/views.js';
@@ -14,34 +13,34 @@ let TerminalGroupService = class TerminalGroupService extends Disposable {
     get instances() {
         return this.groups.reduce((p, c) => p.concat(c.terminalInstances), []);
     }
-    constructor(_contextKeyService, _instantiationService, _viewsService, _viewDescriptorService, _configurationService) {
+    constructor(_contextKeyService, _instantiationService, _viewsService, _viewDescriptorService) {
         super();
         this._contextKeyService = _contextKeyService;
         this._instantiationService = _instantiationService;
         this._viewsService = _viewsService;
         this._viewDescriptorService = _viewDescriptorService;
-        this._configurationService = _configurationService;
         this.groups = [];
         this.activeGroupIndex = -1;
-        this._onDidChangeActiveGroup = ( new Emitter());
+        this.lastAccessedMenu = 'inline-tab';
+        this._onDidChangeActiveGroup = this._register(( new Emitter()));
         this.onDidChangeActiveGroup = this._onDidChangeActiveGroup.event;
-        this._onDidDisposeGroup = ( new Emitter());
+        this._onDidDisposeGroup = this._register(( new Emitter()));
         this.onDidDisposeGroup = this._onDidDisposeGroup.event;
-        this._onDidChangeGroups = ( new Emitter());
+        this._onDidChangeGroups = this._register(( new Emitter()));
         this.onDidChangeGroups = this._onDidChangeGroups.event;
-        this._onDidShow = ( new Emitter());
+        this._onDidShow = this._register(( new Emitter()));
         this.onDidShow = this._onDidShow.event;
-        this._onDidDisposeInstance = ( new Emitter());
+        this._onDidDisposeInstance = this._register(( new Emitter()));
         this.onDidDisposeInstance = this._onDidDisposeInstance.event;
-        this._onDidFocusInstance = ( new Emitter());
+        this._onDidFocusInstance = this._register(( new Emitter()));
         this.onDidFocusInstance = this._onDidFocusInstance.event;
-        this._onDidChangeActiveInstance = ( new Emitter());
+        this._onDidChangeActiveInstance = this._register(( new Emitter()));
         this.onDidChangeActiveInstance = this._onDidChangeActiveInstance.event;
-        this._onDidChangeInstances = ( new Emitter());
+        this._onDidChangeInstances = this._register(( new Emitter()));
         this.onDidChangeInstances = this._onDidChangeInstances.event;
-        this._onDidChangeInstanceCapability = ( new Emitter());
+        this._onDidChangeInstanceCapability = this._register(( new Emitter()));
         this.onDidChangeInstanceCapability = this._onDidChangeInstanceCapability.event;
-        this._onDidChangePanelOrientation = ( new Emitter());
+        this._onDidChangePanelOrientation = this._register(( new Emitter()));
         this.onDidChangePanelOrientation = this._onDidChangePanelOrientation.event;
         this.onDidDisposeGroup(group => this._removeGroup(group));
         this._terminalGroupCountContextKey = TerminalContextKeys.groupCount.bindTo(this._contextKeyService);
@@ -55,9 +54,6 @@ let TerminalGroupService = class TerminalGroupService extends Disposable {
             TerminalContextKeys.tabsMouse.bindTo(this._contextKeyService).set(false);
         }
     }
-    showTabs() {
-        this._configurationService.updateValue("terminal.integrated.tabs.enabled" , true);
-    }
     get activeGroup() {
         if (this.activeGroupIndex < 0 || this.activeGroupIndex >= this.groups.length) {
             return undefined;
@@ -366,7 +362,6 @@ TerminalGroupService = ( __decorate([
     ( __param(0, IContextKeyService)),
     ( __param(1, IInstantiationService)),
     ( __param(2, IViewsService)),
-    ( __param(3, IViewDescriptorService)),
-    ( __param(4, IConfigurationService))
+    ( __param(3, IViewDescriptorService))
 ], TerminalGroupService));
 export { TerminalGroupService };