Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/oxc_codegen/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ pub struct Codegen<'a> {
// Builders
comments: CommentsMap,

sourcemap_builder: Option<SourcemapBuilder>,
sourcemap_builder: Option<SourcemapBuilder<'a>>,
}

impl Default for Codegen<'_> {
Expand Down
19 changes: 9 additions & 10 deletions crates/oxc_codegen/src/sourcemap_builder.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{path::Path, sync::Arc};
use std::path::Path;

use nonmax::NonMaxU32;
use oxc_index::{Idx, IndexVec};
Expand Down Expand Up @@ -65,9 +65,9 @@ pub struct ColumnOffsets {
}

#[expect(clippy::struct_field_names)]
pub struct SourcemapBuilder {
pub struct SourcemapBuilder<'a> {
source_id: u32,
original_source: Arc<str>,
original_source: &'a str,
last_generated_update: usize,
last_position: Option<u32>,
line_offset_tables: LineOffsetTables,
Expand All @@ -80,15 +80,15 @@ pub struct SourcemapBuilder {
last_line_lookup: u32,
}

impl SourcemapBuilder {
pub fn new(path: &Path, source_text: &str) -> Self {
impl<'a> SourcemapBuilder<'a> {
pub fn new(path: &Path, source_text: &'a str) -> Self {
let mut sourcemap_builder = oxc_sourcemap::SourceMapBuilder::default();
let line_offset_tables = Self::generate_line_offset_tables(source_text);
let source_id =
sourcemap_builder.set_source_and_content(path.to_string_lossy().as_ref(), source_text);
Self {
source_id,
original_source: Arc::from(source_text),
original_source: source_text,
last_generated_update: 0,
last_position: None,
line_offset_tables,
Expand All @@ -114,18 +114,17 @@ impl SourcemapBuilder {
let original_name = self.original_source.get(span.start as usize..span.end as usize);
// The token name should be original name.
// If it hasn't change, name should be `None` to reduce `SourceMap` size.
let token_name =
if original_name == Some(name) { None } else { original_name.map(Into::into) };
let token_name = if original_name == Some(name) { None } else { original_name };
self.add_source_mapping(output, span.start, token_name);
}

pub fn add_source_mapping(&mut self, output: &[u8], position: u32, name: Option<Arc<str>>) {
pub fn add_source_mapping(&mut self, output: &[u8], position: u32, name: Option<&str>) {
if matches!(self.last_position, Some(last_position) if last_position == position) {
return;
}
let (original_line, original_column) = self.search_original_line_and_column(position);
self.update_generated_line_and_column(output);
let name_id = name.map(|s| self.sourcemap_builder.add_name(&s));
let name_id = name.map(|s| self.sourcemap_builder.add_name(s));
self.sourcemap_builder.add_token(
self.generated_line,
self.generated_column,
Expand Down
Loading