From 002cd6253bfce5b3d2e66c1750f9ae555b6cd1ad Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 25 Jan 2019 18:28:34 +0100 Subject: [PATCH] move exthost into extensions service where its used from (#67131) --- .../api/node/extHostExtensionService.ts | 2 +- src/vs/workbench/buildfile.js | 3 ++- .../extensions/electron-browser/extensionHost.ts | 2 +- .../extensions}/node/extensionHostMain.ts | 0 .../extensions}/node/extensionHostProcess.ts | 2 +- .../extensions}/node/proxyResolver.ts | 0 tslint.json | 16 +--------------- 7 files changed, 6 insertions(+), 19 deletions(-) rename src/vs/workbench/{ => services/extensions}/node/extensionHostMain.ts (100%) rename src/vs/workbench/{ => services/extensions}/node/extensionHostProcess.ts (98%) rename src/vs/workbench/{ => services/extensions}/node/proxyResolver.ts (100%) diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index 41dd9ad1fc9..8edbff284ea 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -21,7 +21,7 @@ import { ExtHostStorage } from 'vs/workbench/api/node/extHostStorage'; import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace'; import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions'; import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/node/extensionDescriptionRegistry'; -import { connectProxyResolver } from 'vs/workbench/node/proxyResolver'; +import { connectProxyResolver } from 'vs/workbench/services/extensions/node/proxyResolver'; import { CancellationTokenSource } from 'vs/base/common/cancellation'; import * as errors from 'vs/base/common/errors'; import { ResolvedAuthority } from 'vs/platform/remote/common/remoteAuthorityResolver'; diff --git a/src/vs/workbench/buildfile.js b/src/vs/workbench/buildfile.js index caa36aa632b..8946ef5adb8 100644 --- a/src/vs/workbench/buildfile.js +++ b/src/vs/workbench/buildfile.js @@ -22,10 +22,11 @@ exports.collectModules = function () { createModuleDescription('vs/workbench/parts/debug/node/telemetryApp', []), createModuleDescription('vs/workbench/services/search/node/searchApp', []), + createModuleDescription('vs/workbench/services/files/node/watcher/unix/watcherApp', []), createModuleDescription('vs/workbench/services/files/node/watcher/nsfw/watcherApp', []), - createModuleDescription('vs/workbench/node/extensionHostProcess', []), + createModuleDescription('vs/workbench/services/extensions/node/extensionHostProcess', []), ]; return modules; diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts index 5a6e51c6d3a..b54507fb37e 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts @@ -167,7 +167,7 @@ export class ExtensionHostProcessWorker implements IExtensionHostStarter { const opts = { env: objects.mixin(objects.deepClone(process.env), { - AMD_ENTRYPOINT: 'vs/workbench/node/extensionHostProcess', + AMD_ENTRYPOINT: 'vs/workbench/services/extensions/node/extensionHostProcess', PIPE_LOGGING: 'true', VERBOSE_LOGGING: true, VSCODE_IPC_HOOK_EXTHOST: pipeName, diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/services/extensions/node/extensionHostMain.ts similarity index 100% rename from src/vs/workbench/node/extensionHostMain.ts rename to src/vs/workbench/services/extensions/node/extensionHostMain.ts diff --git a/src/vs/workbench/node/extensionHostProcess.ts b/src/vs/workbench/services/extensions/node/extensionHostProcess.ts similarity index 98% rename from src/vs/workbench/node/extensionHostProcess.ts rename to src/vs/workbench/services/extensions/node/extensionHostProcess.ts index ea1b550b065..5f2935618c6 100644 --- a/src/vs/workbench/node/extensionHostProcess.ts +++ b/src/vs/workbench/services/extensions/node/extensionHostProcess.ts @@ -12,7 +12,7 @@ import { Protocol } from 'vs/base/parts/ipc/node/ipc.net'; import product from 'vs/platform/node/product'; import { IInitData } from 'vs/workbench/api/node/extHost.protocol'; import { MessageType, createMessageOfType, isMessageOfType } from 'vs/workbench/common/extensionHostProtocol'; -import { ExtensionHostMain, exit } from 'vs/workbench/node/extensionHostMain'; +import { exit, ExtensionHostMain } from 'vs/workbench/services/extensions/node/extensionHostMain'; // With Electron 2.x and node.js 8.x the "natives" module // can cause a native crash (see https://github.com/nodejs/node/issues/19891 and diff --git a/src/vs/workbench/node/proxyResolver.ts b/src/vs/workbench/services/extensions/node/proxyResolver.ts similarity index 100% rename from src/vs/workbench/node/proxyResolver.ts rename to src/vs/workbench/services/extensions/node/proxyResolver.ts diff --git a/tslint.json b/tslint.json index 919f55305f5..67a640687c9 100644 --- a/tslint.json +++ b/tslint.json @@ -393,21 +393,6 @@ "*" // node modules ] }, - { - "target": "**/vs/workbench/node/**", - "restrictions": [ - "vs/nls", - "**/vs/base/{common,node}/**", - "**/vs/base/parts/*/{common,node}/**", - "**/vs/platform/node/**", - "**/vs/platform/*/{common,node}/**", - "**/vs/editor/{common,node}/**", - "**/vs/editor/contrib/*/{common,node}/**", - "**/vs/workbench/{common,node,api}/**", - "**/vs/workbench/services/*/{common,node}/**", - "*" // node modules - ] - }, { "target": "**/vs/workbench/services/**/test/**", "restrictions": [ @@ -454,6 +439,7 @@ "**/vs/platform/**/{common,node}/**", "**/vs/editor/{common,node}/**", "**/vs/workbench/{common,node}/**", + "**/vs/workbench/api/{common,node}/**", "**/vs/workbench/services/**/{common,node}/**", "*" // node modules ]