Skip to content

fix(oxlint/lsp): disable rule for this line should not be preferred #19083

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

Merged
graphite-app merged 1 commit into from
Feb 9, 2026
Merged

fix(oxlint/lsp): disable rule for this line should not be preferred #19083

Show file tree
Hide file tree
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
16 changes: 12 additions & 4 deletions apps/oxlint/src/lsp/code_actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use oxc_linter::FixKind;
use tower_lsp_server::ls_types::{CodeAction, CodeActionKind, TextEdit, Uri, WorkspaceEdit};
use tracing::debug;

use crate::lsp::error_with_position::{FixedContent, LinterCodeAction};
use crate::lsp::error_with_position::{FixedContent, FixedContentKind, LinterCodeAction};

pub const CODE_ACTION_KIND_SOURCE_FIX_ALL_OXC: CodeActionKind =
CodeActionKind::new("source.fixAll.oxc");
Expand Down Expand Up @@ -34,11 +34,19 @@ fn fix_content_to_code_action(
pub fn apply_fix_code_actions(action: LinterCodeAction, uri: &Uri) -> Vec<CodeAction> {
let mut code_actions = vec![];

// only the first code action is preferred
let mut preferred = true;
let mut preferred_possible = true;
for fixed in action.fixed_content {
// only rule fixes and unused directive fixes can be preferred, ignore fixes are not preferred.
let preferred = preferred_possible
&& matches!(
fixed.lsp_kind,
FixedContentKind::LintRule | FixedContentKind::UnusedDirective
);
if preferred {
// only the first fix can be preferred, if there are multiple fixes available.
preferred_possible = false;
}
let action = fix_content_to_code_action(fixed, uri.clone(), preferred);
preferred = false;
code_actions.push(action);
}

Expand Down
7 changes: 3 additions & 4 deletions apps/oxlint/src/lsp/error_with_position.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@ pub struct FixedContent {
pub code: String,
pub range: Range,
pub kind: FixKind,
#[expect(dead_code)]
lsp_kind: FixedContentKind,
pub lsp_kind: FixedContentKind,
}

#[derive(Debug, Clone)]
enum FixedContentKind {
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum FixedContentKind {
LintRule,
IgnoreLintRuleLine,
IgnoreLintRuleSection,
Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/src/lsp/snapshots/fixtures_lsp_cross_module@dep-a.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable import/no-cycle for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/src/lsp/snapshots/fixtures_lsp_cross_module_extended_config@dep-a.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable import/no-cycle for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
2 changes: 1 addition & 1 deletion ...p/snapshots/fixtures_lsp_cross_module_nested_config@dep-a.ts_folder__folder-dep-a.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable import/no-cycle for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/src/lsp/snapshots/fixtures_lsp_deny_no_console@hello_world.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable no-console for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
4 changes: 2 additions & 2 deletions ...gger.astro_vue__debugger.vue_svelte__debugger.svelte_nextjs__[[..rest]]__debugger.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ TextEdit: TextEdit {

CodeAction:
Title: Disable no-unassigned-vars for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down Expand Up @@ -627,7 +627,7 @@ TextEdit: TextEdit {

CodeAction:
Title: Disable no-unassigned-vars for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
4 changes: 2 additions & 2 deletions apps/oxlint/src/lsp/snapshots/fixtures_lsp_issue_9958@issue.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable no-extra-boolean-cast for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down Expand Up @@ -82,7 +82,7 @@ TextEdit: TextEdit {

CodeAction:
Title: Disable typescript/no-non-null-asserted-optional-chain for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/src/lsp/snapshots/fixtures_lsp_regexp_feature@index.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable no-control-regex for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/src/lsp/snapshots/fixtures_lsp_ts_path_alias@deep__src__dep-a.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable import/no-cycle for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
4 changes: 2 additions & 2 deletions apps/oxlint/src/lsp/snapshots/fixtures_lsp_tsgolint@no-floating-promises__index.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable no-unused-expressions for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down Expand Up @@ -400,7 +400,7 @@ TextEdit: TextEdit {

CodeAction:
Title: Disable typescript/no-floating-promises for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
4 changes: 2 additions & 2 deletions apps/oxlint/src/lsp/snapshots/fixtures_lsp_tsgolint_unused_disabled_directives@test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable typescript/no-floating-promises for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down Expand Up @@ -68,7 +68,7 @@ TextEdit: TextEdit {

CodeAction:
Title: Disable typescript/no-floating-promises for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/src/lsp/snapshots/fixtures_lsp_unused_disabled_directives@test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ tags: None
########### Code Actions/Commands
CodeAction:
Title: Disable no-console for this line
Is Preferred: Some(true)
Is Preferred: Some(false)
TextEdit: TextEdit {
range: Range {
start: Position {
Expand Down
Loading