B005: Reflect method name in diagnostic, adapt range

The diagnostic message now reports the method name,
and range was adapted to be more precise and only
cover the call and argument.

Author: Viicos

crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B005.py

@@ -22,6 +22,7 @@
 s.strip("ああ")  # warning
 s.strip("\ufeff")  # no warning
 s.strip("\u0074\u0065\u0073\u0074")  # warning
+s.strip("--").lstrip("--")  # two warnings
 
 from somewhere import other_type, strip
 

crates/ruff_linter/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs

@@ -2,10 +2,11 @@ use itertools::Itertools;
 use ruff_python_ast::{self as ast, Expr};
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_text_size::Ranged;
+use ruff_text_size::{Ranged, TextRange};
 
 use crate::Violation;
 use crate::checkers::ast::Checker;
+use crate::rules::pylint::rules::StripKind;
 
 /// ## What it does
 /// Checks for uses of multi-character strings in `.strip()`, `.lstrip()`, and
@@ -43,15 +44,18 @@ use crate::checkers::ast::Checker;
 /// ```
 ///
 /// ## References
-/// - [Python documentation: `str.strip`](https://docs.python.org/3/library/stdtypes.html#str.strip)
+/// - [Python documentation: `str.strip()`](https://docs.python.org/3/library/stdtypes.html#str.strip)
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.106")]
-pub(crate) struct StripWithMultiCharacters;
+pub(crate) struct StripWithMultiCharacters {
+    strip: StripKind,
+}
 
 impl Violation for StripWithMultiCharacters {
     #[derive_message_formats]
     fn message(&self) -> String {
-        "Using `.strip()` with multi-character strings is misleading".to_string()
+        let Self { strip } = self;
+        format!("Using `.{strip}()` with multi-character strings is misleading")
     }
 }
 
@@ -65,15 +69,18 @@ pub(crate) fn strip_with_multi_characters(
     let Expr::Attribute(ast::ExprAttribute { attr, .. }) = func else {
         return;
     };
-    if !matches!(attr.as_str(), "strip" | "lstrip" | "rstrip") {
+    let Some(strip) = StripKind::from_str(attr.as_str()) else {
         return;
-    }
+    };
 
     let [Expr::StringLiteral(ast::ExprStringLiteral { value, .. })] = args else {
         return;
     };
 
     if value.chars().count() > 1 && !value.chars().all_unique() {
-        checker.report_diagnostic(StripWithMultiCharacters, expr.range());
+        checker.report_diagnostic(
+            StripWithMultiCharacters { strip },
+            TextRange::new(attr.start(), expr.end()),
+        );
     }
 }

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B005_B005.py.snap

@@ -2,89 +2,110 @@
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
 B005 Using `.strip()` with multi-character strings is misleading
- --> B005.py:4:1
+ --> B005.py:4:3
   |
 2 | s.strip(s)  # no warning
 3 | s.strip("we")  # no warning
 4 | s.strip(".facebook.com")  # warning
-  | ^^^^^^^^^^^^^^^^^^^^^^^^
+  |   ^^^^^^^^^^^^^^^^^^^^^^
 5 | s.strip("e")  # no warning
 6 | s.strip("\n\t ")  # no warning
   |
 
 B005 Using `.strip()` with multi-character strings is misleading
- --> B005.py:7:1
+ --> B005.py:7:3
   |
 5 | s.strip("e")  # no warning
 6 | s.strip("\n\t ")  # no warning
 7 | s.strip(r"\n\t ")  # warning
-  | ^^^^^^^^^^^^^^^^^
+  |   ^^^^^^^^^^^^^^^
 8 | s.lstrip(s)  # no warning
 9 | s.lstrip("we")  # no warning
   |
 
-B005 Using `.strip()` with multi-character strings is misleading
-  --> B005.py:10:1
+B005 Using `.lstrip()` with multi-character strings is misleading
+  --> B005.py:10:3
    |
  8 | s.lstrip(s)  # no warning
  9 | s.lstrip("we")  # no warning
 10 | s.lstrip(".facebook.com")  # warning
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |   ^^^^^^^^^^^^^^^^^^^^^^^
 11 | s.lstrip("e")  # no warning
 12 | s.lstrip("\n\t ")  # no warning
    |
 
-B005 Using `.strip()` with multi-character strings is misleading
-  --> B005.py:13:1
+B005 Using `.lstrip()` with multi-character strings is misleading
+  --> B005.py:13:3
    |
 11 | s.lstrip("e")  # no warning
 12 | s.lstrip("\n\t ")  # no warning
 13 | s.lstrip(r"\n\t ")  # warning
-   | ^^^^^^^^^^^^^^^^^^
+   |   ^^^^^^^^^^^^^^^^
 14 | s.rstrip(s)  # no warning
 15 | s.rstrip("we")  # warning
    |
 
-B005 Using `.strip()` with multi-character strings is misleading
-  --> B005.py:16:1
+B005 Using `.rstrip()` with multi-character strings is misleading
+  --> B005.py:16:3
    |
 14 | s.rstrip(s)  # no warning
 15 | s.rstrip("we")  # warning
 16 | s.rstrip(".facebook.com")  # warning
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |   ^^^^^^^^^^^^^^^^^^^^^^^
 17 | s.rstrip("e")  # no warning
 18 | s.rstrip("\n\t ")  # no warning
    |
 
-B005 Using `.strip()` with multi-character strings is misleading
-  --> B005.py:19:1
+B005 Using `.rstrip()` with multi-character strings is misleading
+  --> B005.py:19:3
    |
 17 | s.rstrip("e")  # no warning
 18 | s.rstrip("\n\t ")  # no warning
 19 | s.rstrip(r"\n\t ")  # warning
-   | ^^^^^^^^^^^^^^^^^^
+   |   ^^^^^^^^^^^^^^^^
 20 | s.strip("a")  # no warning
 21 | s.strip("あ")  # no warning
    |
 
 B005 Using `.strip()` with multi-character strings is misleading
-  --> B005.py:22:1
+  --> B005.py:22:3
    |
 20 | s.strip("a")  # no warning
 21 | s.strip("あ")  # no warning
 22 | s.strip("ああ")  # warning
-   | ^^^^^^^^^^^^^^^
+   |   ^^^^^^^^^^^^^
 23 | s.strip("\ufeff")  # no warning
 24 | s.strip("\u0074\u0065\u0073\u0074")  # warning
    |
 
 B005 Using `.strip()` with multi-character strings is misleading
-  --> B005.py:24:1
+  --> B005.py:24:3
    |
 22 | s.strip("ああ")  # warning
 23 | s.strip("\ufeff")  # no warning
 24 | s.strip("\u0074\u0065\u0073\u0074")  # warning
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-25 |
-26 | from somewhere import other_type, strip
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+25 | s.strip("--").lstrip("--")  # two warnings
+   |
+
+B005 Using `.strip()` with multi-character strings is misleading
+  --> B005.py:25:3
+   |
+23 | s.strip("\ufeff")  # no warning
+24 | s.strip("\u0074\u0065\u0073\u0074")  # warning
+25 | s.strip("--").lstrip("--")  # two warnings
+   |   ^^^^^^^^^^^
+26 |
+27 | from somewhere import other_type, strip
+   |
+
+B005 Using `.lstrip()` with multi-character strings is misleading
+  --> B005.py:25:15
+   |
+23 | s.strip("\ufeff")  # no warning
+24 | s.strip("\u0074\u0065\u0073\u0074")  # warning
+25 | s.strip("--").lstrip("--")  # two warnings
+   |               ^^^^^^^^^^^^
+26 |
+27 | from somewhere import other_type, strip
    |

crates/ruff_linter/src/rules/pylint/rules/bad_str_strip_call.rs

@@ -46,7 +46,7 @@ use ruff_python_ast::PythonVersion;
 /// - `target-version`
 ///
 /// ## References
-/// - [Python documentation: `str.strip`](https://docs.python.org/3/library/stdtypes.html?highlight=strip#str.strip)
+/// - [Python documentation: `str.strip()`](https://docs.python.org/3/library/stdtypes.html?highlight=strip#str.strip)
 #[derive(ViolationMetadata)]
 #[violation_metadata(stable_since = "v0.0.242")]
 pub(crate) struct BadStrStripCall {