Don't show lightbulb if we only have a selection

mjbvz · mjbvz · commit ab77235bfb26 · 2018-06-15T11:08:22.000-07:00
Removes code action trigger proposal Fixes microsoft#52070
diff --git a/extensions/typescript-language-features/src/features/refactor.ts b/extensions/typescript-language-features/src/features/refactor.ts
@@ -189,7 +189,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
 			return false;
 		}
 
-		return rangeOrSelection instanceof vscode.Selection && (!rangeOrSelection.isEmpty || context.triggerKind === vscode.CodeActionTrigger.Manual);
+		return rangeOrSelection instanceof vscode.Selection;
 	}
 
 	private static getKind(refactor: Proto.RefactorActionInfo) {
diff --git a/src/vs/editor/contrib/codeAction/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts
@@ -12,6 +12,7 @@ import 'vs/css!./lightBulbWidget';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { CodeActionsComputeEvent } from './codeActionModel';
+import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
 
 export class LightBulbWidget implements IDisposable, IContentWidget {
 
@@ -114,9 +115,14 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 		const { token } = this._futureFixes;
 		this._model = value;
 
+		const selection = this._model.rangeOrSelection;
 		this._model.actions.done(fixes => {
 			if (!token.isCancellationRequested && fixes && fixes.length > 0) {
-				this._show();
+				if (selection.isEmpty() && fixes.every(fix => fix.kind && CodeActionKind.Refactor.contains(fix.kind))) {
+					this.hide();
+				} else {
+					this._show();
+				}
 			} else {
 				this.hide();
 			}
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -566,33 +566,6 @@ declare module 'vscode' {
 	}
 	//#endregion
 
-	//#region mjbvz: Code action trigger
-
-	/**
-	 * How a [code action provider](#CodeActionProvider) was triggered
-	 */
-	export enum CodeActionTrigger {
-		/**
-		 * Provider was triggered automatically by VS Code.
-		 */
-		Automatic = 1,
-
-		/**
-		 * User requested code actions.
-		 */
-		Manual = 2,
-	}
-
-	interface CodeActionContext {
-		/**
-		 * How the code action provider was triggered.
-		 */
-		triggerKind?: CodeActionTrigger;
-	}
-
-	//#endregion
-
-
 	//#region Matt: WebView Serializer
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {`
`189`	`189`	`return false;`
`190`	`190`	`}`
`191`	`191`
`192`		`- return rangeOrSelection instanceof vscode.Selection && (!rangeOrSelection.isEmpty \|\| context.triggerKind === vscode.CodeActionTrigger.Manual);`
	`192`	`+ return rangeOrSelection instanceof vscode.Selection;`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`private static getKind(refactor: Proto.RefactorActionInfo) {`