Skip to content

fix(transformer): arrow func transform use correct spans #3630

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
Jun 12, 2024
Merged

fix(transformer): arrow func transform use correct spans #3630

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
12 changes: 7 additions & 5 deletions crates/oxc_transformer/src/es2015/arrow_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,17 @@ impl<'a> ArrowFunctions<'a> {
if arrow_function_expr.expression {
let first_stmt = body.statements.remove(0);
if let Statement::ExpressionStatement(stmt) = first_stmt {
let return_statement =
self.ctx.ast.return_statement(SPAN, Some(self.ctx.ast.copy(&stmt.expression)));
let return_statement = self
.ctx
.ast
.return_statement(stmt.span, Some(self.ctx.ast.copy(&stmt.expression)));
body.statements.push(return_statement);
}
}

let new_function = self.ctx.ast.function(
FunctionType::FunctionExpression,
SPAN,
arrow_function_expr.span,
None,
false,
arrow_function_expr.r#async,
Expand All @@ -181,14 +183,14 @@ impl<'a> ArrowFunctions<'a> {

pub fn transform_expression_on_exit(&mut self, expr: &mut Expression<'a>) {
match expr {
Expression::ThisExpression(_) => {
Expression::ThisExpression(this_expr) => {
if !self.is_inside_arrow_function() {
return;
}

self.mark_this_as_found();
*expr = self.ctx.ast.identifier_reference_expression(IdentifierReference::new(
SPAN,
this_expr.span,
self.get_this_name(),
));
}
Expand Down