💄

sandy081 · sandy081 · commit 71b6beff35c7 · 2019-07-18T11:29:54.000+02:00
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -2862,7 +2862,7 @@ export class InstallVSIXAction extends Action {
 				return Promise.resolve();
 			}
 
-			return Promise.all(result.map(vsix => this.extensionsWorkbenchService.install(vsix)))
+			return Promise.all(result.map(vsix => this.extensionsWorkbenchService.install(URI.file(vsix))))
 				.then(extensions => {
 					for (const extension of extensions) {
 						const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -775,10 +775,10 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return false;
 	}
 
-	install(extension: string | IExtension): Promise<IExtension> {
-		if (typeof extension === 'string') {
+	install(extension: URI | IExtension): Promise<IExtension> {
+		if (extension instanceof URI) {
 			return this.installWithProgress(async () => {
-				const { identifier } = await this.extensionService.install(URI.file(extension));
+				const { identifier } = await this.extensionService.install(extension);
 				this.checkAndEnableDisabledDependencies(identifier);
 				return this.local.filter(local => areSameExtensions(local.identifier, identifier))[0];
 			});
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -14,6 +14,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IExtensionManifest, ExtensionType } from 'vs/platform/extensions/common/extensions';
+import { URI } from 'vs/base/common/uri';
 
 export const VIEWLET_ID = 'workbench.view.extensions';
 export const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer(VIEWLET_ID);
@@ -81,7 +82,7 @@ export interface IExtensionsWorkbenchService {
 	queryGallery(token: CancellationToken): Promise<IPager<IExtension>>;
 	queryGallery(options: IQueryOptions, token: CancellationToken): Promise<IPager<IExtension>>;
 	canInstall(extension: IExtension): boolean;
-	install(vsix: string): Promise<IExtension>;
+	install(vsix: URI): Promise<IExtension>;
 	install(extension: IExtension, promptToInstallDependencies?: boolean): Promise<IExtension>;
 	uninstall(extension: IExtension): Promise<void>;
 	installVersion(extension: IExtension, version: string): Promise<IExtension>;

Original file line number	Diff line number	Diff line change
`@@ -2862,7 +2862,7 @@ export class InstallVSIXAction extends Action {`
`2862`	`2862`	`return Promise.resolve();`
`2863`	`2863`	`}`
`2864`	`2864`
`2865`		`- return Promise.all(result.map(vsix => this.extensionsWorkbenchService.install(vsix)))`
	`2865`	`+ return Promise.all(result.map(vsix => this.extensionsWorkbenchService.install(URI.file(vsix))))`
`2866`	`2866`	`.then(extensions => {`
`2867`	`2867`	`for (const extension of extensions) {`
`2868`	`2868`	`const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));`