[ruff] Extend unnecessary-regular-expression to non-literal strings (RUF055)

crates/ruff_linter/resources/test/fixtures/ruff/RUF055_1.py

@@ -0,0 +1,16 @@
+"""Test that RUF055 can follow a chain of str assignments for both the pattern
+and the replacement argument to re.sub"""
+
+import re
+
+pat1 = "needle"
+pat2 = pat1
+pat3 = pat2
+
+re.sub(pat3, "", haystack)
+
+if pat4 := pat3:
+    re.sub(pat4, "", haystack)
+
+repl = "new"
+re.sub(r"abc", repl, haystack)

crates/ruff_linter/src/rules/ruff/mod.rs

@@ -409,7 +409,8 @@ mod tests {
     #[test_case(Rule::MapIntVersionParsing, Path::new("RUF048_1.py"))]
     #[test_case(Rule::UnrawRePattern, Path::new("RUF039.py"))]
     #[test_case(Rule::UnrawRePattern, Path::new("RUF039_concat.py"))]
-    #[test_case(Rule::UnnecessaryRegularExpression, Path::new("RUF055.py"))]
+    #[test_case(Rule::UnnecessaryRegularExpression, Path::new("RUF055_0.py"))]
+    #[test_case(Rule::UnnecessaryRegularExpression, Path::new("RUF055_1.py"))]
     fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(
             "preview__{}_{}",

crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs

@@ -1,8 +1,10 @@
 use ruff_diagnostics::{AlwaysFixableViolation, Applicability, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, ViolationMetadata};
+use ruff_python_ast::ExprStringLiteral;
 use ruff_python_ast::{
     Arguments, CmpOp, Expr, ExprAttribute, ExprCall, ExprCompare, ExprContext, Identifier,
 };
+use ruff_python_semantic::analyze::typing::find_binding_value;
 use ruff_python_semantic::{Modules, SemanticModel};
 use ruff_text_size::TextRange;
 
@@ -90,8 +92,8 @@ pub(crate) fn unnecessary_regular_expression(checker: &mut Checker, call: &ExprC
         return;
     };
 
-    // For now, restrict this rule to string literals
-    let Some(string_lit) = re_func.pattern.as_string_literal_expr() else {
+    // For now, restrict this rule to string literals and variables that can be resolved to literals
+    let Some(string_lit) = resolve_name(re_func.pattern, semantic) else {
         return;
     };
 
@@ -173,9 +175,8 @@ impl<'a> ReFunc<'a> {
             // version
             ("sub", 3) => {
                 let repl = call.arguments.find_argument("repl", 1)?;
-                if !repl.is_string_literal_expr() {
-                    return None;
-                }
+                // make sure repl can be resolved to a string literal
+                resolve_name(repl, semantic)?;
                 Some(ReFunc {
                     kind: ReFuncKind::Sub { repl },
                     pattern: call.arguments.find_argument("pattern", 0)?,
@@ -248,3 +249,28 @@ impl<'a> ReFunc<'a> {
         })
     }
 }
+
+/// Recursively try to resolve `name` to an [`ExprStringLiteral`] in `semantic`.
+fn resolve_name<'a, 'b>(
+    name: &'a Expr,
+    semantic: &'b SemanticModel,
+) -> Option<&'b ExprStringLiteral>
+where
+    'a: 'b,
+{
+    if name.is_string_literal_expr() {
+        return name.as_string_literal_expr();
+    }
+
+    let mut name = name;
+    while let Some(name_expr) = name.as_name_expr() {
+        let binding = semantic.binding(semantic.only_binding(name_expr)?);
+        let value = find_binding_value(binding, semantic)?;
+        if value.is_string_literal_expr() {
+            return value.as_string_literal_expr();
+        }
+        name = value;
+    }
+
+    None
+}

crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055.py.snap → crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_0.py.snap

@@ -2,7 +2,7 @@
 source: crates/ruff_linter/src/rules/ruff/mod.rs
 snapshot_kind: text
 ---
-RUF055.py:6:1: RUF055 [*] Plain string pattern passed to `re` function
+RUF055_0.py:6:1: RUF055 [*] Plain string pattern passed to `re` function
   |
 5 | # this should be replaced with s.replace("abc", "")
 6 | re.sub("abc", "", s)
@@ -20,7 +20,7 @@ RUF055.py:6:1: RUF055 [*] Plain string pattern passed to `re` function
 8 8 | 
 9 9 | # this example, adapted from https://docs.python.org/3/library/re.html#re.sub,
 
-RUF055.py:22:4: RUF055 [*] Plain string pattern passed to `re` function
+RUF055_0.py:22:4: RUF055 [*] Plain string pattern passed to `re` function
    |
 20 | # this one should be replaced with s.startswith("abc") because the Match is
 21 | # used in an if context for its truth value
@@ -41,7 +41,7 @@ RUF055.py:22:4: RUF055 [*] Plain string pattern passed to `re` function
 24 24 | if m := re.match("abc", s):  # this should *not* be replaced
 25 25 |     pass
 
-RUF055.py:29:4: RUF055 [*] Plain string pattern passed to `re` function
+RUF055_0.py:29:4: RUF055 [*] Plain string pattern passed to `re` function
    |
 28 | # this should be replaced with "abc" in s
 29 | if re.search("abc", s):
@@ -61,7 +61,7 @@ RUF055.py:29:4: RUF055 [*] Plain string pattern passed to `re` function
 31 31 | re.search("abc", s)  # this should not be replaced
 32 32 | 
 
-RUF055.py:34:4: RUF055 [*] Plain string pattern passed to `re` function
+RUF055_0.py:34:4: RUF055 [*] Plain string pattern passed to `re` function
    |
 33 | # this should be replaced with "abc" == s
 34 | if re.fullmatch("abc", s):
@@ -81,7 +81,7 @@ RUF055.py:34:4: RUF055 [*] Plain string pattern passed to `re` function
 36 36 | re.fullmatch("abc", s)  # this should not be replaced
 37 37 | 
 
-RUF055.py:39:1: RUF055 [*] Plain string pattern passed to `re` function
+RUF055_0.py:39:1: RUF055 [*] Plain string pattern passed to `re` function
    |
 38 | # this should be replaced with s.split("abc")
 39 | re.split("abc", s)
@@ -101,7 +101,7 @@ RUF055.py:39:1: RUF055 [*] Plain string pattern passed to `re` function
 41 41 | # these currently should not be modified because the patterns contain regex
 42 42 | # metacharacters
 
-RUF055.py:70:1: RUF055 [*] Plain string pattern passed to `re` function
+RUF055_0.py:70:1: RUF055 [*] Plain string pattern passed to `re` function
    |
 69 |   # this should trigger an unsafe fix because of the presence of comments
 70 | / re.sub(

crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_1.py.snap

@@ -0,0 +1,59 @@
+---
+source: crates/ruff_linter/src/rules/ruff/mod.rs
+snapshot_kind: text
+---
+RUF055_1.py:10:1: RUF055 [*] Plain string pattern passed to `re` function
+   |
+ 8 | pat3 = pat2
+ 9 | 
+10 | re.sub(pat3, "", haystack)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF055
+11 | 
+12 | if pat4 := pat3:
+   |
+   = help: Replace with `haystack.replace(pat3, "")`
+
+ℹ Safe fix
+7  7  | pat2 = pat1
+8  8  | pat3 = pat2
+9  9  | 
+10    |-re.sub(pat3, "", haystack)
+   10 |+haystack.replace(pat3, "")
+11 11 | 
+12 12 | if pat4 := pat3:
+13 13 |     re.sub(pat4, "", haystack)
+
+RUF055_1.py:13:5: RUF055 [*] Plain string pattern passed to `re` function
+   |
+12 | if pat4 := pat3:
+13 |     re.sub(pat4, "", haystack)
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF055
+14 | 
+15 | repl = "new"
+   |
+   = help: Replace with `haystack.replace(pat4, "")`
+
+ℹ Safe fix
+10 10 | re.sub(pat3, "", haystack)
+11 11 | 
+12 12 | if pat4 := pat3:
+13    |-    re.sub(pat4, "", haystack)
+   13 |+    haystack.replace(pat4, "")
+14 14 | 
+15 15 | repl = "new"
+16 16 | re.sub(r"abc", repl, haystack)
+
+RUF055_1.py:16:1: RUF055 [*] Plain string pattern passed to `re` function
+   |
+15 | repl = "new"
+16 | re.sub(r"abc", repl, haystack)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF055
+   |
+   = help: Replace with `haystack.replace("abc", repl)`
+
+ℹ Safe fix
+13 13 |     re.sub(pat4, "", haystack)
+14 14 | 
+15 15 | repl = "new"
+16    |-re.sub(r"abc", repl, haystack)
+   16 |+haystack.replace("abc", repl)