Enable autofix for annotations within 'simple' string literals

astral-sh · Mar 22, 2023 · 6ee2ddf · 6ee2ddf
1 parent 242dd3d
commit 6ee2ddf
Show file tree

Hide file tree

Showing 21 changed files with 263 additions and 104 deletions.
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP006.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP006.py
@@ -30,8 +30,17 @@ def f(x: "List[str]") -> None:
     ...
 
 
-list = "abc"
+def f(x: r"List[str]") -> None:
+    ...
 
 
-def f(x: List[str]) -> None:
+def f(x: "List[str]") -> None:
+    ...
+
+
+def f(x: """List[str]""") -> None:
+    ...
+
+
+def f(x: "Li" "st[str]") -> None:
     ...
diff --git a/crates/ruff/src/checkers/ast/mod.rs b/crates/ruff/src/checkers/ast/mod.rs
@@ -6,7 +6,6 @@ use log::error;
 use nohash_hasher::IntMap;
 use rustc_hash::{FxHashMap, FxHashSet};
 use rustpython_common::cformat::{CFormatError, CFormatErrorType};
-use rustpython_parser as parser;
 use rustpython_parser::ast::{
     Arg, Arguments, Comprehension, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprContext,
     ExprKind, KeywordData, Located, Location, Operator, Pattern, PatternKind, Stmt, StmtKind,
@@ -19,14 +18,15 @@ use ruff_python_ast::helpers::{
     binding_range, extract_handled_exceptions, to_module_path, Exceptions,
 };
 use ruff_python_ast::operations::{extract_all_names, AllNamesFlags};
-use ruff_python_ast::relocate::relocate_expr;
 use ruff_python_ast::scope::{
     Binding, BindingId, BindingKind, ClassDef, ExecutionContext, FunctionDef, Lambda, Scope,
     ScopeId, ScopeKind, ScopeStack,
 };
 use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
 use ruff_python_ast::types::{Node, Range, RefEquality};
-use ruff_python_ast::typing::{match_annotated_subscript, Callable, SubscriptKind};
+use ruff_python_ast::typing::{
+    match_annotated_subscript, parse_type_annotation, Callable, SubscriptKind,
+};
 use ruff_python_ast::visitor::{walk_excepthandler, walk_pattern, Visitor};
 use ruff_python_ast::{
     branch_detection, cast, helpers, operations, str, typing, visibility, visitor,
@@ -2142,7 +2142,8 @@ where
     }
 
     fn visit_expr(&mut self, expr: &'b Expr) {
-        if !(self.ctx.in_deferred_type_definition || self.ctx.in_deferred_string_type_definition)
+        if !self.ctx.in_deferred_type_definition
+            && self.ctx.in_deferred_string_type_definition.is_none()
             && self.ctx.in_type_definition
             && self.ctx.annotations_future_enabled
         {
@@ -4158,7 +4159,7 @@ impl<'a> Checker<'a> {
                 self.ctx.bindings[*index].mark_used(scope_id, Range::from(expr), context);
 
                 if self.ctx.bindings[*index].kind.is_annotation()
-                    && !self.ctx.in_deferred_string_type_definition
+                    && self.ctx.in_deferred_string_type_definition.is_none()
                     && !self.ctx.in_deferred_type_definition
                 {
                     continue;
@@ -4542,20 +4543,19 @@ impl<'a> Checker<'a> {
     where
         'b: 'a,
     {
-        let mut stacks = vec![];
+        let mut stacks = Vec::with_capacity(self.deferred.string_type_definitions.len());
         self.deferred.string_type_definitions.reverse();
-        while let Some((range, expression, (in_annotation, in_type_checking_block), deferral)) =
+        while let Some((range, value, (in_annotation, in_type_checking_block), deferral)) =
             self.deferred.string_type_definitions.pop()
         {
-            if let Ok(mut expr) = parser::parse_expression(expression, "<filename>") {
+            if let Ok((expr, kind)) = parse_type_annotation(value, range, self.locator) {
                 if in_annotation && self.ctx.annotations_future_enabled {
                     if self.settings.rules.enabled(Rule::QuotedAnnotation) {
-                        pyupgrade::rules::quoted_annotation(self, expression, range);
+                        pyupgrade::rules::quoted_annotation(self, value, range);
                     }
                 }
-                relocate_expr(&mut expr, range);
                 allocator.push(expr);
-                stacks.push(((in_annotation, in_type_checking_block), deferral));
+                stacks.push((kind, (in_annotation, in_type_checking_block), deferral));
             } else {
                 if self
                     .settings
@@ -4564,24 +4564,24 @@ impl<'a> Checker<'a> {
                 {
                     self.diagnostics.push(Diagnostic::new(
                         pyflakes::rules::ForwardAnnotationSyntaxError {
-                            body: expression.to_string(),
+                            body: value.to_string(),
                         },
                         range,
                     ));
                 }
             }
         }
-        for (expr, ((in_annotation, in_type_checking_block), (scopes, parents))) in
+        for (expr, (kind, (in_annotation, in_type_checking_block), (scopes, parents))) in
             allocator.iter().zip(stacks)
         {
             self.ctx.scope_stack = scopes;
             self.ctx.parents = parents;
             self.ctx.in_annotation = in_annotation;
             self.ctx.in_type_checking_block = in_type_checking_block;
             self.ctx.in_type_definition = true;
-            self.ctx.in_deferred_string_type_definition = true;
+            self.ctx.in_deferred_string_type_definition = Some(kind);
             self.visit_expr(expr);
-            self.ctx.in_deferred_string_type_definition = false;
+            self.ctx.in_deferred_string_type_definition = None;
             self.ctx.in_type_definition = false;
         }
     }

diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_0.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_0.py.snap
@@ -61,10 +61,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 58
-    column: 3
+    column: 4
   end_location:
     row: 58
-    column: 8
+    column: 7
   fix: ~
   parent: ~
 - kind:
@@ -139,10 +139,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 115
-    column: 8
+    column: 9
   end_location:
     row: 115
-    column: 23
+    column: 22
   fix: ~
   parent: ~
 - kind:
@@ -152,10 +152,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 123
-    column: 13
+    column: 14
   end_location:
     row: 123
-    column: 18
+    column: 17
   fix: ~
   parent: ~
 - kind:
@@ -165,10 +165,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 123
-    column: 20
+    column: 21
   end_location:
     row: 123
-    column: 25
+    column: 24
   fix: ~
   parent: ~
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_1.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_1.py.snap
@@ -9,10 +9,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 11
-    column: 9
+    column: 10
   end_location:
     row: 11
-    column: 16
+    column: 15
   fix: ~
   parent: ~
 - kind:
@@ -22,10 +22,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 18
-    column: 16
+    column: 17
   end_location:
     row: 18
-    column: 23
+    column: 22
   fix: ~
   parent: ~
 - kind:
@@ -35,10 +35,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 24
-    column: 12
+    column: 13
   end_location:
     row: 24
-    column: 19
+    column: 18
   fix: ~
   parent: ~
 - kind:
@@ -48,10 +48,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 30
-    column: 10
+    column: 11
   end_location:
     row: 30
-    column: 17
+    column: 16
   fix: ~
   parent: ~
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_11.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_11.py.snap
@@ -9,10 +9,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 18
-    column: 26
+    column: 27
   end_location:
     row: 18
-    column: 30
+    column: 29
   fix: ~
   parent: ~
 - kind:
@@ -22,10 +22,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 23
-    column: 12
+    column: 13
   end_location:
     row: 23
-    column: 17
+    column: 16
   fix: ~
   parent: ~
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_12.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_12.py.snap
@@ -9,10 +9,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 20
-    column: 26
+    column: 27
   end_location:
     row: 20
-    column: 30
+    column: 29
   fix: ~
   parent: ~
 - kind:
@@ -22,10 +22,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 25
-    column: 12
+    column: 13
   end_location:
     row: 25
-    column: 17
+    column: 16
   fix: ~
   parent: ~
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_2.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_2.py.snap
@@ -9,10 +9,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 5
-    column: 11
+    column: 12
   end_location:
     row: 5
-    column: 18
+    column: 17
   fix: ~
   parent: ~
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_3.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_3.py.snap
@@ -9,10 +9,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 11
-    column: 8
+    column: 9
   end_location:
     row: 11
-    column: 13
+    column: 12
   fix: ~
   parent: ~
 - kind:
@@ -22,10 +22,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 11
-    column: 15
+    column: 16
   end_location:
     row: 11
-    column: 22
+    column: 21
   fix: ~
   parent: ~
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_4.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_4.py.snap
@@ -9,10 +9,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 4
-    column: 9
+    column: 10
   end_location:
     row: 4
-    column: 16
+    column: 15
   fix: ~
   parent: ~
 - kind:
@@ -22,10 +22,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 9
-    column: 10
+    column: 11
   end_location:
     row: 9
-    column: 17
+    column: 16
   fix: ~
   parent: ~
 - kind:
@@ -35,10 +35,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 14
-    column: 14
+    column: 15
   end_location:
     row: 14
-    column: 21
+    column: 20
   fix: ~
   parent: ~
 - kind:
@@ -48,10 +48,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 19
-    column: 30
+    column: 31
   end_location:
     row: 19
-    column: 37
+    column: 36
   fix: ~
   parent: ~
 - kind:
@@ -61,10 +61,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 24
-    column: 18
+    column: 19
   end_location:
     row: 24
-    column: 25
+    column: 24
   fix: ~
   parent: ~
 
diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_5.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F821_F821_5.py.snap
@@ -9,10 +9,10 @@ expression: diagnostics
     fixable: false
   location:
     row: 5
-    column: 29
+    column: 30
   end_location:
     row: 5
-    column: 41
+    column: 40
   fix: ~
   parent: ~