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

Sort code actions by specificity #245

Merged
merged 1 commit into from
Sep 27, 2023
Merged

Sort code actions by specificity #245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
124 changes: 62 additions & 62 deletions ruff_lsp/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,68 +487,6 @@ async def code_action(params: CodeActionParams) -> list[CodeAction] | None:

actions: list[CodeAction] = []

if settings["organizeImports"]:
# Add "Ruff: Organize Imports" as a supported action.
if not params.context.only or (
CodeActionKind.SourceOrganizeImports in params.context.only
):
if CLIENT_CAPABILITIES[CODE_ACTION_RESOLVE]:
actions.append(
CodeAction(
title="Ruff: Organize Imports",
kind=CodeActionKind.SourceOrganizeImports,
data=params.text_document.uri,
edit=None,
diagnostics=[],
),
)
else:
edits = await _fix_document_impl(document, only="I001")
if edits:
actions.append(
CodeAction(
title="Ruff: Organize Imports",
kind=CodeActionKind.SourceOrganizeImports,
data=params.text_document.uri,
edit=_create_workspace_edits(document, edits),
diagnostics=[],
),
)

if settings["fixAll"]:
# Add "Ruff: Fix All" as a supported action.
if not params.context.only or (
CodeActionKind.SourceFixAll in params.context.only
):
if CLIENT_CAPABILITIES[CODE_ACTION_RESOLVE]:
actions.append(
CodeAction(
title="Ruff: Fix All",
kind=CodeActionKind.SourceFixAll,
data=params.text_document.uri,
edit=None,
diagnostics=[],
),
)
else:
edits = await _fix_document_impl(document)
if edits:
actions.append(
CodeAction(
title="Ruff: Fix All",
kind=CodeActionKind.SourceFixAll,
data=params.text_document.uri,
edit=_create_workspace_edits(document, edits),
diagnostics=[
diagnostic
for diagnostic in params.context.diagnostics
if diagnostic.source == "Ruff"
and cast(DiagnosticData, diagnostic.data).get("fix")
is not None
],
),
)

# Add "Ruff: Autofix" for every fixable diagnostic.
if settings.get("codeAction", {}).get("fixViolation", {}).get("enable", True):
if not params.context.only or CodeActionKind.QuickFix in params.context.only:
Expand Down Expand Up @@ -629,6 +567,68 @@ async def code_action(params: CodeActionParams) -> list[CodeAction] | None:
),
)

if settings["organizeImports"]:
# Add "Ruff: Organize Imports" as a supported action.
if not params.context.only or (
CodeActionKind.SourceOrganizeImports in params.context.only
):
if CLIENT_CAPABILITIES[CODE_ACTION_RESOLVE]:
actions.append(
CodeAction(
title="Ruff: Organize Imports",
kind=CodeActionKind.SourceOrganizeImports,
data=params.text_document.uri,
edit=None,
diagnostics=[],
),
)
else:
edits = await _fix_document_impl(document, only="I001")
if edits:
actions.append(
CodeAction(
title="Ruff: Organize Imports",
kind=CodeActionKind.SourceOrganizeImports,
data=params.text_document.uri,
edit=_create_workspace_edits(document, edits),
diagnostics=[],
),
)

if settings["fixAll"]:
# Add "Ruff: Fix All" as a supported action.
if not params.context.only or (
CodeActionKind.SourceFixAll in params.context.only
):
if CLIENT_CAPABILITIES[CODE_ACTION_RESOLVE]:
actions.append(
CodeAction(
title="Ruff: Fix All",
kind=CodeActionKind.SourceFixAll,
data=params.text_document.uri,
edit=None,
diagnostics=[],
),
)
else:
edits = await _fix_document_impl(document)
if edits:
actions.append(
CodeAction(
title="Ruff: Fix All",
kind=CodeActionKind.SourceFixAll,
data=params.text_document.uri,
edit=_create_workspace_edits(document, edits),
diagnostics=[
diagnostic
for diagnostic in params.context.diagnostics
if diagnostic.source == "Ruff"
and cast(DiagnosticData, diagnostic.data).get("fix")
is not None
],
),
)

return actions if actions else None


Expand Down