Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

groundwork for code action ranges for quick fix #204191

Merged
merged 3 commits into from
Feb 5, 2024
Merged

groundwork for code action ranges for quick fix #204191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03c172e
added in config
justschen Feb 2, 2024
7ea5a73
fix balance between diagnostic and range
justschen Feb 5, 2024
574eee0
cleanup
justschen Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion extensions/typescript-language-features/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"workspaceTrust",
"multiDocumentHighlightProvider",
"mappedEditsProvider",
"codeActionAI"
"codeActionAI",
"codeActionRanges"
],
"capabilities": {
"virtualWorkspaces": {
Expand Down
5 changes: 5 additions & 0 deletions extensions/typescript-language-features/src/languageFeatures/quickFix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
const codeAction = new VsCodeCodeAction(action, action.description, vscode.CodeActionKind.QuickFix);
codeAction.edit = getEditForCodeAction(this.client, action);
codeAction.diagnostics = [diagnostic];
codeAction.ranges = [diagnostic.range];
codeAction.command = {
command: ApplyCodeActionCommand.ID,
arguments: [{ action, diagnostic, document } satisfies ApplyCodeActionCommand_args],
Expand Down Expand Up @@ -362,6 +363,8 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
const inferFromBody = new VsCodeCodeAction(action, 'Infer types using Copilot', vscode.CodeActionKind.QuickFix);
inferFromBody.edit = new vscode.WorkspaceEdit();
inferFromBody.diagnostics = [diagnostic];
console.log(diagnostic, diagnostic.range);
inferFromBody.ranges = [diagnostic.range];
inferFromBody.isAI = true;
inferFromBody.command = {
command: EditorChatFollowUp.ID,
Expand Down Expand Up @@ -389,6 +392,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
aiCodeAction.edit = getEditForCodeAction(this.client, action);
aiCodeAction.edit?.insert(document.uri, diagnostic.range.start, '');
aiCodeAction.diagnostics = [diagnostic];
aiCodeAction.ranges = [diagnostic.range];
aiCodeAction.isAI = true;
aiCodeAction.command = {
command: CompositeCommand.ID,
Expand Down Expand Up @@ -443,6 +447,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
vscode.CodeActionKind.QuickFix);

action.diagnostics = [diagnostic];
action.ranges = [diagnostic.range];
action.command = {
command: ApplyFixAllCodeAction.ID,
arguments: [{ action } satisfies ApplyFixAllCodeAction_args],
Expand Down
1 change: 1 addition & 0 deletions extensions/typescript-language-features/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"src/**/*",
"../../src/vscode-dts/vscode.d.ts",
"../../src/vscode-dts/vscode.proposed.codeActionAI.d.ts",
"../../src/vscode-dts/vscode.proposed.codeActionRanges.d.ts",
"../../src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts",
"../../src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts",
"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts",
Expand Down
Loading