Revert "Expand scope of quoted-annotation rule (#5766)"

This reverts commit 8ccd697.
astral-sh · Aug 1, 2023 · 305ea0b · 305ea0b
1 parent f45e864
commit 305ea0b
Show file tree

Hide file tree

Showing 8 changed files with 561 additions and 699 deletions.
diff --git a/...ources/test/fixtures/pyupgrade/UP037_0.py → ...esources/test/fixtures/pyupgrade/UP037.py b/...ources/test/fixtures/pyupgrade/UP037_0.py → ...esources/test/fixtures/pyupgrade/UP037.py
@@ -1,5 +1,3 @@
-"""A mirror of UP037_1.py, with `from __future__ import annotations`."""
-
 from __future__ import annotations
 
 from typing import (

diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP037_1.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP037_1.py
diff --git a/crates/ruff/src/checkers/ast/mod.rs b/crates/ruff/src/checkers/ast/mod.rs
@@ -1775,7 +1775,7 @@ impl<'a> Checker<'a> {
 
                     self.semantic.restore(snapshot);
 
-                    if self.semantic.in_typing_only_annotation() {
+                    if self.semantic.in_annotation() && self.semantic.future_annotations() {
                         if self.enabled(Rule::QuotedAnnotation) {
                             pyupgrade::rules::quoted_annotation(self, value, range);
                         }

diff --git a/crates/ruff/src/rules/pyupgrade/mod.rs b/crates/ruff/src/rules/pyupgrade/mod.rs
@@ -55,8 +55,7 @@ mod tests {
     #[test_case(Rule::OutdatedVersionBlock, Path::new("UP036_5.py"))]
     #[test_case(Rule::PrintfStringFormatting, Path::new("UP031_0.py"))]
     #[test_case(Rule::PrintfStringFormatting, Path::new("UP031_1.py"))]
-    #[test_case(Rule::QuotedAnnotation, Path::new("UP037_0.py"))]
-    #[test_case(Rule::QuotedAnnotation, Path::new("UP037_1.py"))]
+    #[test_case(Rule::QuotedAnnotation, Path::new("UP037.py"))]
     #[test_case(Rule::RedundantOpenModes, Path::new("UP015.py"))]
     #[test_case(Rule::ReplaceStdoutStderr, Path::new("UP022.py"))]
     #[test_case(Rule::ReplaceUniversalNewlines, Path::new("UP021.py"))]

diff --git a/crates/ruff/src/rules/pyupgrade/rules/quoted_annotation.rs b/crates/ruff/src/rules/pyupgrade/rules/quoted_annotation.rs
@@ -15,11 +15,6 @@ use crate::registry::Rule;
 /// will always evaluate type annotations in a deferred manner, making
 /// the quotes unnecessary.
 ///
-/// Type annotations can also be unquoted in some other contexts, even
-/// without `from __future__ import annotations`. For example, annotated
-/// assignments within function bodies are not evaluated at runtime, and so can
-/// be unquoted.
-///
 /// ## Example
 /// ```python
 /// from __future__ import annotations