From 0920cd6ecbfd37f26974691f2147b39e52cf82ff Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 8 Aug 2019 10:45:03 +0200 Subject: [PATCH] move task registration depending on process into /node/ --- src/vs/workbench/api/node/extHost.api.impl.ts | 7 ------- src/vs/workbench/api/node/extHostTask.ts | 11 +++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index 52d3f877333..21c90b637fa 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -59,7 +59,6 @@ import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensio import { originalFSPath } from 'vs/base/common/resources'; import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer'; import { values } from 'vs/base/common/collections'; -import { Schemas } from 'vs/base/common/network'; import { IURITransformer } from 'vs/base/common/uriIpc'; import { ExtHostEditorInsets } from 'vs/workbench/api/common/extHostCodeInsets'; import { ExtHostLabelService } from 'vs/workbench/api/common/extHostLabelService'; @@ -134,12 +133,6 @@ export function createApiFactory( const extHostLabelService = rpcProtocol.set(ExtHostContext.ExtHosLabelService, new ExtHostLabelService(rpcProtocol)); if (initData.remote.isRemote && initData.remote.authority) { - extHostTask.registerTaskSystem(Schemas.vscodeRemote, { - scheme: Schemas.vscodeRemote, - authority: initData.remote.authority, - platform: process.platform - }); - const cliServer = new CLIServer(extHostCommands); process.env['VSCODE_IPC_HOOK_CLI'] = cliServer.ipcHandlePath; } diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts index 5e31d4eaa61..c826cccf633 100644 --- a/src/vs/workbench/api/node/extHostTask.ts +++ b/src/vs/workbench/api/node/extHostTask.ts @@ -32,6 +32,8 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'; import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService'; import { IExtHostRpcService } from 'vs/workbench/api/common/rpcService'; +import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService'; +import { Schemas } from 'vs/base/common/network'; namespace TaskDefinitionDTO { export function from(value: vscode.TaskDefinition): TaskDefinitionDTO | undefined { @@ -376,6 +378,7 @@ export class ExtHostTask implements ExtHostTaskShape { constructor( @IExtHostRpcService extHostRpc: IExtHostRpcService, + @IExtHostInitDataService initData: IExtHostInitDataService, @IExtHostWorkspace workspaceService: IExtHostWorkspace, @IExtHostDocumentsAndEditors editorService: IExtHostDocumentsAndEditors, @IExtHostConfiguration configurationService: IExtHostConfiguration, @@ -391,6 +394,14 @@ export class ExtHostTask implements ExtHostTaskShape { this._taskExecutions = new Map(); this._providedCustomExecutions2 = new Map(); this._activeCustomExecutions2 = new Map(); + + if (initData.remote.isRemote && initData.remote.authority) { + this.registerTaskSystem(Schemas.vscodeRemote, { + scheme: Schemas.vscodeRemote, + authority: initData.remote.authority, + platform: process.platform + }); + } } public registerTaskProvider(extension: IExtensionDescription, type: string, provider: vscode.TaskProvider): vscode.Disposable {