mirror of https://github.com/astral-sh/ruff
Avoid parsing joint rule codes as distinct codes in # noqa
This commit is contained in:
parent
feba5031dc
commit
383676e332
|
|
@ -183,7 +183,7 @@ impl<'a> Directive<'a> {
|
||||||
// Extract, e.g., the `401` in `F401`.
|
// Extract, e.g., the `401` in `F401`.
|
||||||
let suffix = line[prefix..]
|
let suffix = line[prefix..]
|
||||||
.chars()
|
.chars()
|
||||||
.take_while(char::is_ascii_digit)
|
.take_while(char::is_ascii_alphanumeric)
|
||||||
.count();
|
.count();
|
||||||
if prefix > 0 && suffix > 0 {
|
if prefix > 0 && suffix > 0 {
|
||||||
Some(&line[..prefix + suffix])
|
Some(&line[..prefix + suffix])
|
||||||
|
|
@ -550,7 +550,7 @@ impl<'a> ParsedFileExemption<'a> {
|
||||||
// Extract, e.g., the `401` in `F401`.
|
// Extract, e.g., the `401` in `F401`.
|
||||||
let suffix = line[prefix..]
|
let suffix = line[prefix..]
|
||||||
.chars()
|
.chars()
|
||||||
.take_while(char::is_ascii_digit)
|
.take_while(char::is_ascii_alphanumeric)
|
||||||
.count();
|
.count();
|
||||||
if prefix > 0 && suffix > 0 {
|
if prefix > 0 && suffix > 0 {
|
||||||
Some(&line[..prefix + suffix])
|
Some(&line[..prefix + suffix])
|
||||||
|
|
@ -897,7 +897,7 @@ pub(crate) struct NoqaDirectiveLine<'a> {
|
||||||
pub(crate) directive: Directive<'a>,
|
pub(crate) directive: Directive<'a>,
|
||||||
/// The codes that are ignored by the directive.
|
/// The codes that are ignored by the directive.
|
||||||
pub(crate) matches: Vec<NoqaCode>,
|
pub(crate) matches: Vec<NoqaCode>,
|
||||||
// Whether the directive applies to range.end
|
/// Whether the directive applies to `range.end`.
|
||||||
pub(crate) includes_end: bool,
|
pub(crate) includes_end: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1193,6 +1193,18 @@ mod tests {
|
||||||
assert_debug_snapshot!(Directive::try_extract(source, TextSize::default()));
|
assert_debug_snapshot!(Directive::try_extract(source, TextSize::default()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn noqa_squashed_codes() {
|
||||||
|
let source = "# noqa: F401F841";
|
||||||
|
assert_debug_snapshot!(Directive::try_extract(source, TextSize::default()));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn noqa_empty_comma() {
|
||||||
|
let source = "# noqa: F401,,F841";
|
||||||
|
assert_debug_snapshot!(Directive::try_extract(source, TextSize::default()));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn noqa_invalid_suffix() {
|
fn noqa_invalid_suffix() {
|
||||||
let source = "# noqa[F401]";
|
let source = "# noqa[F401]";
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
---
|
||||||
|
source: crates/ruff_linter/src/noqa.rs
|
||||||
|
expression: "Directive::try_extract(source, TextSize::default())"
|
||||||
|
---
|
||||||
|
Ok(
|
||||||
|
Some(
|
||||||
|
Codes(
|
||||||
|
Codes {
|
||||||
|
range: 0..18,
|
||||||
|
codes: [
|
||||||
|
Code {
|
||||||
|
code: "F401",
|
||||||
|
range: 8..12,
|
||||||
|
},
|
||||||
|
Code {
|
||||||
|
code: "F841",
|
||||||
|
range: 14..18,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
---
|
||||||
|
source: crates/ruff_linter/src/noqa.rs
|
||||||
|
expression: "Directive::try_extract(source, TextSize::default())"
|
||||||
|
---
|
||||||
|
Ok(
|
||||||
|
Some(
|
||||||
|
Codes(
|
||||||
|
Codes {
|
||||||
|
range: 0..16,
|
||||||
|
codes: [
|
||||||
|
Code {
|
||||||
|
code: "F401F841",
|
||||||
|
range: 8..16,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
Loading…
Reference in New Issue