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

[ruff] Fix panic in unused # noqa removal with multi-byte space (RUF100) #10682

Merged
merged 4 commits into from
Apr 1, 2024
Merged

[ruff] Fix panic in unused # noqa removal with multi-byte space (RUF100) #10682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d897794
Fix panic in RUF100
diceroll123 Mar 31, 2024
2785331
add a case that deletes the whole comment
diceroll123 Mar 31, 2024
8e8c181
Merge branch 'main' into fix-ruf100-panic
charliermarsh Apr 1, 2024
2a6b782
Remove unused case
charliermarsh Apr 1, 2024
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
6 changes: 6 additions & 0 deletions crates/ruff_linter/resources/test/fixtures/ruff/RUF100_0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,9 @@ def f():

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
""" # noqa


def f():
# Invalid - nonexistant error code with multibyte character
d = 1 #…noqa: F841, E50
e = 1 #…noqa: E50
9 changes: 6 additions & 3 deletions crates/ruff_linter/src/fix/edits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ pub(crate) fn delete_comment(range: TextRange, locator: &Locator) -> Edit {
}
// Ex) `x = 1 # noqa`
else if range.end() + trailing_space_len == line_range.end() {
// Replace `x = 1 # noqa` with `x = 1`.
Edit::deletion(range.start() - leading_space_len, line_range.end())
}
// Ex) `x = 1 # noqa # type: ignore`
Expand All @@ -93,13 +94,15 @@ pub(crate) fn delete_comment(range: TextRange, locator: &Locator) -> Edit {
))
.starts_with('#')
{
// Replace `# noqa # type: ignore` with `# type: ignore`.
Edit::deletion(range.start(), range.end() + trailing_space_len)
}
// Ex) `x = 1 # noqa here`
else {
Edit::deletion(
range.start() + "# ".text_len(),
range.end() + trailing_space_len,
// Replace `# noqa here` with `# here`.
Edit::range_replacement(
"# ".to_string(),
TextRange::new(range.start(), range.end() + trailing_space_len),
)
}
}
Expand Down
47 changes: 47 additions & 0 deletions crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,4 +284,51 @@ RUF100_0.py:93:92: RUF100 [*] Unused `noqa` directive (unused: `F401`)
95 95 |
96 96 | def f():

RUF100_0.py:107:12: RUF100 [*] Unused `noqa` directive (unknown: `E50`)
|
105 | def f():
106 | # Invalid - nonexistant error code with multibyte character
107 | d = 1 #…noqa: F841, E50
| ^^^^^^^^^^^^^^^^ RUF100
108 | e = 1 #…noqa: E50
|
= help: Remove unused `noqa` directive

ℹ Safe fix
104 104 |
105 105 | def f():
106 106 | # Invalid - nonexistant error code with multibyte character
107 |- d = 1 #…noqa: F841, E50
107 |+ d = 1 # noqa: F841
108 108 | e = 1 #…noqa: E50

RUF100_0.py:108:5: F841 [*] Local variable `e` is assigned to but never used
|
106 | # Invalid - nonexistant error code with multibyte character
107 | d = 1 #…noqa: F841, E50
108 | e = 1 #…noqa: E50
| ^ F841
|
= help: Remove assignment to unused variable `e`

ℹ Unsafe fix
105 105 | def f():
106 106 | # Invalid - nonexistant error code with multibyte character
107 107 | d = 1 #…noqa: F841, E50
108 |- e = 1 #…noqa: E50

RUF100_0.py:108:12: RUF100 [*] Unused `noqa` directive (unknown: `E50`)
|
106 | # Invalid - nonexistant error code with multibyte character
107 | d = 1 #…noqa: F841, E50
108 | e = 1 #…noqa: E50
| ^^^^^^^^^^ RUF100
|
= help: Remove unused `noqa` directive

ℹ Safe fix
105 105 | def f():
106 106 | # Invalid - nonexistant error code with multibyte character
107 107 | d = 1 #…noqa: F841, E50
108 |- e = 1 #…noqa: E50
108 |+ e = 1
47 changes: 47 additions & 0 deletions ...uff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0_prefix.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,4 +264,51 @@ RUF100_0.py:93:92: RUF100 [*] Unused `noqa` directive (unused: `F401`)
95 95 |
96 96 | def f():

RUF100_0.py:107:12: RUF100 [*] Unused `noqa` directive (unknown: `E50`)
|
105 | def f():
106 | # Invalid - nonexistant error code with multibyte character
107 | d = 1 #…noqa: F841, E50
| ^^^^^^^^^^^^^^^^ RUF100
108 | e = 1 #…noqa: E50
|
= help: Remove unused `noqa` directive

ℹ Safe fix
104 104 |
105 105 | def f():
106 106 | # Invalid - nonexistant error code with multibyte character
107 |- d = 1 #…noqa: F841, E50
107 |+ d = 1 # noqa: F841
108 108 | e = 1 #…noqa: E50

RUF100_0.py:108:5: F841 [*] Local variable `e` is assigned to but never used
|
106 | # Invalid - nonexistant error code with multibyte character
107 | d = 1 #…noqa: F841, E50
108 | e = 1 #…noqa: E50
| ^ F841
|
= help: Remove assignment to unused variable `e`

ℹ Unsafe fix
105 105 | def f():
106 106 | # Invalid - nonexistant error code with multibyte character
107 107 | d = 1 #…noqa: F841, E50
108 |- e = 1 #…noqa: E50

RUF100_0.py:108:12: RUF100 [*] Unused `noqa` directive (unknown: `E50`)
|
106 | # Invalid - nonexistant error code with multibyte character
107 | d = 1 #…noqa: F841, E50
108 | e = 1 #…noqa: E50
| ^^^^^^^^^^ RUF100
|
= help: Remove unused `noqa` directive

ℹ Safe fix
105 105 | def f():
106 106 | # Invalid - nonexistant error code with multibyte character
107 107 | d = 1 #…noqa: F841, E50
108 |- e = 1 #…noqa: E50
108 |+ e = 1
Loading