Skip to content

fix(grit): correct JSX element slot indices for GritQL patterns #8411

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
ematipico merged 1 commit into from
Dec 9, 2025
Merged

fix(grit): correct JSX element slot indices for GritQL patterns #8411

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions .changeset/fix-jsx-slot-indices.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
"@biomejs/biome": patch
---

Properly handle `name`, `type_arguments`, and `attributes` slots for `JsxOpeningElement` and `JsxSelfClosingElement` GritQL patterns.

The following biome search commands no longer throw errors:

```shell
biome search 'JsxOpeningElement(name = $elem_name) where { $elem_name <: "div" }'
biome search 'JsxSelfClosingElement(name = $elem_name) where { $elem_name <: "div" }'
```
4 changes: 2 additions & 2 deletions crates/biome_grit_patterns/src/grit_target_language/js_target_language/generated_mappings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@ pub const LEGACY_TREESITTER_COMPATIBILITY_PATTERNS: &[LegacyTreeSitterPattern] =
LegacyTreeSitterPattern {
name: "jsx_self_closing_element",
kind: JsSyntaxKind::JSX_SELF_CLOSING_ELEMENT,
slots: &[],
slots: &[("name", 1), ("type_arguments", 2), ("attributes", 3)],
},
LegacyTreeSitterPattern {
name: "jsx_opening_element",
kind: JsSyntaxKind::JSX_OPENING_ELEMENT,
slots: &[],
slots: &[("name", 1), ("type_arguments", 2), ("attributes", 3)],
},
LegacyTreeSitterPattern {
name: "jsx_closing_element",
Expand Down
3 changes: 0 additions & 3 deletions crates/biome_grit_patterns/tests/specs/tsx/jsx_attributes.grit
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions crates/biome_grit_patterns/tests/specs/tsx/jsx_attributes.snap
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion crates/biome_grit_patterns/tests/specs/tsx/jsx_attributes.tsx
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions crates/biome_grit_patterns/tests/specs/tsx/jsx_slots.grit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
or {
// Legacy patterns
jsx_opening_element(name = "div"),
jsx_self_closing_element(name = "span"),
jsx_self_closing_element(type_arguments = TsTypeArguments()),
jsx_attribute(name = "className"),

// Native patterns
JsxOpeningElement(name = "div"),
JsxSelfClosingElement(name = "button"),
JsxSelfClosingElement(type_arguments = TsTypeArguments()),
JsxAttribute(name = "id"),
JsxAttribute($name, $value) as $attr where {
$name <: "style"
},
}
20 changes: 20 additions & 0 deletions crates/biome_grit_patterns/tests/specs/tsx/jsx_slots.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
source: crates/biome_grit_patterns/tests/spec_tests.rs
assertion_line: 94
expression: jsx_slots
---
SnapshotResult {
messages: [],
matched_ranges: [
"1:1-1:28",
"1:6-1:27",
"2:3-2:11",
"3:3-3:22",
"3:11-3:19",
"5:3-5:24",
"6:3-6:19",
"6:8-6:18",
],
rewritten_files: [],
created_files: [],
}
7 changes: 7 additions & 0 deletions crates/biome_grit_patterns/tests/specs/tsx/jsx_slots.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div className="container">
<span />
<button id="btn" />
<input disabled />
<Component<string> />
<div style={{}}>{children}</div>
</div>
4 changes: 2 additions & 2 deletions xtask/codegen/src/generate_grit_mappings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,12 @@ const JS_TREESITTER_PATTERNS: &[TreeSitterPattern] = &[
TreeSitterPattern {
name: "jsx_self_closing_element",
biome_kind: "JSX_SELF_CLOSING_ELEMENT",
slots: &[],
slots: &[("name", 1), ("type_arguments", 2), ("attributes", 3)],
},
TreeSitterPattern {
name: "jsx_opening_element",
biome_kind: "JSX_OPENING_ELEMENT",
slots: &[],
slots: &[("name", 1), ("type_arguments", 2), ("attributes", 3)],
},
TreeSitterPattern {
name: "jsx_closing_element",
Expand Down
Loading