maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bump distro

Browse source
This commit is contained in:
meganrogge 2021-07-15 10:57:10 -07:00
parent f8549d4e7f
commit 2853fd0ffc
No known key found for this signature in database
GPG key ID: 3155C8B2F0428C81
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.59.0",
"distro": "b5be8fd67be76d886aef05866ef8c8b1e09920d6",
"distro": "ed2fca765acb42a6c17b1d023464f0c69077ca1b",
"author": {
"name": "Microsoft Corporation"
},

1
src/vs/workbench/contrib/terminal/browser/terminal.ts
View file

@ -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<void>;
getOffProcessTerminalService(): IOffProcessTerminalService | undefined;
/**
* Perform an action with the active terminal instance, if the terminal does

4
src/vs/workbench/contrib/terminal/browser/terminalService.ts
View file

@ -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);

13
src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
View file

@ -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<IT
class TerminalTabsDragAndDrop implements IListDragAndDrop<ITerminalInstance> {
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<ITerminalInstance> {
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)));
}
}
}