Fix handling of slices in tuples for FURB118, e.g., x[:, 1]

There was already handling for the singleton `x[:]` case but not the tuple case.\nCloses #13508

Author: zanieb

crates/ruff_linter/resources/test/fixtures/refurb/FURB118.py

@@ -83,3 +83,7 @@ class Class:
     @staticmethod
     def add(x, y):
         return x + y
+
+# See https://github.com/astral-sh/ruff/issues/13508
+op_itemgetter = lambda x: x[:, 1]
+op_itemgetter = lambda x: x[1, :]

crates/ruff_linter/src/rules/refurb/rules/reimplemented_operator.rs

@@ -213,10 +213,20 @@ fn subscript_slice_to_string<'a>(expr: &Expr, locator: &Locator<'a>) -> Cow<'a,
     if let Expr::Slice(expr_slice) = expr {
         Cow::Owned(slice_expr_to_slice_call(expr_slice, locator))
     } else if let Expr::Tuple(tuple) = expr {
+        let inner = tuple
+            .elts
+            .iter()
+            .map(|expr| match expr {
+                Expr::Slice(expr) => Cow::Owned(slice_expr_to_slice_call(expr, locator)),
+                _ => Cow::Borrowed(locator.slice(expr)),
+            })
+            .collect::<Vec<_>>()
+            .join(", ");
+
         if tuple.parenthesized {
-            Cow::Borrowed(locator.slice(expr))
+            Cow::Owned(inner)
         } else {
-            Cow::Owned(format!("({})", locator.slice(tuple)))
+            Cow::Owned(format!("({})", inner))
         }
     } else {
         Cow::Borrowed(locator.slice(expr))

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB118_FURB118.py.snap

@@ -807,14 +807,14 @@ FURB118.py:34:17: FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defin
 36 37 | 
 37 38 | 
 
-FURB118.py:35:17: FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defining a lambda
+FURB118.py:35:17: FURB118 [*] Use `operator.itemgetter(0, 1)` instead of defining a lambda
    |
 33 | op_itemgetter = lambda x: x[:]
 34 | op_itemgetter = lambda x: x[0, 1]
 35 | op_itemgetter = lambda x: x[(0, 1)]
    |                 ^^^^^^^^^^^^^^^^^^^ FURB118
    |
-   = help: Replace with `operator.itemgetter((0, 1))`
+   = help: Replace with `operator.itemgetter(0, 1)`
 
 ℹ Safe fix
 1  1  | # Errors.
@@ -827,7 +827,7 @@ FURB118.py:35:17: FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defin
 33 34 | op_itemgetter = lambda x: x[:]
 34 35 | op_itemgetter = lambda x: x[0, 1]
 35    |-op_itemgetter = lambda x: x[(0, 1)]
-   36 |+op_itemgetter = operator.itemgetter((0, 1))
+   36 |+op_itemgetter = operator.itemgetter(0, 1)
 36 37 | 
 37 38 | 
 38 39 | def op_not2(x):
@@ -847,3 +847,48 @@ FURB118.py:42:5: FURB118 Use `operator.add` instead of defining a function
 43 |     return x + y
    |
    = help: Replace with `operator.add`
+
+FURB118.py:88:17: FURB118 [*] Use `operator.itemgetter((slice(None), 1))` instead of defining a lambda
+   |
+87 | # See https://github.com/astral-sh/ruff/issues/13508
+88 | op_itemgetter = lambda x: x[:, 1]
+   |                 ^^^^^^^^^^^^^^^^^ FURB118
+89 | op_itemgetter = lambda x: x[1, :]
+   |
+   = help: Replace with `operator.itemgetter((slice(None), 1))`
+
+ℹ Safe fix
+1  1  | # Errors.
+   2  |+import operator
+2  3  | op_bitnot = lambda x: ~x
+3  4  | op_not = lambda x: not x
+4  5  | op_pos = lambda x: +x
+--------------------------------------------------------------------------------
+85 86 |         return x + y
+86 87 | 
+87 88 | # See https://github.com/astral-sh/ruff/issues/13508
+88    |-op_itemgetter = lambda x: x[:, 1]
+   89 |+op_itemgetter = operator.itemgetter((slice(None), 1))
+89 90 | op_itemgetter = lambda x: x[1, :]
+
+FURB118.py:89:17: FURB118 [*] Use `operator.itemgetter((1, slice(None)))` instead of defining a lambda
+   |
+87 | # See https://github.com/astral-sh/ruff/issues/13508
+88 | op_itemgetter = lambda x: x[:, 1]
+89 | op_itemgetter = lambda x: x[1, :]
+   |                 ^^^^^^^^^^^^^^^^^ FURB118
+   |
+   = help: Replace with `operator.itemgetter((1, slice(None)))`
+
+ℹ Safe fix
+1  1  | # Errors.
+   2  |+import operator
+2  3  | op_bitnot = lambda x: ~x
+3  4  | op_not = lambda x: not x
+4  5  | op_pos = lambda x: +x
+--------------------------------------------------------------------------------
+86 87 | 
+87 88 | # See https://github.com/astral-sh/ruff/issues/13508
+88 89 | op_itemgetter = lambda x: x[:, 1]
+89    |-op_itemgetter = lambda x: x[1, :]
+   90 |+op_itemgetter = operator.itemgetter((1, slice(None)))