Skip to content

fix(ast/estree): Better align program span start #10134

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
overlookmotel merged 6 commits into from
Apr 3, 2025
Merged

fix(ast/estree): Better align program span start #10134

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c8502c
Fix start span for program in most places
therewillbecode Mar 30, 2025
bf608fa
Add comment
therewillbecode Mar 30, 2025
d1174f1
Remove comment
therewillbecode Mar 30, 2025
35ff463
Adjust span in non pretty serialiser too
therewillbecode Mar 30, 2025
41d7be8
Use directive start span and add comment
therewillbecode Apr 2, 2025
0b38c8c
snapshot
overlookmotel Apr 3, 2025
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
Prev Previous commit
Next Next commit
Adjust span in non pretty serialiser too
  • Loading branch information
@therewillbecode @overlookmotel
therewillbecode authored and overlookmotel committed Apr 3, 2025
commit 35ff46369351287aba7401c9f40fcd2e3afb95c1
7 changes: 6 additions & 1 deletion crates/oxc_ast/src/serialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ const JSON_CAPACITY_RATIO_PRETTY: usize = 80;

impl Program<'_> {
/// Serialize AST to ESTree JSON, including TypeScript fields.
pub fn to_estree_ts_json(&self) -> String {
pub fn to_estree_ts_json(&mut self) -> String {
// Set start span to first token of first statement.
if let Some(first_stat) = self.body.first() {
self.span = Span::new(first_stat.span().start, self.span.end);
}

let capacity = self.source_text.len() * JSON_CAPACITY_RATIO_COMPACT;
let mut serializer = CompactTSSerializer::with_capacity(capacity);
self.serialize(&mut serializer);
Expand Down