From f4444266f95c47342075f210e95a16c1544d7744 Mon Sep 17 00:00:00 2001 From: Amethyst Reese Date: Fri, 6 Mar 2026 18:01:49 -0800 Subject: [PATCH 1/2] Fix `--add-noqa` creating unwanted leading whitespace When generating a new `#noqa` comment in `--add-noqa`, check to see if the line is blank or not, and if it's blank, don't write the leading whitespace. Fix #23751 --- crates/ruff/tests/cli/lint.rs | 4 ++-- crates/ruff_linter/src/noqa.rs | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/crates/ruff/tests/cli/lint.rs b/crates/ruff/tests/cli/lint.rs index b5167ef9fd0af..342ae06a5f657 100644 --- a/crates/ruff/tests/cli/lint.rs +++ b/crates/ruff/tests/cli/lint.rs @@ -1902,7 +1902,7 @@ select = ["D100"] let test_code = fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file"); - insta::assert_snapshot!(test_code, @" # noqa: D100"); + insta::assert_snapshot!(test_code, @"# noqa: D100"); Ok(()) } @@ -1944,7 +1944,7 @@ select = ["D100"] insta::assert_snapshot!(test_code, @" #!/usr/bin/env fake command - # noqa: D100 + # noqa: D100 "); Ok(()) diff --git a/crates/ruff_linter/src/noqa.rs b/crates/ruff_linter/src/noqa.rs index 8441bf943405a..70bced423e804 100644 --- a/crates/ruff_linter/src/noqa.rs +++ b/crates/ruff_linter/src/noqa.rs @@ -958,6 +958,7 @@ struct NoqaEdit<'a> { codes: Option<&'a Codes<'a>>, line_ending: LineEnding, reason: Option<&'a str>, + blank_line: bool, } impl NoqaEdit<'_> { @@ -969,7 +970,10 @@ impl NoqaEdit<'_> { } fn write(&self, writer: &mut impl std::fmt::Write) { - write!(writer, " # noqa: ").unwrap(); + if !self.blank_line { + write!(writer, " ").unwrap(); + } + write!(writer, "# noqa: ").unwrap(); match self.codes { Some(codes) => { push_codes( @@ -1010,11 +1014,13 @@ fn generate_noqa_edit<'a>( let edit_range; let codes; + let blank_line; // Add codes. match directive { None => { let trimmed_line = locator.slice(line_range).trim_end(); + blank_line = trimmed_line.trim_start().is_empty(); edit_range = TextRange::new(TextSize::of(trimmed_line), line_range.len()) + offset; codes = None; } @@ -1023,6 +1029,7 @@ fn generate_noqa_edit<'a>( let trimmed_line = locator .slice(TextRange::new(line_range.start(), existing_codes.start())) .trim_end(); + blank_line = false; edit_range = TextRange::new(TextSize::of(trimmed_line), line_range.len()) + offset; codes = Some(existing_codes); } @@ -1035,6 +1042,7 @@ fn generate_noqa_edit<'a>( codes, line_ending, reason, + blank_line, }) } From 93fe767230d666194889501d33d8d3121e6b8d51 Mon Sep 17 00:00:00 2001 From: Amethyst Reese Date: Mon, 9 Mar 2026 12:43:50 -0700 Subject: [PATCH 2/2] Use python whitespace --- crates/ruff_linter/src/noqa.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/ruff_linter/src/noqa.rs b/crates/ruff_linter/src/noqa.rs index 70bced423e804..ebd9dc98501e0 100644 --- a/crates/ruff_linter/src/noqa.rs +++ b/crates/ruff_linter/src/noqa.rs @@ -10,6 +10,7 @@ use itertools::Itertools; use log::warn; use ruff_db::diagnostic::{Diagnostic, SecondaryCode}; +use ruff_python_trivia::PythonWhitespace; use ruff_python_trivia::{CommentRanges, Cursor, indentation_at_offset}; use ruff_source_file::{LineEnding, LineRanges}; use ruff_text_size::{Ranged, TextLen, TextRange, TextSize}; @@ -1020,7 +1021,7 @@ fn generate_noqa_edit<'a>( match directive { None => { let trimmed_line = locator.slice(line_range).trim_end(); - blank_line = trimmed_line.trim_start().is_empty(); + blank_line = trimmed_line.trim_whitespace_start().is_empty(); edit_range = TextRange::new(TextSize::of(trimmed_line), line_range.len()) + offset; codes = None; }