Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 14 additions & 5 deletions src/codeAction/codeActionProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,20 @@ export class CodeActionProvider implements vscode.CodeActionProvider {
): vscode.ProviderResult<vscode.CodeAction[]> {
return Promise.all(
context.diagnostics
.map((diagnostic) =>
providers.map((provider) =>
provider(diagnostic, document, range, token),
),
)
.map((diagnostic) => {
const code =
typeof diagnostic.code === "object"
? diagnostic.code?.value
: diagnostic.code;

if (typeof code !== "string") {
return [];
}

return providers.map((provider) =>
provider(code, diagnostic, document, range, token),
);
})
.flat(),
).then((actions) => actions.flat());
}
Expand Down
3 changes: 2 additions & 1 deletion src/features/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,13 @@ export const viteEnvCodeActionProvider: vscode.CodeActionProvider = {
};

export const codeActionProvider: CodeActionProviderFunction = async (
code: string,
diagnostic: vscode.Diagnostic,
document: vscode.TextDocument,
range: vscode.Range | vscode.Selection,
token: vscode.CancellationToken,
): Promise<vscode.CodeAction[]> => {
if (diagnostic.code !== "env") {
if (code !== "env") {
return [];
}

Expand Down
3 changes: 2 additions & 1 deletion src/features/inertia.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,13 @@ export const diagnosticProvider = (
};

export const codeActionProvider: CodeActionProviderFunction = async (
code: string,
diagnostic: vscode.Diagnostic,
document: vscode.TextDocument,
range: vscode.Range | vscode.Selection,
token: vscode.CancellationToken,
): Promise<vscode.CodeAction[]> => {
if (diagnostic.code !== "inertia") {
if (code !== "inertia") {
return [];
}

Expand Down
3 changes: 2 additions & 1 deletion src/features/view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,13 @@ export const diagnosticProvider = (
};

export const codeActionProvider: CodeActionProviderFunction = async (
code: string,
diagnostic: vscode.Diagnostic,
document: vscode.TextDocument,
range: vscode.Range | vscode.Selection,
token: vscode.CancellationToken,
): Promise<vscode.CodeAction[]> => {
if (diagnostic.code !== "view") {
if (code !== "view") {
return [];
}

Expand Down
1 change: 1 addition & 0 deletions src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as vscode from "vscode";
import AutocompleteResult from "./parser/AutocompleteResult";

type CodeActionProviderFunction = (
code: string,
diagnostic: vscode.Diagnostic,
document: vscode.TextDocument,
range: vscode.Range | vscode.Selection,
Expand Down