dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-25 04:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(semantic): check directive by current_scope_id (#2411)

Browse source
This commit is contained in:
Dunqing 2024-02-14 23:21:24 +08:00 committed by GitHub
parent 8e0277e510
commit 28ba28f64c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crates/oxc_semantic/src/checker/javascript.rs
View file

@ -41,7 +41,7 @@ impl EarlyErrorJavaScript {
AstKind::StringLiteral(lit) => check_string_literal(lit, ctx), AstKind::StringLiteral(lit) => check_string_literal(lit, ctx),
AstKind::RegExpLiteral(lit) => check_regexp_literal(lit, ctx), AstKind::RegExpLiteral(lit) => check_regexp_literal(lit, ctx),
AstKind::Directive(dir) => check_directive(dir, node, ctx), AstKind::Directive(dir) => check_directive(dir, ctx),
AstKind::ModuleDeclaration(decl) => { AstKind::ModuleDeclaration(decl) => {
check_module_declaration(decl, node, ctx); check_module_declaration(decl, node, ctx);
} }
@ -389,7 +389,7 @@ fn check_string_literal(lit: &StringLiteral, ctx: &SemanticBuilder<'_>) {
// It is a Syntax Error if FunctionBodyContainsUseStrict of AsyncFunctionBody is true and IsSimpleParameterList of FormalParameters is false. // It is a Syntax Error if FunctionBodyContainsUseStrict of AsyncFunctionBody is true and IsSimpleParameterList of FormalParameters is false.
// background: https://humanwhocodes.com/blog/2016/10/the-ecmascript-2016-change-you-probably-dont-know/ // background: https://humanwhocodes.com/blog/2016/10/the-ecmascript-2016-change-you-probably-dont-know/
fn check_directive<'a>(directive: &Directive, node: &AstNode<'a>, ctx: &SemanticBuilder<'a>) { fn check_directive(directive: &Directive, ctx: &SemanticBuilder<'_>) {
#[derive(Debug, Error, Diagnostic)] #[derive(Debug, Error, Diagnostic)]
#[error("Illegal 'use strict' directive in function with non-simple parameter list")] #[error("Illegal 'use strict' directive in function with non-simple parameter list")]
#[diagnostic()] #[diagnostic()]
@ -399,21 +399,16 @@ fn check_directive<'a>(directive: &Directive, node: &AstNode<'a>, ctx: &Semantic
return; return;
} }
if !ctx.scope.get_flags(node.scope_id()).is_function() { if !ctx.current_scope_flags().is_function() {
return; return;
} }
for node_id in ctx.nodes.ancestors(node.id()) { if matches!(ctx.nodes.kind(ctx.scope.get_node_id(ctx.current_scope_id)),
match ctx.nodes.kind(node_id) { AstKind::Function(Function { params, .. })
AstKind::Function(Function { params, .. }) | AstKind::ArrowExpression(ArrowExpression { params, .. })
| AstKind::ArrowExpression(ArrowExpression { params, .. }) => { if !params.is_simple_parameter_list())
if !params.is_simple_parameter_list() { {
return ctx.error(IllegalUseStrict(directive.span)); ctx.error(IllegalUseStrict(directive.span));
}
break;
}
_ => {}
}
} }
} }