u

Author: Boshen

crates/oxc_ast/src/ast/js.rs

@@ -1390,6 +1390,7 @@ pub struct ReturnStatement<'a> {
 pub struct WithStatement<'a> {
     pub span: Span,
     pub object: Expression<'a>,
+    #[scope(enter_before)]
     pub body: Statement<'a>,
     pub scope_id: Cell<Option<ScopeId>>,
 }

crates/oxc_ast_visit/src/generated/visit.rs

@@ -2254,9 +2254,9 @@ pub mod walk {
     pub fn walk_with_statement<'a, V: Visit<'a>>(visitor: &mut V, it: &WithStatement<'a>) {
         let kind = AstKind::WithStatement(visitor.alloc(it));
         visitor.enter_node(kind);
-        visitor.enter_scope(ScopeFlags::empty(), &it.scope_id);
         visitor.visit_span(&it.span);
         visitor.visit_expression(&it.object);
+        visitor.enter_scope(ScopeFlags::empty(), &it.scope_id);
         visitor.visit_statement(&it.body);
         visitor.leave_scope();
         visitor.leave_node(kind);

crates/oxc_ast_visit/src/generated/visit_mut.rs

@@ -2312,9 +2312,9 @@ pub mod walk_mut {
     pub fn walk_with_statement<'a, V: VisitMut<'a>>(visitor: &mut V, it: &mut WithStatement<'a>) {
         let kind = AstType::WithStatement;
         visitor.enter_node(kind);
-        visitor.enter_scope(ScopeFlags::empty(), &it.scope_id);
         visitor.visit_span(&mut it.span);
         visitor.visit_expression(&mut it.object);
+        visitor.enter_scope(ScopeFlags::empty(), &it.scope_id);
         visitor.visit_statement(&mut it.body);
         visitor.leave_scope();
         visitor.leave_node(kind);

crates/oxc_traverse/src/generated/scopes_collector.rs

@@ -830,6 +830,7 @@ impl<'a> Visit<'a> for ChildScopeCollector {
 
     #[inline]
     fn visit_with_statement(&mut self, it: &WithStatement<'a>) {
+        self.visit_expression(&it.object);
         self.add_scope(&it.scope_id);
     }
 

crates/oxc_traverse/src/generated/walk.rs

@@ -1891,12 +1891,6 @@ unsafe fn walk_with_statement<'a, State, Tr: Traverse<'a, State>>(
     ctx: &mut TraverseCtx<'a, State>,
 ) {
     traverser.enter_with_statement(&mut *node, ctx);
-    let previous_scope_id = ctx.current_scope_id();
-    let current_scope_id = (*((node as *mut u8).add(ancestor::OFFSET_WITH_STATEMENT_SCOPE_ID)
-        as *mut Cell<Option<ScopeId>>))
-        .get()
-        .unwrap();
-    ctx.set_current_scope_id(current_scope_id);
     let pop_token = ctx.push_stack(Ancestor::WithStatementObject(
         ancestor::WithStatementWithoutObject(node, PhantomData),
     ));
@@ -1905,6 +1899,12 @@ unsafe fn walk_with_statement<'a, State, Tr: Traverse<'a, State>>(
         (node as *mut u8).add(ancestor::OFFSET_WITH_STATEMENT_OBJECT) as *mut Expression,
         ctx,
     );
+    let previous_scope_id = ctx.current_scope_id();
+    let current_scope_id = (*((node as *mut u8).add(ancestor::OFFSET_WITH_STATEMENT_SCOPE_ID)
+        as *mut Cell<Option<ScopeId>>))
+        .get()
+        .unwrap();
+    ctx.set_current_scope_id(current_scope_id);
     ctx.retag_stack(AncestorType::WithStatementBody);
     walk_statement(
         traverser,