mirror of
https://github.com/Microsoft/vscode
synced 2024-09-13 13:46:13 +00:00
move exthost into extensions service where its used from (#67131)
This commit is contained in:
parent
6089c69984
commit
002cd6253b
|
@ -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';
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
16
tslint.json
16
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
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue