Merge from vscode fb5dc0083bfa9a0e3da7ed1f86e1ecb9836fcc8b

src/vs/editor/common/standaloneStrings.ts

@@ -54,6 +54,7 @@ export namespace QuickCommandNLS {
 	export const ariaLabelEntry = nls.localize('ariaLabelEntry', "{0}, commands");
 	export const quickCommandActionInput = nls.localize('quickCommandActionInput', "Type the name of an action you want to execute");
 	export const quickCommandActionLabel = nls.localize('quickCommandActionLabel', "Command Palette");
+	export const quickCommandHelp = nls.localize('quickCommandActionHelp', "Show And Run Commands");
 }
 
 export namespace QuickOutlineNLS {

src/vs/editor/contrib/codelens/codelensController.ts

@@ -419,7 +419,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
 		super({
 			id: 'codelens.showLensesInCurrentLine',
 			precondition: EditorContextKeys.hasCodeLensProvider,
-			label: localize('showLensOnLine', "Show Code Lens Command For Current Line"),
+			label: localize('showLensOnLine', "Show Code Lens Commands For Current Line"),
 			alias: 'Show Code Lens Commands For Current Line',
 		});
 	}

src/vs/editor/contrib/quickAccess/commandsQuickAccess.ts

@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AbstractCommandsQuickAccessProvider, ICommandQuickPick, ICommandsQuickAccessOptions } from 'vs/platform/quickinput/browser/commandsQuickAccess';
+import { IEditor } from 'vs/editor/common/editorCommon';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+
+export abstract class AbstractEditorCommandsQuickAccessProvider extends AbstractCommandsQuickAccessProvider {
+
+	constructor(
+		options: ICommandsQuickAccessOptions,
+		instantiationService: IInstantiationService,
+		keybindingService: IKeybindingService,
+		commandService: ICommandService,
+		telemetryService: ITelemetryService,
+		notificationService: INotificationService
+	) {
+		super(options, instantiationService, keybindingService, commandService, telemetryService, notificationService);
+	}
+
+	/**
+	 * Subclasses to provide the current active editor control.
+	 */
+	abstract activeTextEditorControl: IEditor | undefined;
+
+	protected getCodeEditorCommandPicks(): ICommandQuickPick[] {
+		const activeTextEditorControl = this.activeTextEditorControl;
+		if (!activeTextEditorControl) {
+			return [];
+		}
+
+		const editorCommandPicks: ICommandQuickPick[] = [];
+		for (const editorAction of activeTextEditorControl.getSupportedActions()) {
+			editorCommandPicks.push({
+				commandId: editorAction.id,
+				commandAlias: editorAction.alias,
+				label: editorAction.label || editorAction.id,
+			});
+		}
+
+		return editorCommandPicks;
+	}
+}

src/vs/editor/editor.main.ts

@@ -12,6 +12,7 @@ import 'vs/editor/standalone/browser/quickOpen/quickCommand';
 import 'vs/editor/standalone/browser/quickOpen/quickOutline';
 import 'vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess';
 import 'vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess';
+import 'vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess';
 import 'vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch';
 import 'vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast';
 

src/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess.ts

@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IQuickAccessRegistry, Extensions } from 'vs/platform/quickinput/common/quickAccess';
+import { QuickCommandNLS } from 'vs/editor/common/standaloneStrings';
+import { ICommandQuickPick } from 'vs/platform/quickinput/browser/commandsQuickAccess';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { AbstractEditorCommandsQuickAccessProvider } from 'vs/editor/contrib/quickAccess/commandsQuickAccess';
+import { IEditor } from 'vs/editor/common/editorCommon';
+import { withNullAsUndefined } from 'vs/base/common/types';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+
+export class StandaloneCommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
+
+	get activeTextEditorControl(): IEditor | undefined { return withNullAsUndefined(this.codeEditorService.getFocusedCodeEditor()); }
+
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@ICommandService commandService: ICommandService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@INotificationService notificationService: INotificationService
+	) {
+		super({ showAlias: false }, instantiationService, keybindingService, commandService, telemetryService, notificationService);
+	}
+
+	protected async getCommandPicks(): Promise<Array<ICommandQuickPick>> {
+		return this.getCodeEditorCommandPicks();
+	}
+}
+
+Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess).registerQuickAccessProvider({
+	ctor: StandaloneCommandsQuickAccessProvider,
+	prefix: StandaloneCommandsQuickAccessProvider.PREFIX,
+	helpEntries: [{ description: QuickCommandNLS.quickCommandHelp, needsEditor: true }]
+});

src/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractGotoLineQuickAccessProvider } from 'vs/editor/contrib/quickAccess/gotoLine';
+import { AbstractGotoLineQuickAccessProvider } from 'vs/editor/contrib/quickAccess/gotoLineQuickAccess';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IQuickAccessRegistry, Extensions } from 'vs/platform/quickinput/common/quickAccess';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';