Skip to content
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

fix(regular_expression): Flatten Spans on regex AST nodes #6396

Merged
merged 1 commit into from
Oct 10, 2024
Merged

fix(regular_expression): Flatten Spans on regex AST nodes #6396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions crates/oxc_regular_expression/src/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use tsify::Tsify;
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct Pattern<'a> {
#[serde(flatten)]
pub span: Span,
pub body: Disjunction<'a>,
}
Expand All @@ -25,6 +26,7 @@ pub struct Pattern<'a> {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct Disjunction<'a> {
#[serde(flatten)]
pub span: Span,
pub body: Vec<'a, Alternative<'a>>,
}
Expand All @@ -35,6 +37,7 @@ pub struct Disjunction<'a> {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct Alternative<'a> {
#[serde(flatten)]
pub span: Span,
pub body: Vec<'a, Term<'a>>,
}
Expand Down Expand Up @@ -111,6 +114,7 @@ pub enum BoundaryAssertionKind {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct LookAroundAssertion<'a> {
#[serde(flatten)]
pub span: Span,
pub kind: LookAroundAssertionKind,
pub body: Disjunction<'a>,
Expand All @@ -134,6 +138,7 @@ pub enum LookAroundAssertionKind {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct Quantifier<'a> {
#[serde(flatten)]
pub span: Span,
pub min: u64,
/// `None` means no upper bound.
Expand All @@ -149,6 +154,7 @@ pub struct Quantifier<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct Character {
/// This will be invalid position when `UnicodeMode` is disabled and `value` is a surrogate pair.
#[serde(flatten)]
pub span: Span,
pub kind: CharacterKind,
/// Unicode code point or UTF-16 code unit.
Expand Down Expand Up @@ -180,6 +186,7 @@ pub enum CharacterKind {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct CharacterClassEscape {
#[serde(flatten)]
pub span: Span,
pub kind: CharacterClassEscapeKind,
}
Expand All @@ -204,6 +211,7 @@ pub enum CharacterClassEscapeKind {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct UnicodePropertyEscape<'a> {
#[serde(flatten)]
pub span: Span,
pub negative: bool,
/// `true` if `UnicodeSetsMode` and `name` matches unicode property of strings.
Expand All @@ -218,6 +226,7 @@ pub struct UnicodePropertyEscape<'a> {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct Dot {
#[serde(flatten)]
pub span: Span,
}

Expand All @@ -228,6 +237,7 @@ pub struct Dot {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct CharacterClass<'a> {
#[serde(flatten)]
pub span: Span,
pub negative: bool,
/// `true` if:
Expand Down Expand Up @@ -286,6 +296,7 @@ impl<'a> GetSpan for CharacterClassContents<'a> {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct CharacterClassRange {
#[serde(flatten)]
pub span: Span,
pub min: Character,
pub max: Character,
Expand All @@ -297,6 +308,7 @@ pub struct CharacterClassRange {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct ClassStringDisjunction<'a> {
#[serde(flatten)]
pub span: Span,
/// `true` if body is empty or contains [`ClassString`] which `strings` is `true`.
pub strings: bool,
Expand All @@ -309,6 +321,7 @@ pub struct ClassStringDisjunction<'a> {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct ClassString<'a> {
#[serde(flatten)]
pub span: Span,
/// `true` if body is empty or contain 2 more characters.
pub strings: bool,
Expand All @@ -322,6 +335,7 @@ pub struct ClassString<'a> {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct CapturingGroup<'a> {
#[serde(flatten)]
pub span: Span,
/// Group name to be referenced by [`NamedReference`].
pub name: Option<Atom<'a>>,
Expand All @@ -335,6 +349,7 @@ pub struct CapturingGroup<'a> {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct IgnoreGroup<'a> {
#[serde(flatten)]
pub span: Span,
pub enabling_modifiers: Option<ModifierFlags>,
pub disabling_modifiers: Option<ModifierFlags>,
Expand All @@ -360,6 +375,7 @@ pub struct ModifierFlags {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct IndexedReference {
#[serde(flatten)]
pub span: Span,
pub index: u32,
}
Expand All @@ -371,6 +387,7 @@ pub struct IndexedReference {
#[generate_derive(CloneIn, ContentEq, ContentHash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub struct NamedReference<'a> {
#[serde(flatten)]
pub span: Span,
pub name: Atom<'a>,
}
Expand Down