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

refactor(sourcemap): using binary search to search original position (#3360)

Browse source 
The ast span is not ordering at rolldown, eg the module original ast is
`a,b,c`, after mutate could be `b,c,a`. So here revert changes from
[here](https://github.com/oxc-project/oxc/pull/2728).
This commit is contained in:
underfin 2024-05-20 22:35:25 +08:00 committed by GitHub
parent 90d2d09022
commit e879685a25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
crates/oxc_codegen/src/sourcemap_builder.rs
View file

@ -27,7 +27,6 @@ pub struct SourcemapBuilder {
original_source: Arc<str>,
last_generated_update: usize,
last_position: Option<u32>,
last_search_line: usize,
line_offset_tables: Vec<LineOffsetTable>,
sourcemap_builder: oxc_sourcemap::SourceMapBuilder,
generated_line: u32,
@ -41,7 +40,6 @@ impl Default for SourcemapBuilder {
original_source: "".into(),
last_generated_update: 0,
last_position: None,
last_search_line: 0,
line_offset_tables: vec![],
sourcemap_builder: oxc_sourcemap::SourceMapBuilder::default(),
generated_line: 0,
@ -97,17 +95,10 @@ impl SourcemapBuilder {
#[allow(clippy::cast_possible_truncation)]
fn search_original_line_and_column(&mut self, position: u32) -> (u32, u32) {
let mut original_line = 0;
for i in self.last_search_line..self.line_offset_tables.len() {
if self.line_offset_tables[i].byte_offset_to_start_of_line > position as usize {
original_line = i - 1;
break;
}
if i == self.line_offset_tables.len() - 1 {
original_line = i;
}
}
self.last_search_line = original_line;
let result = self
.line_offset_tables
.partition_point(|table| table.byte_offset_to_start_of_line <= position as usize);
let original_line = if result > 0 { result - 1 } else { 0 };
let line = &self.line_offset_tables[original_line];
let mut original_column = (position as usize) - line.byte_offset_to_start_of_line;
if original_column >= line.byte_offset_to_first {
@ -332,6 +323,11 @@ mod test {
assert_mapping("Ö\r\na", &[(0, 0, 0), (2, 0, 1), (3, 0, 2), (4, 1, 0), (5, 1, 1)]);
}
#[test]
fn builder_with_unordered_position() {
assert_mapping("\na\nb", &[(4, 2, 1), (0, 0, 0), (1, 1, 0), (2, 1, 1), (3, 2, 0)]);
}
fn assert_mapping(source: &str, mappings: &[(u32, u32, u32)]) {
let mut builder = SourcemapBuilder::default();
builder.with_name_and_source("x.js", source);