Skip to content

Commit 9f20ed4

Browse files
weinandweinand
committed
consolidate externalTerminalService: dead wood removal
1 parent c0a9bc3 commit 9f20ed4

9 files changed

Lines changed: 82 additions & 391 deletions

File tree

‎src/vs/workbench/api/node/extHostDebugService.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { IExtHostWorkspaceProvider } from 'vs/workbench/api/common/extHostWorksp
2121
import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
2222
import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
2323
import { ITerminalSettings, IDebuggerContribution, IConfig, IDebugAdapter, IDebugAdapterServer, IDebugAdapterExecutable, IAdapterDescriptor } from 'vs/workbench/contrib/debug/common/debug';
24-
import { getTerminalLauncher, hasChildProcesses, prepareCommand } from 'vs/workbench/contrib/debug/node/terminals';
24+
import { hasChildProcesses, prepareCommand, runInExternalTerminal } from 'vs/workbench/contrib/debug/node/terminals';
2525
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
2626
import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
2727
import { ExtHostConfiguration, ExtHostConfigProvider } from '../common/extHostConfiguration';
@@ -357,10 +357,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
357357

358358
} else if (args.kind === 'external') {
359359

360-
const terminalLauncher = getTerminalLauncher();
361-
if (terminalLauncher) {
362-
return terminalLauncher.runInTerminal(args, config);
363-
}
360+
runInExternalTerminal(args, config);
364361
}
365362
return Promise.resolve(undefined);
366363
}

‎src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { IFileService } from 'vs/platform/files/common/files';
2121
import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
2222
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
2323
import { ICommandService } from 'vs/platform/commands/common/commands';
24-
import { IDebugConfigurationProvider, ICompound, IDebugConfiguration, IConfig, IGlobalConfig, IConfigurationManager, ILaunch, IDebugAdapterDescriptorFactory, IDebugAdapter, ITerminalSettings, ITerminalLauncher, IDebugSession, IAdapterDescriptor, CONTEXT_DEBUG_CONFIGURATION_TYPE, IDebugAdapterFactory, IDebugService, IDebugHelperService } from 'vs/workbench/contrib/debug/common/debug';
24+
import { IDebugConfigurationProvider, ICompound, IDebugConfiguration, IConfig, IGlobalConfig, IConfigurationManager, ILaunch, IDebugAdapterDescriptorFactory, IDebugAdapter, ITerminalSettings, IDebugSession, IAdapterDescriptor, CONTEXT_DEBUG_CONFIGURATION_TYPE, IDebugAdapterFactory, IDebugService } from 'vs/workbench/contrib/debug/common/debug';
2525
import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
2626
import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
2727
import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -52,7 +52,6 @@ export class ConfigurationManager implements IConfigurationManager {
5252
private configProviders: IDebugConfigurationProvider[];
5353
private adapterDescriptorFactories: IDebugAdapterDescriptorFactory[];
5454
private debugAdapterFactories = new Map<string, IDebugAdapterFactory>();
55-
private terminalLauncher: ITerminalLauncher;
5655
private debugConfigurationTypeContext: IContextKey<string>;
5756

5857
constructor(
@@ -66,8 +65,7 @@ export class ConfigurationManager implements IConfigurationManager {
6665
@IStorageService private readonly storageService: IStorageService,
6766
@ILifecycleService lifecycleService: ILifecycleService,
6867
@IExtensionService private readonly extensionService: IExtensionService,
69-
@IContextKeyService contextKeyService: IContextKeyService,
70-
@IDebugHelperService private readonly debugHelperService: IDebugHelperService
68+
@IContextKeyService contextKeyService: IContextKeyService
7169
) {
7270
this.configProviders = [];
7371
this.adapterDescriptorFactories = [];
@@ -111,14 +109,11 @@ export class ConfigurationManager implements IConfigurationManager {
111109
}
112110

113111
runInTerminal(debugType: string, args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): Promise<number | undefined> {
114-
let tl: ITerminalLauncher | undefined = this.debugAdapterFactories.get(debugType);
115-
if (!tl) {
116-
if (!this.terminalLauncher) {
117-
this.terminalLauncher = this.debugHelperService.createTerminalLauncher(this.instantiationService);
118-
}
119-
tl = this.terminalLauncher;
112+
let tl = this.debugAdapterFactories.get(debugType);
113+
if (tl) {
114+
return tl.runInTerminal(args, config);
120115
}
121-
return tl.runInTerminal(args, config);
116+
return Promise.resolve(void 0);
122117
}
123118

124119
// debug adapter

‎src/vs/workbench/contrib/debug/browser/debugHelperService.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { ServiceIdentifier, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
7-
import { ITerminalLauncher, IDebugHelperService } from 'vs/workbench/contrib/debug/common/debug';
6+
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
7+
import { IDebugHelperService } from 'vs/workbench/contrib/debug/common/debug';
88
import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
99
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1010
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
@@ -13,10 +13,6 @@ export class BrowserDebugHelperService implements IDebugHelperService {
1313

1414
_serviceBrand: ServiceIdentifier<IDebugHelperService>;
1515

16-
createTerminalLauncher(instantiationService: IInstantiationService): ITerminalLauncher {
17-
throw new Error('Method createTerminalLauncher not implemented.');
18-
}
19-
2016
createTelemetryService(configurationService: IConfigurationService, args: string[]): TelemetryService | undefined {
2117
return undefined;
2218
}

‎src/vs/workbench/contrib/debug/common/debug.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { URI as uri } from 'vs/base/common/uri';
88
import severity from 'vs/base/common/severity';
99
import { Event } from 'vs/base/common/event';
1010
import { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
11-
import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
11+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1212
import { IEditorContribution } from 'vs/editor/common/editorCommon';
1313
import { ITextModel as EditorIModel } from 'vs/editor/common/model';
1414
import { IEditor, ITextEditor } from 'vs/workbench/common/editor';
@@ -846,7 +846,5 @@ export const IDebugHelperService = createDecorator<IDebugHelperService>(DEBUG_HE
846846
export interface IDebugHelperService {
847847
_serviceBrand: any;
848848

849-
createTerminalLauncher(instantiationService: IInstantiationService): ITerminalLauncher;
850-
851849
createTelemetryService(configurationService: IConfigurationService, args: string[]): TelemetryService | undefined;
852850
}

‎src/vs/workbench/contrib/debug/node/debugHelperService.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
7-
import { TerminalLauncher } from 'vs/workbench/contrib/debug/node/terminalSupport';
8-
import { ITerminalLauncher, IDebugHelperService } from 'vs/workbench/contrib/debug/common/debug';
6+
import { IDebugHelperService } from 'vs/workbench/contrib/debug/common/debug';
97
import { Client as TelemetryClient } from 'vs/base/parts/ipc/node/ipc.cp';
108
import { TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
119
import { getPathFromAmdModule } from 'vs/base/common/amd';
@@ -20,10 +18,6 @@ export class NodeDebugHelperService implements IDebugHelperService {
2018
) {
2119
}
2220

23-
createTerminalLauncher(instantiationService: IInstantiationService): ITerminalLauncher {
24-
return instantiationService.createInstance(TerminalLauncher);
25-
}
26-
2721
createTelemetryService(configurationService: IConfigurationService, args: string[]): TelemetryService | undefined {
2822

2923
const client = new TelemetryClient(

‎src/vs/workbench/contrib/debug/node/terminalSupport.ts‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)