Avoid attempting to fix invalid Optional annotations (#7079)

astral-sh · Sep 3, 2023 · b70dde4 · b70dde4
1 parent 4eaa412
commit b70dde4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP007.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP007.py
@@ -91,3 +91,7 @@ def f(x: Optional[int : float]) -> None:
 
 def f(x: Optional[str, int : float]) -> None:
     ...
+
+
+def f(x: Optional[int, float]) -> None:
+    ...
diff --git a/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs b/crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs
@@ -77,10 +77,17 @@ pub(crate) fn use_pep604_annotation(
         Pep604Operator::Optional => {
             let mut diagnostic = Diagnostic::new(NonPEP604Annotation, expr.range());
             if fixable && checker.patch(diagnostic.kind.rule()) {
-                diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
-                    optional(slice, checker.locator()),
-                    expr.range(),
-                )));
+                match slice {
+                    Expr::Tuple(_) => {
+                        // Invalid type annotation.
+                    }
+                    _ => {
+                        diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+                            optional(slice, checker.locator()),
+                            expr.range(),
+                        )));
+                    }
+                }
             }
             checker.diagnostics.push(diagnostic);
         }

diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP007.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP007.py.snap
@@ -361,4 +361,12 @@ UP007.py:92:10: UP007 Use `X | Y` for type annotations
    |
    = help: Convert to `X | Y`
 
+UP007.py:96:10: UP007 Use `X | Y` for type annotations
+   |
+96 | def f(x: Optional[int, float]) -> None:
+   |          ^^^^^^^^^^^^^^^^^^^^ UP007
+97 |     ...
+   |
+   = help: Convert to `X | Y`
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,3 +91,7 @@ def f(x: Optional[int : float]) -> None: @@
     def f(x: Optional[str, int : float]) -> None:
         ...
+    def f(x: Optional[int, float]) -> None:
+        ...