development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove optional usage from external terminal

Browse source 
Part of #119440
This commit is contained in:
Daniel Imms 2021-11-04 08:37:50 -07:00
parent b555ad16c5
commit 3afe028227
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts
View file

@ -17,7 +17,6 @@ import { Schemas } from 'vs/base/common/network';
import { distinct } from 'vs/base/common/arrays';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
import { optional } from 'vs/platform/instantiation/common/instantiation';
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { Disposable } from 'vs/base/common/lifecycle';
@ -35,10 +34,14 @@ CommandsRegistry.registerCommand({
const configurationService = accessor.get(IConfigurationService);
const editorService = accessor.get(IEditorService);
const fileService = accessor.get(IFileService);
const terminalService: IExternalTerminalService | undefined = accessor.get(IExternalTerminalService, optional);
const integratedTerminalService = accessor.get(IIntegratedTerminalService);
const remoteAgentService = accessor.get(IRemoteAgentService);
const terminalGroupService = accessor.get(ITerminalGroupService);
let externalTerminalService: IExternalTerminalService | undefined = undefined;
try {
externalTerminalService = accessor.get(IExternalTerminalService);
} catch {
}
const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService, accessor.get(IExplorerService));
return fileService.resolveAll(resources.map(r => ({ resource: r }))).then(async stats => {
@ -73,9 +76,9 @@ CommandsRegistry.registerCommand({
terminalGroupService.showPanel(true);
}
}
} else {
} else if (externalTerminalService) {
distinct(targets.map(({ stat }) => stat!.isDirectory ? stat!.resource.fsPath : dirname(stat!.resource.fsPath))).forEach(cwd => {
terminalService!.openTerminal(config.terminal.external, cwd);
externalTerminalService!.openTerminal(config.terminal.external, cwd);
});
}
});