Rework ext install flow a bit

mjbvz · mjbvz · commit 3c4afb72d85c · 2017-06-16T15:18:47.000-07:00
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -811,14 +811,25 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 				}
 
 				const extension = result.firstPage[0];
-				const promises = [this.open(extension)];
-
-				if (this.local.every(local => local.id !== extension.id)) {
-					promises.push(this.install(extension));
-				}
-
-				TPromise.join(promises)
-					.done(null, error => this.onError(error));
+				this.open(extension).then(() => {
+					const message = nls.localize('installConfirmation', "Would you like to install the '{0}' extension?", extension.displayName, extension.publisher);
+					const options = [
+						nls.localize('install', "Install"),
+						nls.localize('cancel', "Cancel")
+					];
+					this.choiceService.choose(Severity.Info, message, options, 2, false)
+						.then<void>(value => {
+							if (value === 0) {
+								const promises: TPromise<any>[] = [];
+								if (this.local.every(local => local.id !== extension.id)) {
+									promises.push(this.install(extension));
+								}
+
+								TPromise.join(promises)
+									.done(null, error => this.onError(error));
+							}
+						});
+				});
 			});
 	}
 
