Skip to content

Commit af28b32

Browse files
authored
Merge pull request #200098 from microsoft/justin/code-provider-1.85
Revert: Allow non-AI actions on empty lines (for 1.85)
2 parents a3c53e1 + 249b265 commit af28b32

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

Diff for: src/vs/editor/contrib/codeAction/browser/codeAction.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export async function getCodeActions(
130130
return emptyCodeActionsResponse;
131131
}
132132

133-
const filteredActions = (providedCodeActions?.actions || []).filter(action => action && filtersAction(filter, action, model, rangeOrSelection));
133+
const filteredActions = (providedCodeActions?.actions || []).filter(action => action && filtersAction(filter, action));
134134
const documentation = getDocumentationFromProvider(provider, filteredActions, filter.include);
135135
return {
136136
actions: filteredActions.map(action => new CodeActionItem(action, provider)),

Diff for: src/vs/editor/contrib/codeAction/common/types.ts

+1-9
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
77
import { onUnexpectedExternalError } from 'vs/base/common/errors';
88
import { Position } from 'vs/editor/common/core/position';
99
import * as languages from 'vs/editor/common/languages';
10-
import { ITextModel } from 'vs/editor/common/model';
1110
import { ActionSet } from 'vs/platform/actionWidget/common/actionWidget';
12-
import { Range } from 'vs/editor/common/core/range';
13-
import { Selection } from 'vs/editor/common/core/selection';
1411

1512
export class CodeActionKind {
1613
private static readonly sep = '.';
@@ -98,7 +95,7 @@ export function mayIncludeActionsOfKind(filter: CodeActionFilter, providedKind:
9895
return true;
9996
}
10097

101-
export function filtersAction(filter: CodeActionFilter, action: languages.CodeAction, model: ITextModel, rangeOrSelection: Range | Selection): boolean {
98+
export function filtersAction(filter: CodeActionFilter, action: languages.CodeAction): boolean {
10299
const actionKind = action.kind ? new CodeActionKind(action.kind) : undefined;
103100

104101
// Filter out actions by kind
@@ -127,11 +124,6 @@ export function filtersAction(filter: CodeActionFilter, action: languages.CodeAc
127124
}
128125
}
129126

130-
// On empty lines and selections, show only code AI code actions
131-
if (rangeOrSelection.isEmpty() && model.getLineContent(rangeOrSelection.startLineNumber).length === 0) {
132-
return !!action.isAI;
133-
}
134-
135127
return true;
136128
}
137129

0 commit comments

Comments
 (0)