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
Next Next commit
Fix start span for program in most places
  • Loading branch information
@therewillbecode @overlookmotel
therewillbecode authored and overlookmotel committed Apr 3, 2025
commit 2c8502c571449fe8a17d05be6a09a654905b9fb8
10 changes: 7 additions & 3 deletions crates/oxc_ast/src/serialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use cow_utils::CowUtils;

use crate::ast::*;
use oxc_ast_macros::ast_meta;
use oxc_estree::{
CompactJSSerializer, CompactTSSerializer, ESTree, JsonSafeString, LoneSurrogatesString,
PrettyJSSerializer, PrettyTSSerializer, SequenceSerializer, Serializer, StructSerializer,
};

use crate::ast::*;
use oxc_span::{GetSpan, Span};

/// Main serialization methods for `Program`.
///
Expand Down Expand Up @@ -53,7 +53,11 @@ impl Program<'_> {
}

/// Serialize AST to pretty-printed ESTree JSON, including TypeScript fields.
pub fn to_pretty_estree_ts_json(&self) -> String {
pub fn to_pretty_estree_ts_json(&mut self) -> String {
if let Some(first_stat) = self.body.first() {
self.span = Span::new(first_stat.span().start, self.span.end); // self.span.expand_left(10);
}

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