dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-22 13:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(ast, transformer)!: remove BlockStatement::new methods (#6783)

Browse source 
First of a series of PRs removing `new` and `new_with_scope_id` etc methods from AST types. Following #6760, all AST node creation can now go via the AST builder.

This lays groundwork for Node IDs (#5689), as we'll need `NodeId`s to be generated in `AstBuilder`, so that all nodes receive an ID.
This commit is contained in:
overlookmotel 2024-10-23 03:36:30 +00:00
parent 8f179534c2
commit 2bee4e2735
2 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/oxc_ast/src/ast_impl/js.rs
View file

@ -5,10 +5,7 @@ use std::{borrow::Cow, cell::Cell, fmt};
use oxc_allocator::{Address, Box, FromIn, GetAddress, Vec};
use oxc_span::{Atom, GetSpan, Span};
use oxc_syntax::{
operator::UnaryOperator,
reference::ReferenceId,
scope::{ScopeFlags, ScopeId},
symbol::SymbolId,
operator::UnaryOperator, reference::ReferenceId, scope::ScopeFlags, symbol::SymbolId,
};
use crate::ast::*;
@ -818,18 +815,6 @@ impl<'a> Directive<'a> {
}
}
impl<'a> BlockStatement<'a> {
#[allow(missing_docs)]
pub fn new(span: Span, body: Vec<'a, Statement<'a>>) -> Self {
Self { span, body, scope_id: Cell::default() }
}
#[allow(missing_docs)]
pub fn new_with_scope_id(span: Span, body: Vec<'a, Statement<'a>>, scope_id: ScopeId) -> Self {
Self { span, body, scope_id: Cell::new(Some(scope_id)) }
}
}
impl<'a> Declaration<'a> {
#[allow(missing_docs)]
pub fn is_typescript_syntax(&self) -> bool {

10
crates/oxc_transformer/src/typescript/annotations.rs
View file

@ -562,9 +562,8 @@ impl<'a, 'ctx> TypeScriptAnnotations<'a, 'ctx> {
ctx: &mut TraverseCtx<'a>,
) -> Statement<'a> {
let scope_id = ctx.insert_scope_below_statement(&stmt, ScopeFlags::empty());
let block = BlockStatement::new_with_scope_id(span, ctx.ast.vec1(stmt), scope_id);
block.scope_id.set(Some(scope_id));
Statement::BlockStatement(ctx.ast.alloc(block))
let block = ctx.ast.alloc_block_statement_with_scope_id(span, ctx.ast.vec1(stmt), scope_id);
Statement::BlockStatement(block)
}
fn replace_for_statement_body_with_empty_block_if_ts(
@ -583,8 +582,9 @@ impl<'a, 'ctx> TypeScriptAnnotations<'a, 'ctx> {
) {
if stmt.is_typescript_syntax() {
let scope_id = ctx.create_child_scope(parent_scope_id, ScopeFlags::empty());
let block = BlockStatement::new_with_scope_id(stmt.span(), ctx.ast.vec(), scope_id);
*stmt = Statement::BlockStatement(ctx.ast.alloc(block));
let block =
ctx.ast.alloc_block_statement_with_scope_id(stmt.span(), ctx.ast.vec(), scope_id);
*stmt = Statement::BlockStatement(block);
}
}