Skip to content

Commit b6cb0ec

Browse files
committed
refactor(traverse): improve parsing attrs in traverse codegen
1 parent 7f1266a commit b6cb0ec

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

crates/oxc_ast/src/ast/js.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use tsify::Tsify;
2525

2626
#[visited_node(
2727
scope(ScopeFlags::Top),
28-
strict_if(self.source_type.is_strict() || self.directives.iter().any(Directive::is_use_strict))
28+
strict_if(self.source_type.is_strict() || self.directives.iter().any(Directive::is_use_strict)),
2929
)]
3030
#[derive(Debug)]
3131
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
@@ -1101,7 +1101,7 @@ pub struct WhileStatement<'a> {
11011101
/// For Statement
11021102
#[visited_node(
11031103
scope(ScopeFlags::empty()),
1104-
scope_if(self.init.as_ref().is_some_and(ForStatementInit::is_lexical_declaration))
1104+
scope_if(self.init.as_ref().is_some_and(ForStatementInit::is_lexical_declaration)),
11051105
)]
11061106
#[derive(Debug)]
11071107
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
@@ -1426,7 +1426,7 @@ pub struct BindingRestElement<'a> {
14261426
#[visited_node(
14271427
// TODO: `ScopeFlags::Function` is not correct if this is a `MethodDefinition`
14281428
scope(ScopeFlags::Function),
1429-
strict_if(self.body.as_ref().is_some_and(|body| body.has_use_strict_directive()))
1429+
strict_if(self.body.as_ref().is_some_and(|body| body.has_use_strict_directive())),
14301430
)]
14311431
#[derive(Debug)]
14321432
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
@@ -1533,7 +1533,7 @@ pub struct FunctionBody<'a> {
15331533
/// Arrow Function Definitions
15341534
#[visited_node(
15351535
scope(ScopeFlags::Function | ScopeFlags::Arrow),
1536-
strict_if(self.body.has_use_strict_directive())
1536+
strict_if(self.body.has_use_strict_directive()),
15371537
)]
15381538
#[derive(Debug)]
15391539
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]

crates/oxc_ast/src/ast/ts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ pub enum TSTypePredicateName<'a> {
785785
#[visited_node(
786786
scope(ScopeFlags::TsModuleBlock),
787787
enter_scope_before(body),
788-
strict_if(self.body.as_ref().is_some_and(|body| body.is_strict()))
788+
strict_if(self.body.as_ref().is_some_and(|body| body.is_strict())),
789789
)]
790790
#[derive(Debug)]
791791
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]

crates/oxc_traverse/scripts/lib/parse.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function parseFile(code, filename, types) {
3737
line = lines[++lineIndex];
3838
}
3939
scopeArgsStr += ` ${line.slice(0, -2)}`;
40-
scopeArgsStr = scopeArgsStr.trim().replace(/ +/g, ' ');
40+
scopeArgsStr = scopeArgsStr.trim().replace(/ +/g, ' ').replace(/,$/, '');
4141

4242
scopeArgs = parseScopeArgs(scopeArgsStr, filename, lineIndex);
4343
}

0 commit comments

Comments
 (0)