development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 06:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use editor service over command service to split terminal editors

Browse source 
Fixes #127191
This commit is contained in:
Daniel Imms 2021-07-22 09:42:58 -07:00
parent 49cb8ce9a3
commit 4f01994d0d
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
View file

@ -7,7 +7,6 @@ import { Emitter } from 'vs/base/common/event';
import { Disposable, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { URI } from 'vs/base/common/uri';
import { FindReplaceState } from 'vs/editor/contrib/find/findState';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { EditorActivation } from 'vs/platform/editor/common/editor';
import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
import { IShellLaunchConfig, TerminalLocation } from 'vs/platform/terminal/common/terminal';
@ -18,6 +17,7 @@ import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/termi
import { DeserializedTerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorSerializer';
import { getInstanceFromResource, parseTerminalUri } from 'vs/workbench/contrib/terminal/browser/terminalUri';
import { ILocalTerminalService, IOffProcessTerminalService } from 'vs/workbench/contrib/terminal/common/terminal';
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
@ -44,8 +44,8 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor
readonly onDidChangeInstances = this._onDidChangeInstances.event;
constructor(
@ICommandService private readonly _commandService: ICommandService,
@IEditorService private readonly _editorService: IEditorService,
@IEditorGroupsService private readonly _editorGroupsService: IEditorGroupsService,
@ITerminalInstanceService private readonly _terminalInstanceService: ITerminalInstanceService,
@IInstantiationService private readonly _instantiationService: IInstantiationService,
@IRemoteTerminalService private readonly _remoteTerminalService: IRemoteTerminalService,
@ -227,10 +227,15 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor
}
splitInstance(instanceToSplit: ITerminalInstance, shellLaunchConfig: IShellLaunchConfig = {}): ITerminalInstance {
const input = this.getOrCreateEditorInput(instanceToSplit);
if (instanceToSplit.target === TerminalLocation.Editor) {
// Make sure the instance to split's group is active
const group = this._editorInputs.get(instanceToSplit.resource.path)?.group;
if (group) {
this._editorGroupsService.activateGroup(group);
}
}
const instance = this._terminalInstanceService.createInstance(shellLaunchConfig, TerminalLocation.Editor);
input.setCopyInstance(instance);
this._commandService.executeCommand('workbench.action.splitEditor');
this._editorService.openEditor(this.getOrCreateEditorInput(instance), undefined, SIDE_GROUP);
return instance;
}