Skip to content

fix(transformer): RegExp transform only set span on final expression #5508

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
Sep 6, 2024
Merged

fix(transformer): RegExp transform only set span on final expression #5508

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
11 changes: 4 additions & 7 deletions crates/oxc_transformer/src/regexp/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ use oxc_regular_expression::ast::{
CharacterClass, CharacterClassContents, LookAroundAssertionKind, Pattern, Term,
};
use oxc_semantic::ReferenceFlags;
use oxc_span::Atom;
use oxc_span::{Atom, SPAN};
use oxc_traverse::{Traverse, TraverseCtx};

use crate::context::Ctx;
Expand Down Expand Up @@ -164,7 +164,7 @@ impl<'a> Traverse<'a> for RegExp<'a> {
let callee = {
let symbol_id = ctx.scopes().find_binding(ctx.current_scope_id(), "RegExp");
let ident = ctx.create_reference_id(
regexp.span,
SPAN,
Atom::from("RegExp"),
symbol_id,
ReferenceFlags::read(),
Expand All @@ -174,14 +174,11 @@ impl<'a> Traverse<'a> for RegExp<'a> {

let mut arguments = ctx.ast.vec_with_capacity(2);
arguments.push(
ctx.ast.argument_expression(
ctx.ast.expression_string_literal(regexp.span, pattern_source),
),
ctx.ast.argument_expression(ctx.ast.expression_string_literal(SPAN, pattern_source)),
);

let flags = regexp.regex.flags.to_string();
let flags =
ctx.ast.argument_expression(ctx.ast.expression_string_literal(regexp.span, flags));
let flags = ctx.ast.argument_expression(ctx.ast.expression_string_literal(SPAN, flags));
arguments.push(flags);

*expr = ctx.ast.expression_new(
Expand Down