show progress when activating an extension via onCommand:Foo, microsoft#59645

jrieken · jrieken · commit ac643e170c86 · 2018-10-23T12:04:56.000+02:00
diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
@@ -166,6 +166,10 @@
 			"name": "vs/workbench/services/bulkEdit",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/commands",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/configuration",
 			"project": "vscode-workbench"
diff --git a/src/vs/workbench/services/commands/common/commandService.ts b/src/vs/workbench/services/commands/common/commandService.ts
@@ -9,6 +9,8 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { Event, Emitter } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { localize } from 'vs/nls';
 
 export class CommandService extends Disposable implements ICommandService {
 
@@ -22,7 +24,8 @@ export class CommandService extends Disposable implements ICommandService {
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
-		@ILogService private readonly _logService: ILogService
+		@ILogService private readonly _logService: ILogService,
+		@IProgressService2 private readonly _progressService: IProgressService2,
 	) {
 		super();
 		this._extensionService.whenInstalledExtensionsRegistered().then(value => this._extensionHostIsReady = value);
@@ -35,17 +38,23 @@ export class CommandService extends Disposable implements ICommandService {
 		// we don't wait for it when the extension
 		// host didn't yet start and the command is already registered
 
-		const activation = Promise.resolve(this._extensionService.activateByEvent(`onCommand:${id}`));
+		const activation: Thenable<any> = this._extensionService.activateByEvent(`onCommand:${id}`);
 		const commandIsRegistered = !!CommandsRegistry.getCommand(id);
 
 		if (!this._extensionHostIsReady && commandIsRegistered) {
 			return this._tryExecuteCommand(id, args);
 		} else {
-			let waitFor: Promise<any> = activation;
+			let waitFor = activation;
 			if (!commandIsRegistered) {
 				waitFor = Promise.all([activation, this._extensionService.activateByEvent(`*`)]);
 			}
-			return waitFor.then(_ => this._tryExecuteCommand(id, args));
+
+			this._progressService.withProgress({
+				location: ProgressLocation.Window,
+				title: localize('activating', "Activating extensions for command '{0}'...", id)
+			}, () => waitFor);
+
+			return (waitFor as Promise<any>).then(_ => this._tryExecuteCommand(id, args));
 		}
 	}
 
