commands - do not always wait for extensions

Benjamin Pasero · Benjamin Pasero · commit 0e6ec37f0adb · 2019-04-06T09:27:35.000+02:00
diff --git a/src/vs/workbench/contrib/quickopen/browser/commandsHandler.ts b/src/vs/workbench/contrib/quickopen/browser/commandsHandler.ts
@@ -377,7 +377,8 @@ export class CommandsHandler extends QuickOpenHandler {
 
 	private commandHistoryEnabled: boolean;
 	private commandsHistory: CommandsHistory;
-	private extensionsRegistered: boolean;
+
+	private waitedForExtensionsRegistered: boolean;
 
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
@@ -391,7 +392,7 @@ export class CommandsHandler extends QuickOpenHandler {
 
 		this.commandsHistory = this.instantiationService.createInstance(CommandsHistory);
 
-		this.extensionService.whenInstalledExtensionsRegistered().then(() => this.extensionsRegistered = true);
+		this.extensionService.whenInstalledExtensionsRegistered().then(() => this.waitedForExtensionsRegistered = true);
 
 		this.configurationService.onDidChangeConfiguration(e => this.updateConfiguration());
 		this.updateConfiguration();
@@ -402,15 +403,19 @@ export class CommandsHandler extends QuickOpenHandler {
 	}
 
 	getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
-		if (this.extensionsRegistered) {
+		if (this.waitedForExtensionsRegistered) {
 			return this.doGetResults(searchValue, token);
 		}
 
 		// If extensions are not yet registered, we wait for a little moment to give them
 		// a chance to register so that the complete set of commands shows up as result
 		// We do not want to delay functionality beyond that time though to keep the commands
 		// functional.
-		return Promise.race([timeout(800), this.extensionService.whenInstalledExtensionsRegistered().then(() => undefined)]).then(() => this.doGetResults(searchValue, token));
+		return Promise.race([timeout(800), this.extensionService.whenInstalledExtensionsRegistered().then(() => undefined)]).then(() => {
+			this.waitedForExtensionsRegistered = true;
+
+			return this.doGetResults(searchValue, token);
+		});
 	}
 
 	private doGetResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
