fix(semantic): rebind class expressions before identifier checks (#20916)

camc314 · camc314 · commit 31316c8923b2 · 2026-04-01T02:08:03.000Z
fixes #20915 broke in 2191ae9
diff --git a/crates/oxc_semantic/src/builder.rs b/crates/oxc_semantic/src/builder.rs
@@ -774,15 +774,16 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
 
         self.visit_decorators(&class.decorators);
         self.enter_scope(ScopeFlags::StrictMode, &class.scope_id);
-        if let Some(id) = &class.id {
-            self.visit_binding_identifier(id);
-        }
 
         if class.is_expression() {
-            // We need to bind class expression in the class scope
+            // We need to bind class expressions in the class scope before visiting the identifier.
             class.bind(self);
         }
 
+        if let Some(id) = &class.id {
+            self.visit_binding_identifier(id);
+        }
+
         if let Some(type_parameters) = &class.type_parameters {
             self.visit_ts_type_parameter_declaration(type_parameters);
         }
diff --git a/crates/oxc_semantic/src/lib.rs b/crates/oxc_semantic/src/lib.rs
@@ -333,6 +333,22 @@ mod tests {
         assert!(scopes.get_binding(scopes.root_scope_id(), Ident::new_const("Fn")).is_some());
     }
 
+    #[test]
+    fn repeated_build_with_named_class_expression_and_syntax_checks() {
+        let allocator = Allocator::default();
+        let source = "export const X = class Base {};";
+        let source_type = SourceType::ts();
+        let parse = oxc_parser::Parser::new(&allocator, source, source_type).parse();
+
+        assert!(parse.errors.is_empty());
+
+        let first = SemanticBuilder::new().with_check_syntax_error(true).build(&parse.program);
+        assert!(first.errors.is_empty());
+
+        let second = SemanticBuilder::new().with_check_syntax_error(true).build(&parse.program);
+        assert!(second.errors.is_empty());
+    }
+
     #[test]
     fn test_is_global() {
         let source = "
