mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-11-17 19:27:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

F821: Fix false negatives in .py files when from __future__ import annotations is active (#10362)

Browse source
This commit is contained in:
Alex Waygood 2024-03-12 17:07:44 +00:00 • committed by GitHub
parent dacec7377c
commit 704fefc7ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/ruff_linter/resources/test/fixtures/pyflakes/F821_27.py vendored
View file

@ -33,3 +33,16 @@ class MyClass:
baz: MyClass baz: MyClass
eggs = baz # Still invalid even when `__future__.annotations` are enabled eggs = baz # Still invalid even when `__future__.annotations` are enabled
eggs = "baz" # always okay eggs = "baz" # always okay
# Forward references:
MaybeDStr: TypeAlias = Optional[DStr] # Still invalid even when `__future__.annotations` are enabled
MaybeDStr2: TypeAlias = Optional["DStr"] # always okay
DStr: TypeAlias = Union[D, str] # Still invalid even when `__future__.annotations` are enabled
DStr2: TypeAlias = Union["D", str] # always okay
class D: ...
# More circular references
class Leaf: ...
class Tree(list[Tree | Leaf]): ... # Still invalid even when `__future__.annotations` are enabled
class Tree2(list["Tree | Leaf"]): ... # always okay

1
crates/ruff_linter/src/checkers/ast/mod.rs
View file

@ -938,6 +938,7 @@ impl<'a> Visitor<'a> for Checker<'a> {
&& !self.semantic.in_deferred_type_definition() && !self.semantic.in_deferred_type_definition()
&& self.semantic.in_type_definition() && self.semantic.in_type_definition()
&& self.semantic.future_annotations() && self.semantic.future_annotations()
&& (self.semantic.in_typing_only_annotation() || self.source_type.is_stub())
{ {
if let Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) = expr { if let Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) = expr {
self.visit.string_type_definitions.push(( self.visit.string_type_definitions.push((

27
crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F821_F821_27.py.snap
View file

@ -17,3 +17,30 @@ F821_27.py:34:8: F821 Undefined name `baz`
| ^^^ F821 | ^^^ F821
35 | eggs = "baz" # always okay 35 | eggs = "baz" # always okay
| |
F821_27.py:38:33: F821 Undefined name `DStr`
|
37 | # Forward references:
38 | MaybeDStr: TypeAlias = Optional[DStr] # Still invalid even when `__future__.annotations` are enabled
| ^^^^ F821
39 | MaybeDStr2: TypeAlias = Optional["DStr"] # always okay
40 | DStr: TypeAlias = Union[D, str] # Still invalid even when `__future__.annotations` are enabled
|
F821_27.py:40:25: F821 Undefined name `D`
|
38 | MaybeDStr: TypeAlias = Optional[DStr] # Still invalid even when `__future__.annotations` are enabled
39 | MaybeDStr2: TypeAlias = Optional["DStr"] # always okay
40 | DStr: TypeAlias = Union[D, str] # Still invalid even when `__future__.annotations` are enabled
| ^ F821
41 | DStr2: TypeAlias = Union["D", str] # always okay
|
F821_27.py:47:17: F821 Undefined name `Tree`
|
45 | # More circular references
46 | class Leaf: ...
47 | class Tree(list[Tree | Leaf]): ... # Still invalid even when `__future__.annotations` are enabled
| ^^^^ F821
48 | class Tree2(list["Tree | Leaf"]): ... # always okay
|