dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 12:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(sourcemap): avoid negative line if token_chunks has same prev_dst_line (#4348)

Browse source
This commit is contained in:
underfin 2024-07-19 18:14:35 +08:00 committed by GitHub
parent 58f6ec21f3
commit 4cd5df00ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crates/oxc_sourcemap/src/concat_sourcemap_builder.rs
View file

@ -88,6 +88,7 @@ impl ConcatSourceMapBuilder {
}
}
#[cfg(feature = "concurrent")]
#[test]
fn test_concat_sourcemap_builder() {
let sm1 = SourceMap::new(
@ -108,18 +109,32 @@ fn test_concat_sourcemap_builder() {
vec![Token::new(1, 1, 1, 1, Some(0), Some(0))],
None,
);
let sm3 = SourceMap::new(
None,
vec!["abc".into()],
None,
vec!["abc.js".into()],
None,
vec![Token::new(1, 2, 2, 2, Some(0), Some(0))],
None,
);
let mut builder = ConcatSourceMapBuilder::default();
builder.add_sourcemap(&sm1, 0);
builder.add_sourcemap(&sm2, 2);
builder.add_sourcemap(&sm3, 2);
let sm = SourceMap::new(
None,
vec!["foo".into(), "foo2".into(), "bar".into()],
vec!["foo".into(), "foo2".into(), "bar".into(), "abc".into()],
None,
vec!["foo.js".into(), "bar.js".into()],
vec!["foo.js".into(), "bar.js".into(), "abc.js".into()],
None,
vec![Token::new(1, 1, 1, 1, Some(0), Some(0)), Token::new(3, 1, 1, 1, Some(1), Some(2))],
vec![
Token::new(1, 1, 1, 1, Some(0), Some(0)),
Token::new(3, 1, 1, 1, Some(1), Some(2)),
Token::new(3, 2, 2, 2, Some(2), Some(3)),
],
None,
);
let concat_sm = builder.into_sourcemap();
@ -131,9 +146,10 @@ fn test_concat_sourcemap_builder() {
concat_sm.token_chunks,
Some(vec![
TokenChunk::new(0, 1, 0, 0, 0, 0, 0, 0,),
TokenChunk::new(1, 2, 1, 1, 1, 1, 0, 0,)
TokenChunk::new(1, 2, 1, 1, 1, 1, 0, 0,),
TokenChunk::new(2, 3, 3, 1, 1, 1, 2, 1,)
])
);
assert_eq!(sm.to_json_string().unwrap(), sm.to_json_string().unwrap());
assert_eq!(sm.to_json().mappings, concat_sm.to_json().mappings);
}

5
crates/oxc_sourcemap/src/encode.rs
View file

@ -129,14 +129,15 @@ fn serialize_mappings(tokens: &[Token], token_chunk: &TokenChunk) -> String {
} = *token_chunk;
for (idx, token) in tokens[start as usize..end as usize].iter().enumerate() {
let index = start as usize + idx;
if token.get_dst_line() != prev_dst_line {
prev_dst_col = 0;
while token.get_dst_line() != prev_dst_line {
rv.push(';');
prev_dst_line += 1;
}
} else if idx > 0 {
if Some(token) == tokens.get(idx - 1) {
} else if index > 0 {
if Some(token) == tokens.get(index - 1) {
continue;
}
rv.push(',');