Make sure we don't include disabled actions in the standard light bulb menu

mjbvz · mjbvz · commit bad004944211 · 2019-11-20T17:25:53.000-08:00
diff --git a/src/vs/editor/contrib/codeAction/codeActionUi.ts b/src/vs/editor/contrib/codeAction/codeActionUi.ts
@@ -16,7 +16,7 @@ import { MessageController } from 'vs/editor/contrib/message/messageController';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { CodeActionsState } from './codeActionModel';
-import { CodeActionWidget } from './codeActionWidget';
+import { CodeActionWidget, CodeActionShowOptions } from './codeActionWidget';
 import { LightBulbWidget } from './lightBulbWidget';
 import { CodeActionAutoApply, CodeActionTrigger } from './types';
 
@@ -48,7 +48,7 @@ export class CodeActionUi extends Disposable {
 
 		this._lightBulbWidget = new Lazy(() => {
 			const widget = this._register(new LightBulbWidget(this._editor, quickFixActionId, preferredFixActionId, keybindingService));
-			this._register(widget.onClick(e => this.showCodeActionList(e.actions, e)));
+			this._register(widget.onClick(e => this.showCodeActionList(e.actions, e, { includeDisabledActions: false })));
 			return widget;
 		});
 	}
@@ -69,12 +69,6 @@ export class CodeActionUi extends Disposable {
 
 		this._lightBulbWidget.getValue().update(actions, newState.position);
 
-		if (!actions.allActions.length && newState.trigger.context) {
-			MessageController.get(this._editor).showMessage(newState.trigger.context.notAvailableMessage, newState.trigger.context.position);
-			this._activeCodeActions.value = actions;
-			return;
-		}
-
 		if (newState.trigger.type === 'manual') {
 			if (newState.trigger.filter?.include) { // Triggered for specific scope
 				// Check to see if we want to auto apply.
@@ -100,8 +94,18 @@ export class CodeActionUi extends Disposable {
 				}
 			}
 
+			const includeDisabledActions = !!newState.trigger.filter?.include;
+			if (newState.trigger.context) {
+				if (!actions.allActions.length || !includeDisabledActions && !actions.validActions.length) {
+					MessageController.get(this._editor).showMessage(newState.trigger.context.notAvailableMessage, newState.trigger.context.position);
+					this._activeCodeActions.value = actions;
+					actions.dispose();
+					return;
+				}
+			}
+
 			this._activeCodeActions.value = actions;
-			this._codeActionWidget.getValue().show(actions, newState.position);
+			this._codeActionWidget.getValue().show(actions, newState.position, { includeDisabledActions });
 		} else {
 			// auto magically triggered
 			if (this._codeActionWidget.getValue().isVisible) {
@@ -141,7 +145,7 @@ export class CodeActionUi extends Disposable {
 		return undefined;
 	}
 
-	public async showCodeActionList(actions: CodeActionSet, at: IAnchor | IPosition): Promise<void> {
-		this._codeActionWidget.getValue().show(actions, at);
+	public async showCodeActionList(actions: CodeActionSet, at: IAnchor | IPosition, options: CodeActionShowOptions): Promise<void> {
+		this._codeActionWidget.getValue().show(actions, at, options);
 	}
 }
diff --git a/src/vs/editor/contrib/codeAction/codeActionWidget.ts b/src/vs/editor/contrib/codeAction/codeActionWidget.ts
@@ -39,6 +39,10 @@ class CodeActionAction extends Action {
 	}
 }
 
+export interface CodeActionShowOptions {
+	readonly includeDisabledActions: boolean;
+}
+
 export class CodeActionWidget extends Disposable {
 
 	private _visible: boolean = false;
@@ -63,8 +67,9 @@ export class CodeActionWidget extends Disposable {
 		return this._visible;
 	}
 
-	public async show(codeActions: CodeActionSet, at: IAnchor | IPosition): Promise<void> {
-		if (!codeActions.allActions.length) {
+	public async show(codeActions: CodeActionSet, at: IAnchor | IPosition, options: CodeActionShowOptions): Promise<void> {
+		const actionsToShow = options.includeDisabledActions ? codeActions.allActions : codeActions.validActions;
+		if (!actionsToShow.length) {
 			this._visible = false;
 			return;
 		}
@@ -78,15 +83,15 @@ export class CodeActionWidget extends Disposable {
 		this._visible = true;
 		this._showingActions.value = codeActions;
 
-		const actions = codeActions.allActions.map(action =>
+		const menuActions = actionsToShow.map(action =>
 			new CodeActionAction(action, () => this._delegate.onSelectCodeAction(action)));
 
 		const anchor = Position.isIPosition(at) ? this._toCoords(at) : at || { x: 0, y: 0 };
 		const resolver = this._keybindingResolver.getResolver();
 
 		this._contextMenuService.showContextMenu({
 			getAnchor: () => anchor,
-			getActions: () => actions,
+			getActions: () => menuActions,
 			onHide: () => {
 				this._visible = false;
 				this._editor.focus();
