diff --git a/crates/oxc_ast/src/ast/js.rs b/crates/oxc_ast/src/ast/js.rs index d27f8bc55..233b734bc 100644 --- a/crates/oxc_ast/src/ast/js.rs +++ b/crates/oxc_ast/src/ast/js.rs @@ -282,8 +282,8 @@ impl Hash for IdentifierReference { } impl IdentifierReference { - pub fn new(name: Atom, span: Span) -> Self { - Self { name, span, reference_id: Cell::default() } + pub fn new(span: Span, name: Atom) -> Self { + Self { span, name, reference_id: Cell::default() } } } @@ -306,8 +306,8 @@ impl Hash for BindingIdentifier { } impl BindingIdentifier { - pub fn new(name: Atom, span: Span) -> Self { - Self { name, span, symbol_id: Cell::default() } + pub fn new(span: Span, name: Atom) -> Self { + Self { span, name, symbol_id: Cell::default() } } } diff --git a/crates/oxc_parser/src/js/binding.rs b/crates/oxc_parser/src/js/binding.rs index 4caf18d8e..42eda1e2c 100644 --- a/crates/oxc_parser/src/js/binding.rs +++ b/crates/oxc_parser/src/js/binding.rs @@ -90,7 +90,7 @@ impl<'a> Parser<'a> { // ^ BindingIdentifier if let PropertyKey::Identifier(ident) = &key { shorthand = true; - let binding_identifier = BindingIdentifier::new(ident.name.clone(), ident.span); + let binding_identifier = BindingIdentifier::new(ident.span, ident.name.clone()); let identifier = self.ast.binding_identifier(binding_identifier); let left = self.ast.binding_pattern(identifier, None, false); self.with_context(Context::In, |p| p.parse_initializer(span, left))? diff --git a/crates/oxc_parser/src/js/grammar.rs b/crates/oxc_parser/src/js/grammar.rs index 420f914ab..26778d8cb 100644 --- a/crates/oxc_parser/src/js/grammar.rs +++ b/crates/oxc_parser/src/js/grammar.rs @@ -152,7 +152,7 @@ impl<'a> CoverGrammar<'a, ObjectProperty<'a>> for AssignmentTargetProperty<'a> { let binding = match property.key { PropertyKey::Identifier(ident) => { let ident = ident.unbox(); - IdentifierReference::new(ident.name, ident.span) + IdentifierReference::new(ident.span, ident.name) } _ => return Err(p.unexpected()), }; diff --git a/crates/oxc_parser/src/ts/statement.rs b/crates/oxc_parser/src/ts/statement.rs index dabbee1da..cdf84e07e 100644 --- a/crates/oxc_parser/src/ts/statement.rs +++ b/crates/oxc_parser/src/ts/statement.rs @@ -431,7 +431,7 @@ impl<'a> Parser<'a> { let span = self.start_span(); let (ident_span, name) = self.parse_identifier_kind(Kind::This); let type_annotation = self.parse_ts_type_annotation()?; - let kind = self.ast.binding_identifier(BindingIdentifier::new(name, ident_span)); + let kind = self.ast.binding_identifier(BindingIdentifier::new(ident_span, name)); let binding = self.ast.binding_pattern(kind, type_annotation, /* optional */ false); Ok(self.ast.formal_parameter( self.end_span(span), diff --git a/crates/oxc_parser/src/ts/types.rs b/crates/oxc_parser/src/ts/types.rs index be8f8558e..9ac41fab8 100644 --- a/crates/oxc_parser/src/ts/types.rs +++ b/crates/oxc_parser/src/ts/types.rs @@ -486,7 +486,7 @@ impl<'a> Parser<'a> { pub(crate) fn parse_ts_type_name(&mut self) -> Result> { let span = self.start_span(); let ident = self.parse_identifier_name()?; - let ident = IdentifierReference::new(ident.name, ident.span); + let ident = IdentifierReference::new(ident.span, ident.name); let mut left = TSTypeName::IdentifierReference(self.ast.alloc(ident)); while self.eat(Kind::Dot) { let right = self.parse_identifier_name()?; diff --git a/crates/oxc_transformer/src/es2016/exponentiation_operator.rs b/crates/oxc_transformer/src/es2016/exponentiation_operator.rs index 445fd0b0d..9a3db1b2c 100644 --- a/crates/oxc_transformer/src/es2016/exponentiation_operator.rs +++ b/crates/oxc_transformer/src/es2016/exponentiation_operator.rs @@ -28,7 +28,7 @@ impl<'a> ExponentiationOperator<'a> { let left = self.ast.move_expression(&mut binary_expression.left); let right = self.ast.move_expression(&mut binary_expression.right); // Math.pow - let ident_math = IdentifierReference::new("Math".into(), Span::default()); + let ident_math = IdentifierReference::new(Span::default(), "Math".into()); let object = self.ast.identifier_expression(ident_math); let property = IdentifierName::new(Span::default(), "pow".into()); let callee = self.ast.static_member_expression(Span::default(), object, property, false); diff --git a/crates/oxc_transformer/src/es2019/optional_catch_binding.rs b/crates/oxc_transformer/src/es2019/optional_catch_binding.rs index 45d681829..41998f253 100644 --- a/crates/oxc_transformer/src/es2019/optional_catch_binding.rs +++ b/crates/oxc_transformer/src/es2019/optional_catch_binding.rs @@ -21,7 +21,7 @@ impl<'a> OptionalCatchBinding<'a> { if clause.param.is_some() { return; } - let binding_identifier = BindingIdentifier::new("unused".into(), Span::default()); + let binding_identifier = BindingIdentifier::new(Span::default(), "unused".into()); let binding_pattern_kind = self.ast.binding_identifier(binding_identifier); let binding_pattern = self.ast.binding_pattern(binding_pattern_kind, None, false); clause.param = Some(binding_pattern);