From 2853fd0ffcc4c067bf7b5b31ccfc15ac245fc89c Mon Sep 17 00:00:00 2001 From: meganrogge Date: Thu, 15 Jul 2021 10:57:10 -0700 Subject: [PATCH] bump distro --- package.json | 2 +- .../workbench/contrib/terminal/browser/terminal.ts | 1 + .../contrib/terminal/browser/terminalService.ts | 4 ++++ .../contrib/terminal/browser/terminalTabsList.ts | 13 +++++++------ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f906d004c1b..375685fc2bb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.59.0", - "distro": "b5be8fd67be76d886aef05866ef8c8b1e09920d6", + "distro": "ed2fca765acb42a6c17b1d023464f0c69077ca1b", "author": { "name": "Microsoft Corporation" }, diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts index 3dda7433a65..c1c4c71f919 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts @@ -146,6 +146,7 @@ export interface ITerminalService extends ITerminalInstanceHost { splitInstance(instance: ITerminalInstance, profile: ITerminalProfile): ITerminalInstance | null; moveToEditor(source: ITerminalInstance): void; moveToTerminalView(source?: ITerminalInstance | URI): Promise; + getOffProcessTerminalService(): IOffProcessTerminalService | undefined; /** * Perform an action with the active terminal instance, if the terminal does diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts index ee5aced7599..12134389fd3 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts @@ -282,6 +282,10 @@ export class TerminalService implements ITerminalService { timeout(0).then(() => this._instantiationService.createInstance(TerminalEditorStyle, document.head)); } + getOffProcessTerminalService(): IOffProcessTerminalService | undefined { + return this._primaryOffProcessTerminalService; + } + private _forwardInstanceHostEvents(host: ITerminalInstanceHost) { host.onDidChangeInstances(this._onDidChangeInstances.fire, this._onDidChangeInstances); host.onDidDisposeInstance(this._onDidDisposeInstance.fire, this._onDidDisposeInstance); diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts index 20fd4a3745f..f5c14fea2a4 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts @@ -16,7 +16,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { MenuItemAction } from 'vs/platform/actions/common/actions'; import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem'; -import { ILocalTerminalService, IS_SPLIT_TERMINAL_CONTEXT_KEY, KEYBINDING_CONTEXT_TERMINAL_TABS_SINGULAR_SELECTION, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal'; +import { IOffProcessTerminalService, IS_SPLIT_TERMINAL_CONTEXT_KEY, KEYBINDING_CONTEXT_TERMINAL_TABS_SINGULAR_SELECTION, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal'; import { TerminalLocation, TerminalSettingId } from 'vs/platform/terminal/common/terminal'; import { Codicon } from 'vs/base/common/codicons'; import { Action } from 'vs/base/common/actions'; @@ -538,14 +538,15 @@ class TerminalTabsAccessibilityProvider implements IListAccessibilityProvider { private _autoFocusInstance: ITerminalInstance | undefined; private _autoFocusDisposable: IDisposable = Disposable.None; - + private _offProcessTerminalService: IOffProcessTerminalService | undefined; constructor( @ITerminalService private readonly _terminalService: ITerminalService, @ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService, @ITerminalInstanceService private readonly _terminalInstanceService: ITerminalInstanceService, - @ILocalTerminalService private readonly _localTerminalService: ILocalTerminalService, @IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService - ) { } + ) { + this._offProcessTerminalService = _terminalService.getOffProcessTerminalService(); + } getDragURI(instance: ITerminalInstance): string | null { return URI.from({ @@ -629,8 +630,8 @@ class TerminalTabsDragAndDrop implements IListDragAndDrop { if (instance) { sourceInstances = [instance]; this._terminalService.moveToTerminalView(instance); - } else if (workspaceId !== this._workspaceContextService.getWorkspace().id) { - promises.push(this._localTerminalService.requestDetachInstance(workspaceId, Number.parseInt(instanceId))); + } else if (this._offProcessTerminalService && workspaceId !== this._workspaceContextService.getWorkspace().id) { + promises.push(this._offProcessTerminalService.requestDetachInstance(workspaceId, Number.parseInt(instanceId))); } } }