Skip to content

refactor(ast): use scope_id etc methods #7130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Nov 5, 2024
Merged

refactor(ast): use scope_id etc methods #7130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/oxc_ast/src/ast_impl/js.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,10 +970,10 @@ impl<'a> Function<'a> {

/// Get the [`SymbolId`] this [`Function`] is bound to.
///
/// Returns [`None`] for anonymous functions, or if semantic analysis was skipped.
/// Returns [`None`] for anonymous functions.
#[inline]
pub fn symbol_id(&self) -> Option<SymbolId> {
self.id.as_ref().and_then(|id| id.symbol_id.get())
self.id.as_ref().map(BindingIdentifier::symbol_id)
}

/// `true` for overload signatures and `declare function` statements.
Expand Down
38 changes: 19 additions & 19 deletions crates/oxc_ast/src/ast_kind_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,25 +100,25 @@ impl<'a> AstKind<'a> {
/// Will always be none if semantic analysis has not been run.
pub fn get_container_scope_id(self) -> Option<ScopeId> {
match self {
Self::Program(p) => p.scope_id.get(),
Self::BlockStatement(b) => b.scope_id.get(),
Self::ForStatement(f) => f.scope_id.get(),
Self::ForInStatement(f) => f.scope_id.get(),
Self::ForOfStatement(f) => f.scope_id.get(),
Self::SwitchStatement(switch) => switch.scope_id.get(),
Self::CatchClause(catch) => catch.scope_id.get(),
Self::Function(f) => f.scope_id.get(),
Self::ArrowFunctionExpression(f) => f.scope_id.get(),
Self::Class(class) => class.scope_id.get(),
Self::StaticBlock(b) => b.scope_id.get(),
Self::TSEnumDeclaration(e) => e.scope_id.get(),
Self::TSConditionalType(e) => e.scope_id.get(),
Self::TSTypeAliasDeclaration(e) => e.scope_id.get(),
Self::TSInterfaceDeclaration(e) => e.scope_id.get(),
Self::TSMethodSignature(e) => e.scope_id.get(),
Self::TSConstructSignatureDeclaration(e) => e.scope_id.get(),
Self::TSModuleDeclaration(e) => e.scope_id.get(),
Self::TSMappedType(e) => e.scope_id.get(),
Self::Program(p) => Some(p.scope_id()),
Self::BlockStatement(b) => Some(b.scope_id()),
Self::ForStatement(f) => Some(f.scope_id()),
Self::ForInStatement(f) => Some(f.scope_id()),
Self::ForOfStatement(f) => Some(f.scope_id()),
Self::SwitchStatement(switch) => Some(switch.scope_id()),
Self::CatchClause(catch) => Some(catch.scope_id()),
Self::Function(f) => Some(f.scope_id()),
Self::ArrowFunctionExpression(f) => Some(f.scope_id()),
Self::Class(class) => Some(class.scope_id()),
Self::StaticBlock(b) => Some(b.scope_id()),
Self::TSEnumDeclaration(e) => Some(e.scope_id()),
Self::TSConditionalType(e) => Some(e.scope_id()),
Self::TSTypeAliasDeclaration(e) => Some(e.scope_id()),
Self::TSInterfaceDeclaration(e) => Some(e.scope_id()),
Self::TSMethodSignature(e) => Some(e.scope_id()),
Self::TSConstructSignatureDeclaration(e) => Some(e.scope_id()),
Self::TSModuleDeclaration(e) => Some(e.scope_id()),
Self::TSMappedType(e) => Some(e.scope_id()),
_ => None,
}
}
Expand Down