From dc172cddf82256ac03266d5ebdb7ec7cd47bf666 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 15 Sep 2016 18:24:46 +0200 Subject: [PATCH] drop install-vsix altogether --- src/vs/code/node/cliProcessMain.ts | 4 ++-- src/vs/code/node/sharedProcessMain.ts | 7 ------- src/vs/platform/environment/node/argv.ts | 2 -- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index c219f231823..66c1703b211 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -56,8 +56,8 @@ class Main { return this.listExtensions(); } else if (argv['install-extension']) { const arg = argv['install-extension']; - const ids: string[] = typeof arg === 'string' ? [arg] : arg; - return this.installExtension(ids); + const args: string[] = typeof arg === 'string' ? [arg] : arg; + return this.installExtension(args); } else if (argv['uninstall-extension']) { const arg = argv['uninstall-extension']; const ids: string[] = typeof arg === 'string' ? [arg] : arg; diff --git a/src/vs/code/node/sharedProcessMain.ts b/src/vs/code/node/sharedProcessMain.ts index 974ec23d016..cd0785ebae2 100644 --- a/src/vs/code/node/sharedProcessMain.ts +++ b/src/vs/code/node/sharedProcessMain.ts @@ -8,7 +8,6 @@ import * as platform from 'vs/base/common/platform'; import product from 'vs/platform/product'; import pkg from 'vs/platform/package'; import { serve, Server, connect } from 'vs/base/parts/ipc/node/ipc.net'; -import { coalesce } from 'vs/base/common/arrays'; import { TPromise } from 'vs/base/common/winjs.base'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; @@ -104,18 +103,12 @@ function main(server: Server, initData: ISharedProcessInitData): void { const instantiationService2 = instantiationService.createChild(services); instantiationService2.invokeFunction(accessor => { - const environmentService = accessor.get(IEnvironmentService); const extensionManagementService = accessor.get(IExtensionManagementService); const channel = new ExtensionManagementChannel(extensionManagementService); server.registerChannel('extensions', channel); // clean up deprecated extensions (extensionManagementService as ExtensionManagementService).removeDeprecatedExtensions(); - - // install vsix - const vsixArg = environmentService.args['install-vsix']; - const vsix = typeof vsixArg === 'string' ? [vsixArg] : vsixArg; - coalesce(vsix || []).forEach(vsix => extensionManagementService.install(vsix)); }); }); } diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index f7610b9fc71..166210c03a7 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -31,7 +31,6 @@ export interface ParsedArgs extends minimist.ParsedArgs { 'list-extensions'?: boolean; 'install-extension'?: string | string[]; 'uninstall-extension'?: string | string[]; - 'install-vsix'?: string | string[]; } const options: minimist.Opts = { @@ -43,7 +42,6 @@ const options: minimist.Opts = { 'extensionTestsPath', 'install-extension', 'uninstall-extension', - 'install-vsix', 'debugBrkPluginHost', 'debugPluginHost' ], -- GitLab