simplify

Author: AlexWaygood

crates/ruff_linter/src/checkers/ast/mod.rs

@@ -860,23 +860,17 @@ impl SemanticSyntaxContext for Checker<'_> {
     }
 
     fn is_bound_parameter(&self, name: &str) -> bool {
-        for scope in self.semantic.current_scopes() {
-            match scope.kind {
-                ScopeKind::Class(_) => return false,
-                ScopeKind::Function(ast::StmtFunctionDef { parameters, .. })
-                | ScopeKind::Lambda(ast::ExprLambda {
-                    parameters: Some(parameters),
-                    ..
-                }) => return parameters.includes(name),
-                ScopeKind::Lambda(_)
-                | ScopeKind::Generator { .. }
-                | ScopeKind::Module
-                | ScopeKind::Type
-                | ScopeKind::DunderClassCell => {}
+        match self.semantic.current_scope().kind {
+            ScopeKind::Function(ast::StmtFunctionDef { parameters, .. }) => {
+                parameters.includes(name)
             }
+            ScopeKind::Class(_)
+            | ScopeKind::Lambda(_)
+            | ScopeKind::Generator { .. }
+            | ScopeKind::Module
+            | ScopeKind::Type
+            | ScopeKind::DunderClassCell => false,
         }
-
-        false
     }
 }
 

crates/ruff_python_parser/src/semantic_errors.rs

@@ -2105,8 +2105,10 @@ pub trait SemanticSyntaxContext {
 
     fn report_semantic_error(&self, error: SemanticSyntaxError);
 
+    /// Returns `true` if the visitor is inside a `for` or `while` loop.
     fn in_loop_context(&self) -> bool;
 
+    /// Returns `true` if `name` is a bound parameter in the current function or lambda scope.
     fn is_bound_parameter(&self, name: &str) -> bool;
 }
 

crates/ty_python_semantic/resources/mdtest/diagnostics/semantic_syntax_errors.md

@@ -386,4 +386,31 @@ a = None
 
 def f(a):
     global a  # error: [invalid-syntax]
+
+def g(a):
+    if True:
+        global a  # error: [invalid-syntax]
+
+def h(a):
+    def inner():
+        global a
+
+def i(a):
+    try:
+        global a  # error: [invalid-syntax]
+    except Exception:
+        pass
+
+def f(a):
+    a = 1
+    global a  # error: [invalid-syntax]
+
+def f(a):
+    a = 1
+    a = 2
+    global a  # error: [invalid-syntax]
+
+def f(a):
+    class Inner:
+        global a  # ok
 ```

crates/ty_python_semantic/resources/mdtest/snapshots/semantic_syntax_erro…_-_Semantic_syntax_erro…_-_name_is_parameter_an…_(99bae53daf67ae6e).snap

@@ -12,10 +12,37 @@ mdtest path: crates/ty_python_semantic/resources/mdtest/diagnostics/semantic_syn
 ## mdtest_snippet.py
 
 ```
-1 | a = None
-2 | 
-3 | def f(a):
-4 |     global a  # error: [invalid-syntax]
+ 1 | a = None
+ 2 | 
+ 3 | def f(a):
+ 4 |     global a  # error: [invalid-syntax]
+ 5 | 
+ 6 | def g(a):
+ 7 |     if True:
+ 8 |         global a  # error: [invalid-syntax]
+ 9 | 
+10 | def h(a):
+11 |     def inner():
+12 |         global a
+13 | 
+14 | def i(a):
+15 |     try:
+16 |         global a  # error: [invalid-syntax]
+17 |     except Exception:
+18 |         pass
+19 | 
+20 | def f(a):
+21 |     a = 1
+22 |     global a  # error: [invalid-syntax]
+23 | 
+24 | def f(a):
+25 |     a = 1
+26 |     a = 2
+27 |     global a  # error: [invalid-syntax]
+28 | 
+29 | def f(a):
+30 |     class Inner:
+31 |         global a  # ok
 ```
 
 # Diagnostics
@@ -27,6 +54,64 @@ error[invalid-syntax]: name `a` is parameter and global
 3 | def f(a):
 4 |     global a  # error: [invalid-syntax]
   |            ^
+5 |
+6 | def g(a):
   |
 
 ```
+
+```
+error[invalid-syntax]: name `a` is parameter and global
+  --> src/mdtest_snippet.py:8:16
+   |
+ 6 | def g(a):
+ 7 |     if True:
+ 8 |         global a  # error: [invalid-syntax]
+   |                ^
+ 9 |
+10 | def h(a):
+   |
+
+```
+
+```
+error[invalid-syntax]: name `a` is parameter and global
+  --> src/mdtest_snippet.py:16:16
+   |
+14 | def i(a):
+15 |     try:
+16 |         global a  # error: [invalid-syntax]
+   |                ^
+17 |     except Exception:
+18 |         pass
+   |
+
+```
+
+```
+error[invalid-syntax]: name `a` is parameter and global
+  --> src/mdtest_snippet.py:22:12
+   |
+20 | def f(a):
+21 |     a = 1
+22 |     global a  # error: [invalid-syntax]
+   |            ^
+23 |
+24 | def f(a):
+   |
+
+```
+
+```
+error[invalid-syntax]: name `a` is parameter and global
+  --> src/mdtest_snippet.py:27:12
+   |
+25 |     a = 1
+26 |     a = 2
+27 |     global a  # error: [invalid-syntax]
+   |            ^
+28 |
+29 | def f(a):
+   |
+
+```

crates/ty_python_semantic/src/semantic_index/builder.rs

@@ -2822,24 +2822,12 @@ impl SemanticSyntaxContext for SemanticIndexBuilder<'_, '_> {
     fn in_loop_context(&self) -> bool {
         self.current_scope_info().current_loop.is_some()
     }
+
     fn is_bound_parameter(&self, name: &str) -> bool {
-        for scope_info in self.scope_stack.iter().rev() {
-            let scope = &self.scopes[scope_info.file_scope_id];
-            match scope.node() {
-                NodeWithScopeKind::Function(func) => {
-                    let parameters = &func.node(self.module).parameters;
-                    return parameters.includes(name);
-                }
-                NodeWithScopeKind::Lambda(lambda) => {
-                    if let Some(parameters) = lambda.node(self.module).parameters.as_ref() {
-                        return parameters.includes(name);
-                    }
-                }
-                NodeWithScopeKind::Class(_) => return false,
-                _ => {}
-            }
-        }
-        false
+        self.scopes[self.current_scope()]
+            .node()
+            .as_function()
+            .is_some_and(|func| func.node(self.module).parameters.includes(name))
     }
 }