Skip to content

fix(transform/styled-components): fix spans of quasis when some quasis removed #12240

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
Jul 13, 2025
Merged

fix(transform/styled-components): fix spans of quasis when some quasis removed #12240

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
19 changes: 18 additions & 1 deletion crates/oxc_transformer/src/plugins/styled_components.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,10 +891,27 @@ fn minify_template_literal<'a>(lit: &mut TemplateLiteral<'a>, ast: AstBuilder<'a
// TODO: What about `cooked`? Shouldn't we alter that too?
let mut quasi_index = 0;
while quasi_index < quasis.len() {
let mut bytes = quasis[quasi_index].value.raw.as_str().as_bytes();
let quasi = &quasis[quasi_index];
let mut bytes = quasi.value.raw.as_str().as_bytes();

if quasi_index > 0 {
if let Some(is_block_comment) = comment_type {
// This quasi is being merged into previous.
// Extend span end of previous quasi to this quasi's span end, as previous quasi now covers both.
//
// ```
// // Input:
// styled.div`color: /* ${c} */ blue`
// // ^^^^^^^^^^ ^^^^^^^^ spans of `quasis[0]` and `quasis[1]`
//
// // Transformed:
// styled.div`color:blue`
// // `quasis[0]` in transformed `TemplateLiteral` has span of:
// styled.div`color: /* ${c} */ blue`
// // ^^^^^^^^^^^^^^^^^^^^^^
// ```
quasis[quasi_index - 1].span.end = quasi.span.end;

// Remove this quasi and the preceding expression.
// TODO: Remove scopes, symbols, and references for removed `Expression`.
quasis.remove(quasi_index);
Expand Down
Loading