move inline tests to linter, simplify test visitor

Author: ntBre

crates/ruff_linter/resources/test/fixtures/syntax_errors/yield_scope.py

@@ -1,3 +1,23 @@
+yield  # error
+yield 1  # error
+yield from 1  # error
+await 1  # error
+[(yield x) for x in range(3)]  # error
+
+
+def f():
+    yield  # okay
+    yield 1  # okay
+    yield from 1  # okay
+    await 1  # okay
+
+
+lambda: (yield)  # okay
+lambda: (yield 1)  # okay
+lambda: (yield from 1)  # okay
+lambda: (await 1)  # okay
+
+
 def outer():
     class C:
         yield 1  # error
@@ -17,4 +37,5 @@ class C:
 
     lambda x: await x  # okay for now, lambda breaks _async_ scope but is a function
 
+
 await 1  # error

crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__yield_scope.py.snap

@@ -1,75 +1,117 @@
 ---
 source: crates/ruff_linter/src/linter.rs
 ---
-resources/test/fixtures/syntax_errors/yield_scope.py:3:9: F704 `yield` statement outside of a function
+resources/test/fixtures/syntax_errors/yield_scope.py:1:1: F704 `yield` statement outside of a function
   |
-1 | def outer():
-2 |     class C:
-3 |         yield 1  # error
-  |         ^^^^^^^ F704
-4 |
-5 |     [(yield 1) for x in range(3)]  # error
+1 | yield  # error
+  | ^^^^^ F704
+2 | yield 1  # error
+3 | yield from 1  # error
   |
 
-resources/test/fixtures/syntax_errors/yield_scope.py:5:7: F704 `yield` statement outside of a function
+resources/test/fixtures/syntax_errors/yield_scope.py:2:1: F704 `yield` statement outside of a function
   |
-3 |         yield 1  # error
-4 |
-5 |     [(yield 1) for x in range(3)]  # error
-  |       ^^^^^^^ F704
-6 |     ((yield 1) for x in range(3))  # error
-7 |     {(yield 1) for x in range(3)}  # error
+1 | yield  # error
+2 | yield 1  # error
+  | ^^^^^^^ F704
+3 | yield from 1  # error
+4 | await 1  # error
   |
 
-resources/test/fixtures/syntax_errors/yield_scope.py:6:7: F704 `yield` statement outside of a function
+resources/test/fixtures/syntax_errors/yield_scope.py:3:1: F704 `yield from` statement outside of a function
   |
-5 |     [(yield 1) for x in range(3)]  # error
-6 |     ((yield 1) for x in range(3))  # error
-  |       ^^^^^^^ F704
-7 |     {(yield 1) for x in range(3)}  # error
-8 |     {(yield 1): 0 for x in range(3)}  # error
+1 | yield  # error
+2 | yield 1  # error
+3 | yield from 1  # error
+  | ^^^^^^^^^^^^ F704
+4 | await 1  # error
+5 | [(yield x) for x in range(3)]  # error
   |
 
-resources/test/fixtures/syntax_errors/yield_scope.py:7:7: F704 `yield` statement outside of a function
+resources/test/fixtures/syntax_errors/yield_scope.py:4:1: F704 `await` statement outside of a function
   |
-5 |     [(yield 1) for x in range(3)]  # error
-6 |     ((yield 1) for x in range(3))  # error
-7 |     {(yield 1) for x in range(3)}  # error
-  |       ^^^^^^^ F704
-8 |     {(yield 1): 0 for x in range(3)}  # error
-9 |     {0: (yield 1) for x in range(3)}  # error
+2 | yield 1  # error
+3 | yield from 1  # error
+4 | await 1  # error
+  | ^^^^^^^ F704
+5 | [(yield x) for x in range(3)]  # error
   |
 
-resources/test/fixtures/syntax_errors/yield_scope.py:8:7: F704 `yield` statement outside of a function
+resources/test/fixtures/syntax_errors/yield_scope.py:5:3: F704 `yield` statement outside of a function
   |
-6 |     ((yield 1) for x in range(3))  # error
-7 |     {(yield 1) for x in range(3)}  # error
-8 |     {(yield 1): 0 for x in range(3)}  # error
-  |       ^^^^^^^ F704
-9 |     {0: (yield 1) for x in range(3)}  # error
+3 | yield from 1  # error
+4 | await 1  # error
+5 | [(yield x) for x in range(3)]  # error
+  |   ^^^^^^^ F704
   |
 
-resources/test/fixtures/syntax_errors/yield_scope.py:9:10: F704 `yield` statement outside of a function
-  |
-7 |     {(yield 1) for x in range(3)}  # error
-8 |     {(yield 1): 0 for x in range(3)}  # error
-9 |     {0: (yield 1) for x in range(3)}  # error
-  |          ^^^^^^^ F704
-  |
+resources/test/fixtures/syntax_errors/yield_scope.py:23:9: F704 `yield` statement outside of a function
+   |
+21 | def outer():
+22 |     class C:
+23 |         yield 1  # error
+   |         ^^^^^^^ F704
+24 |
+25 |     [(yield 1) for x in range(3)]  # error
+   |
+
+resources/test/fixtures/syntax_errors/yield_scope.py:25:7: F704 `yield` statement outside of a function
+   |
+23 |         yield 1  # error
+24 |
+25 |     [(yield 1) for x in range(3)]  # error
+   |       ^^^^^^^ F704
+26 |     ((yield 1) for x in range(3))  # error
+27 |     {(yield 1) for x in range(3)}  # error
+   |
+
+resources/test/fixtures/syntax_errors/yield_scope.py:26:7: F704 `yield` statement outside of a function
+   |
+25 |     [(yield 1) for x in range(3)]  # error
+26 |     ((yield 1) for x in range(3))  # error
+   |       ^^^^^^^ F704
+27 |     {(yield 1) for x in range(3)}  # error
+28 |     {(yield 1): 0 for x in range(3)}  # error
+   |
+
+resources/test/fixtures/syntax_errors/yield_scope.py:27:7: F704 `yield` statement outside of a function
+   |
+25 |     [(yield 1) for x in range(3)]  # error
+26 |     ((yield 1) for x in range(3))  # error
+27 |     {(yield 1) for x in range(3)}  # error
+   |       ^^^^^^^ F704
+28 |     {(yield 1): 0 for x in range(3)}  # error
+29 |     {0: (yield 1) for x in range(3)}  # error
+   |
+
+resources/test/fixtures/syntax_errors/yield_scope.py:28:7: F704 `yield` statement outside of a function
+   |
+26 |     ((yield 1) for x in range(3))  # error
+27 |     {(yield 1) for x in range(3)}  # error
+28 |     {(yield 1): 0 for x in range(3)}  # error
+   |       ^^^^^^^ F704
+29 |     {0: (yield 1) for x in range(3)}  # error
+   |
+
+resources/test/fixtures/syntax_errors/yield_scope.py:29:10: F704 `yield` statement outside of a function
+   |
+27 |     {(yield 1) for x in range(3)}  # error
+28 |     {(yield 1): 0 for x in range(3)}  # error
+29 |     {0: (yield 1) for x in range(3)}  # error
+   |          ^^^^^^^ F704
+   |
 
-resources/test/fixtures/syntax_errors/yield_scope.py:16:10: F704 `await` statement outside of a function
+resources/test/fixtures/syntax_errors/yield_scope.py:36:10: F704 `await` statement outside of a function
    |
-15 |     class C:
-16 |         [await x for x in range(3)]  # error, classes break async scope
+35 |     class C:
+36 |         [await x for x in range(3)]  # error, classes break async scope
    |          ^^^^^^^ F704
-17 |
-18 |     lambda x: await x  # okay for now, lambda breaks _async_ scope but is a function
+37 |
+38 |     lambda x: await x  # okay for now, lambda breaks _async_ scope but is a function
    |
 
-resources/test/fixtures/syntax_errors/yield_scope.py:20:1: F704 `await` statement outside of a function
+resources/test/fixtures/syntax_errors/yield_scope.py:41:1: F704 `await` statement outside of a function
    |
-18 |     lambda x: await x  # okay for now, lambda breaks _async_ scope but is a function
-19 |
-20 | await 1  # error
+41 | await 1  # error
    | ^^^^^^^ F704
    |

crates/ruff_python_parser/resources/inline/err/yield_outside_function.py

@@ -622,24 +622,6 @@ impl SemanticSyntaxChecker {
             return;
         }
 
-        // test_err yield_outside_function
-        // yield 1
-        // yield from 1
-        // await 1
-        // yield
-        // [(yield x) for x in range(3)]
-
-        // test_ok yield_inside_function
-        // def f():
-        //     yield 1
-        //     yield from 1
-        //     await 1
-        //     yield
-        //
-        // lambda: (yield)
-        // lambda: (yield 1)
-        // lambda: (yield from 1)
-        // lambda: (await 1)
         Self::add_error(
             ctx,
             SemanticSyntaxErrorKind::YieldOutsideFunction(kind),

crates/ruff_python_parser/resources/inline/ok/yield_inside_function.py

@@ -467,16 +467,6 @@ enum Scope {
     Class,
 }
 
-impl Scope {
-    fn is_module(&self) -> bool {
-        matches!(self, Self::Module)
-    }
-
-    fn is_function(&self) -> bool {
-        matches!(self, Self::Function { .. })
-    }
-}
-
 struct SemanticSyntaxCheckerVisitor<'a> {
     checker: SemanticSyntaxChecker,
     diagnostics: RefCell<Vec<SemanticSyntaxError>>,
@@ -511,15 +501,6 @@ impl<'a> SemanticSyntaxCheckerVisitor<'a> {
         f(&mut checker, self);
         self.checker = checker;
     }
-
-    /// Returns an iterator over all scopes, starting from the current [`Scope`].
-    fn scopes(&self) -> impl Iterator<Item = &Scope> {
-        self.scopes.iter().rev()
-    }
-
-    fn current_scope(&self) -> &Scope {
-        self.scopes().next().unwrap()
-    }
 }
 
 impl SemanticSyntaxContext for SemanticSyntaxCheckerVisitor<'_> {
@@ -566,26 +547,19 @@ impl SemanticSyntaxContext for SemanticSyntaxCheckerVisitor<'_> {
     }
 
     fn in_module_scope(&self) -> bool {
-        self.current_scope().is_module()
+        true
     }
 
     fn in_function_scope(&self) -> bool {
-        self.current_scope().is_function()
+        true
     }
 
     fn in_notebook(&self) -> bool {
         false
     }
 
     fn in_function_context(&self) -> bool {
-        for scope in self.scopes() {
-            match scope {
-                Scope::Class => return false,
-                Scope::Function { .. } => return true,
-                Scope::Comprehension { .. } | Scope::Module => {}
-            }
-        }
-        false
+        true
     }
 }
 

crates/ruff_python_parser/src/semantic_errors.rs

@@ -198,23 +198,3 @@ Module(
 4 | x: y := int = 1
   |      ^^ Syntax Error: Expected a statement
   |
-
-
-## Semantic Syntax Errors
-
-  |
-1 | x: *int = 1
-2 | x: yield a = 1
-  |    ^^^^^^^ Syntax Error: `yield` statement outside of a function
-3 | x: yield from b = 1
-4 | x: y := int = 1
-  |
-
-
-  |
-1 | x: *int = 1
-2 | x: yield a = 1
-3 | x: yield from b = 1
-  |    ^^^^^^^^^^^^ Syntax Error: `yield from` statement outside of a function
-4 | x: y := int = 1
-  |

crates/ruff_python_parser/tests/fixtures.rs

@@ -158,14 +158,3 @@ Module(
 4 | assert False, x := 1
   |                 ^^ Syntax Error: Expected a statement
   |
-
-
-## Semantic Syntax Errors
-
-  |
-1 | assert False, *x
-2 | assert False, assert x
-3 | assert False, yield x
-  |               ^^^^^^^ Syntax Error: `yield` statement outside of a function
-4 | assert False, x := 1
-  |

crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap

@@ -146,14 +146,3 @@ Module(
 4 | assert x := 1
   |          ^^ Syntax Error: Expected a statement
   |
-
-
-## Semantic Syntax Errors
-
-  |
-1 | assert *x
-2 | assert assert x
-3 | assert yield x
-  |        ^^^^^^^ Syntax Error: `yield` statement outside of a function
-4 | assert x := 1
-  |

crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap

@@ -254,24 +254,3 @@ Module(
 5 | x = x := 1
   |       ^^ Syntax Error: Expected a statement
   |
-
-
-## Semantic Syntax Errors
-
-  |
-1 | x = *a and b
-2 | x = *yield x
-  |      ^^^^^^^ Syntax Error: `yield` statement outside of a function
-3 | x = *yield from x
-4 | x = *lambda x: x
-  |
-
-
-  |
-1 | x = *a and b
-2 | x = *yield x
-3 | x = *yield from x
-  |      ^^^^^^^^^^^^ Syntax Error: `yield from` statement outside of a function
-4 | x = *lambda x: x
-5 | x = x := 1
-  |