Avoid putting decorators in the function scope (#86)

resources/test/src/F823.py

@@ -15,3 +15,13 @@ def baz():
     global my_var
     global my_dict
     my_dict[my_var] += 1
+
+
+def dec(x):
+    return x
+
+
+@dec
+def f():
+    dec = 1
+    return dec

src/check_ast.rs

@@ -88,6 +88,7 @@ impl Checker<'_> {
 
 impl Visitor for Checker<'_> {
     fn visit_stmt(&mut self, stmt: &Stmt) {
+        println!("stmt: {:?}", stmt);
         match &stmt.node {
             StmtKind::Global { names } | StmtKind::Nonlocal { names } => {
                 // TODO(charlie): Handle doctests.
@@ -109,18 +110,24 @@ impl Visitor for Checker<'_> {
                     }
                 }
             }
-            StmtKind::FunctionDef { name, .. } => {
+            StmtKind::FunctionDef {
-                self.add_binding(
+                name,
-                    name.to_string(),
+                decorator_list,
-                    Binding {
+                returns,
-                        kind: BindingKind::Definition,
+                ..
-                        used: None,
-                        location: stmt.location,
-                    },
-                );
-                self.push_scope(Scope::new(Function));
             }
-            StmtKind::AsyncFunctionDef { name, .. } => {
+            | StmtKind::AsyncFunctionDef {
+                name,
+                decorator_list,
+                returns,
+                ..
+            } => {
+                for expr in decorator_list {
+                    self.visit_expr(expr);
+                }
+                for expr in returns {
+                    self.visit_annotation(expr);
+                }
                 self.add_binding(
                     name.to_string(),
                     Binding {
@@ -150,7 +157,23 @@ impl Visitor for Checker<'_> {
                     }
                 }
             }
-            StmtKind::ClassDef { .. } => self.push_scope(Scope::new(Class)),
+            StmtKind::ClassDef {
+                bases,
+                keywords,
+                decorator_list,
+                ..
+            } => {
+                for expr in bases {
+                    self.visit_expr(expr)
+                }
+                for keyword in keywords {
+                    self.visit_keyword(keyword)
+                }
+                for expr in decorator_list {
+                    self.visit_expr(expr)
+                }
+                self.push_scope(Scope::new(Class))
+            }
             StmtKind::Import { names } => {
                 for alias in names {
                     if alias.node.name.contains('.') && alias.node.asname.is_none() {

src/visitor.rs

@@ -63,61 +63,22 @@ pub trait Visitor {
 
 pub fn walk_stmt<V: Visitor + ?Sized>(visitor: &mut V, stmt: &Stmt) {
     match &stmt.node {
-        StmtKind::FunctionDef {
+        StmtKind::FunctionDef { args, body, .. } => {
-            args,
-            body,
-            decorator_list,
-            returns,
-            ..
-        } => {
             visitor.visit_arguments(args);
-            for expr in decorator_list {
-                visitor.visit_expr(expr)
-            }
-            for expr in returns {
-                visitor.visit_annotation(expr);
-            }
             for stmt in body {
                 visitor.visit_stmt(stmt)
             }
         }
-        StmtKind::AsyncFunctionDef {
+        StmtKind::AsyncFunctionDef { args, body, .. } => {
-            args,
-            body,
-            decorator_list,
-            returns,
-            ..
-        } => {
             visitor.visit_arguments(args);
-            for expr in decorator_list {
-                visitor.visit_expr(expr)
-            }
-            for expr in returns {
-                visitor.visit_annotation(expr);
-            }
             for stmt in body {
                 visitor.visit_stmt(stmt)
             }
         }
-        StmtKind::ClassDef {
+        StmtKind::ClassDef { body, .. } => {
-            bases,
-            keywords,
-            body,
-            decorator_list,
-            ..
-        } => {
-            for expr in bases {
-                visitor.visit_expr(expr)
-            }
-            for keyword in keywords {
-                visitor.visit_keyword(keyword)
-            }
             for stmt in body {
                 visitor.visit_stmt(stmt)
             }
-            for expr in decorator_list {
-                visitor.visit_expr(expr)
-            }
         }
         StmtKind::Return { value } => {
             if let Some(expr) = value {