phase5

youknowone · youknowone · commit fb3b61721ec6 · 2026-01-14T01:27:14.000+09:00
diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs
@@ -3572,8 +3572,10 @@ impl Compiler {
             .annotation_block = Some(Box::new(annotation_table));
         // Exit code scope
         let pop = self.code_stack.pop();
-        let annotate_code =
-            unwrap_internal(self, compiler_unwrap_option(self, pop).finalize_code(&self.opts));
+        let annotate_code = unwrap_internal(
+            self,
+            compiler_unwrap_option(self, pop).finalize_code(&self.opts),
+        );
 
         // Make a closure from the code object
         self.make_closure(annotate_code, bytecode::MakeFunctionFlags::empty())?;
diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs
@@ -947,6 +947,20 @@ impl SymbolTableBuilder {
             }) => {
                 self.scan_decorators(decorator_list, ExpressionContext::Load)?;
                 self.register_ident(name, SymbolUsage::Assigned)?;
+
+                // When in class scope, save the class's annotation_block before scanning
+                // function annotations, so method annotations don't interfere with class annotations
+                let parent_is_class = self
+                    .tables
+                    .last()
+                    .map(|t| t.typ == CompilerScope::Class)
+                    .unwrap_or(false);
+                let saved_annotation_block = if parent_is_class {
+                    self.tables.last_mut().unwrap().annotation_block.take()
+                } else {
+                    None
+                };
+
                 let has_return_annotation = if let Some(expression) = returns {
                     self.scan_annotation(expression)?;
                     true
@@ -971,6 +985,11 @@ impl SymbolTableBuilder {
                 if type_params.is_some() {
                     self.leave_scope();
                 }
+
+                // Restore class's annotation_block after processing the function
+                if let Some(block) = saved_annotation_block {
+                    self.tables.last_mut().unwrap().annotation_block = Some(block);
+                }
             }
             Stmt::ClassDef(StmtClassDef {
                 name,
@@ -1912,8 +1931,9 @@ impl SymbolTableBuilder {
 
         let has_any_annotations = has_param_annotations || has_return_annotation;
 
-        // Only take annotation_block if this function has any annotations
-        // Otherwise, leave the parent's annotation_block for module-level annotations
+        // Take annotation_block if this function has any annotations.
+        // When in class scope, the class's annotation_block was saved before scanning
+        // function annotations, so the current annotation_block belongs to this function.
         let annotation_block = if has_any_annotations {
             self.tables.last_mut().unwrap().annotation_block.take()
         } else {
