diff --git a/crates/ruff/resources/test/fixtures/eradicate/ERA001.py b/crates/ruff/resources/test/fixtures/eradicate/ERA001.py index b12529624a..a21d51c4ca 100644 --- a/crates/ruff/resources/test/fixtures/eradicate/ERA001.py +++ b/crates/ruff/resources/test/fixtures/eradicate/ERA001.py @@ -14,3 +14,8 @@ def foo(x, y, z): return False #import os # noqa: ERA001 + + +class A(): + pass + # b = c diff --git a/crates/ruff/src/rules/eradicate/rules.rs b/crates/ruff/src/rules/eradicate/rules.rs index ff0380165b..2a67f4ec9e 100644 --- a/crates/ruff/src/rules/eradicate/rules.rs +++ b/crates/ruff/src/rules/eradicate/rules.rs @@ -1,4 +1,4 @@ -use ruff_text_size::{TextLen, TextRange}; +use ruff_text_size::TextRange; use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit}; use ruff_macros::{derive_message_formats, violation}; @@ -58,10 +58,7 @@ pub fn commented_out_code( if is_standalone_comment(line) && comment_contains_code(line, &settings.task_tags[..]) { let mut diagnostic = Diagnostic::new(CommentedOutCode, range); if autofix.into() && settings.rules.should_fix(Rule::CommentedOutCode) { - diagnostic.set_fix(Edit::range_deletion(TextRange::at( - range.start(), - line.text_len(), - ))); + diagnostic.set_fix(Edit::range_deletion(locator.full_lines_range(range))); } Some(diagnostic) } else { diff --git a/crates/ruff/src/rules/eradicate/snapshots/ruff__rules__eradicate__tests__ERA001_ERA001.py.snap b/crates/ruff/src/rules/eradicate/snapshots/ruff__rules__eradicate__tests__ERA001_ERA001.py.snap index 4005ebdb4a..4c60ac1639 100644 --- a/crates/ruff/src/rules/eradicate/snapshots/ruff__rules__eradicate__tests__ERA001_ERA001.py.snap +++ b/crates/ruff/src/rules/eradicate/snapshots/ruff__rules__eradicate__tests__ERA001_ERA001.py.snap @@ -91,4 +91,19 @@ ERA001.py:13:5: ERA001 [*] Found commented-out code 15 14 | 16 15 | #import os # noqa: ERA001 +ERA001.py:21:5: ERA001 [*] Found commented-out code + | +21 | class A(): +22 | pass +23 | # b = c + | ^^^^^^^ ERA001 + | + = help: Remove commented-out code + +ℹ Suggested fix +18 18 | +19 19 | class A(): +20 20 | pass +21 |- # b = c +