Skip to content

Commit 0fe13fe

Browse files
dyc3dyc3
authored
feat(parse/html): parse svelte shorthand props and spread props (#7872)
1 parent 7b2600b commit 0fe13fe

16 files changed

Lines changed: 444 additions & 3 deletions

File tree

‎.changeset/odd-lizards-build.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@biomejs/biome": patch
3+
---
4+
5+
Fixed [#7861](https://github.com/biomejs/biome/issues/7861): The HTML parser will now accept Svelte attribute shorthand syntax in `.svelte` files.

‎crates/biome_html_formatter/src/html/any/attribute.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ impl FormatRule<AnyHtmlAttribute> for FormatAnyHtmlAttribute {
1111
AnyHtmlAttribute::HtmlAttribute(node) => node.format().fmt(f),
1212
AnyHtmlAttribute::HtmlBogusAttribute(node) => node.format().fmt(f),
1313
AnyHtmlAttribute::HtmlDoubleTextExpression(node) => node.format().fmt(f),
14+
AnyHtmlAttribute::HtmlSingleTextExpression(node) => node.format().fmt(f),
1415
}
1516
}
1617
}

‎crates/biome_html_formatter/src/html/lists/attribute_list.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ impl FormatRule<HtmlAttributeList> for FormatHtmlAttributeList {
6363
AnyHtmlAttribute::HtmlDoubleTextExpression(attr) => {
6464
attr.format().fmt(f)
6565
}
66+
AnyHtmlAttribute::HtmlSingleTextExpression(attr) => {
67+
attr.format().fmt(f)
68+
}
6669
AnyHtmlAttribute::HtmlBogusAttribute(attr) => {
6770
attr.format().fmt(f)
6871
}

‎crates/biome_html_formatter/src/svelte/auxiliary/text_expression.rs‎

Whitespace-only changes.

‎crates/biome_html_parser/src/syntax/mod.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,13 @@ fn parse_attribute(p: &mut HtmlParser) -> ParsedSyntax {
312312
.ok();
313313

314314
Present(m.complete(p, HTML_ATTRIBUTE))
315+
} else if p.at(T!['{']) {
316+
m.abandon(p);
317+
HtmlSyntaxFeatures::SingleTextExpressions.parse_exclusive_syntax(
318+
p,
319+
|p| parse_single_text_expression(p, HtmlLexContext::InsideTag),
320+
|p: &HtmlParser<'_>, m: &CompletedMarker| disabled_svelte_prop(p, m.range(p)),
321+
)
315322
} else {
316323
parse_literal(p, HTML_ATTRIBUTE_NAME).or_add_diagnostic(p, expected_attribute);
317324
if p.at(T![=]) {
@@ -324,7 +331,7 @@ fn parse_attribute(p: &mut HtmlParser) -> ParsedSyntax {
324331
}
325332

326333
fn is_at_attribute_start(p: &mut HtmlParser) -> bool {
327-
p.at(HTML_LITERAL) || p.at(T!["{{"]) || p.at(T!['{'])
334+
p.at_ts(token_set![HTML_LITERAL, T!["{{"], T!['{']])
328335
}
329336

330337
fn parse_literal(p: &mut HtmlParser, kind: HtmlSyntaxKind) -> ParsedSyntax {

‎crates/biome_html_parser/src/syntax/parse_error.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ pub(crate) fn disabled_interpolation(p: &HtmlParser, range: TextRange) -> ParseD
1313
p.err_builder("Text expressions aren't supported.", range).with_hint(markup!("Remove it or enable the parsing using the "<Emphasis>"html.parser.interpolation"</Emphasis>" option."))
1414
}
1515

16+
pub(crate) fn disabled_svelte_prop(p: &HtmlParser, range: TextRange) -> ParseDiagnostic {
17+
p.err_builder("This looks like Svelte syntax, but this is not a Svelte file.", range).with_hint(markup!("Remove it or rename this file to have the "<Emphasis>".svelte"</Emphasis>" file extension."))
18+
}
19+
1620
pub(crate) fn expected_text_expression(
1721
p: &HtmlParser,
1822
curr_range: TextRange,

‎crates/biome_html_parser/tests/html_specs/error/interpolation-attributes.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<button {disabled}></button>

‎crates/biome_html_parser/tests/html_specs/error/interpolation-attributes.html.snap‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
---
2+
source: crates/biome_html_parser/tests/spec_test.rs
3+
expression: snapshot
4+
---
5+
## Input
6+
7+
```html
8+
<button {disabled}></button>
9+
10+
```
11+
12+
13+
## AST
14+
15+
```
16+
HtmlRoot {
17+
bom_token: missing (optional),
18+
frontmatter: missing (optional),
19+
directive: missing (optional),
20+
html: HtmlElementList [
21+
HtmlBogusElement {
22+
items: [
23+
HtmlBogus {
24+
items: [
25+
L_ANGLE@0..1 "<" [] [],
26+
HtmlTagName {
27+
value_token: HTML_LITERAL@1..8 "button" [] [Whitespace(" ")],
28+
},
29+
HtmlBogus {
30+
items: [
31+
HtmlBogusElement {
32+
items: [
33+
L_CURLY@8..9 "{" [] [],
34+
HTML_LITERAL@9..19 "disabled}>" [] [],
35+
],
36+
},
37+
],
38+
},
39+
],
40+
},
41+
HtmlElementList [],
42+
HtmlClosingElement {
43+
l_angle_token: L_ANGLE@19..20 "<" [] [],
44+
slash_token: SLASH@20..21 "/" [] [],
45+
name: HtmlTagName {
46+
value_token: HTML_LITERAL@21..27 "button" [] [],
47+
},
48+
r_angle_token: R_ANGLE@27..28 ">" [] [],
49+
},
50+
],
51+
},
52+
],
53+
eof_token: EOF@28..29 "" [Newline("\n")] [],
54+
}
55+
```
56+
57+
## CST
58+
59+
```
60+
0: [email protected]
61+
0: (empty)
62+
1: (empty)
63+
2: (empty)
64+
3: [email protected]
65+
0: [email protected]
66+
0: [email protected]
67+
0: [email protected] "<" [] []
68+
1: [email protected]
69+
0: [email protected] "button" [] [Whitespace(" ")]
70+
2: [email protected]
71+
0: [email protected]
72+
0: [email protected] "{" [] []
73+
1: HTML_LITERAL@9..19 "disabled}>" [] []
74+
1: HTML_ELEMENT_LIST@19..19
75+
2: HTML_CLOSING_ELEMENT@19..28
76+
0: L_ANGLE@19..20 "<" [] []
77+
1: SLASH@20..21 "/" [] []
78+
2: HTML_TAG_NAME@21..27
79+
0: HTML_LITERAL@21..27 "button" [] []
80+
3: R_ANGLE@27..28 ">" [] []
81+
4: EOF@28..29 "" [Newline("\n")] []
82+
83+
```
84+
85+
## Diagnostics
86+
87+
```
88+
interpolation-attributes.html:1:9 parse ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
89+
90+
× Expected an attribute but instead found '{disabled}>'.
91+
92+
> 1 │ <button {disabled}></button>
93+
│ ^^^^^^^^^^^
94+
2 │
95+
96+
i Expected an attribute here.
97+
98+
> 1 │ <button {disabled}></button>
99+
│ ^^^^^^^^^^^
100+
2 │
101+
102+
interpolation-attributes.html:1:20 parse ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
103+
104+
× Expected an attribute but instead found '<'.
105+
106+
> 1 │ <button {disabled}></button>
107+
│ ^
108+
2 │
109+
110+
i Expected an attribute here.
111+
112+
> 1 │ <button {disabled}></button>
113+
│ ^
114+
2 │
115+
116+
```

‎crates/biome_html_parser/tests/html_specs/ok/svelte/dynamic-prop.svelte‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<button disabled={false}>Click me</button>

‎crates/biome_html_parser/tests/html_specs/ok/svelte/dynamic-prop.svelte.snap‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
---
2+
source: crates/biome_html_parser/tests/spec_test.rs
3+
expression: snapshot
4+
---
5+
## Input
6+
7+
```svelte
8+
<button disabled={false}>Click me</button>
9+
10+
```
11+
12+
13+
## AST
14+
15+
```
16+
HtmlRoot {
17+
bom_token: missing (optional),
18+
frontmatter: missing (optional),
19+
directive: missing (optional),
20+
html: HtmlElementList [
21+
HtmlElement {
22+
opening_element: HtmlOpeningElement {
23+
l_angle_token: L_ANGLE@0..1 "<" [] [],
24+
name: HtmlTagName {
25+
value_token: HTML_LITERAL@1..8 "button" [] [Whitespace(" ")],
26+
},
27+
attributes: HtmlAttributeList [
28+
HtmlAttribute {
29+
name: HtmlAttributeName {
30+
value_token: HTML_LITERAL@8..16 "disabled" [] [],
31+
},
32+
initializer: HtmlAttributeInitializerClause {
33+
eq_token: EQ@16..17 "=" [] [],
34+
value: HtmlSingleTextExpression {
35+
l_curly_token: L_CURLY@17..18 "{" [] [],
36+
expression: HtmlTextExpression {
37+
html_literal_token: HTML_LITERAL@18..23 "false" [] [],
38+
},
39+
r_curly_token: R_CURLY@23..24 "}" [] [],
40+
},
41+
},
42+
},
43+
],
44+
r_angle_token: R_ANGLE@24..25 ">" [] [],
45+
},
46+
children: HtmlElementList [
47+
HtmlContent {
48+
value_token: HTML_LITERAL@25..33 "Click me" [] [],
49+
},
50+
],
51+
closing_element: HtmlClosingElement {
52+
l_angle_token: L_ANGLE@33..34 "<" [] [],
53+
slash_token: SLASH@34..35 "/" [] [],
54+
name: HtmlTagName {
55+
value_token: HTML_LITERAL@35..41 "button" [] [],
56+
},
57+
r_angle_token: R_ANGLE@41..42 ">" [] [],
58+
},
59+
},
60+
],
61+
eof_token: EOF@42..43 "" [Newline("\n")] [],
62+
}
63+
```
64+
65+
## CST
66+
67+
```
68+
0: [email protected]
69+
0: (empty)
70+
1: (empty)
71+
2: (empty)
72+
3: [email protected]
73+
0: [email protected]
74+
0: [email protected]
75+
0: [email protected] "<" [] []
76+
1: [email protected]
77+
0: [email protected] "button" [] [Whitespace(" ")]
78+
2: [email protected]
79+
0: [email protected]
80+
0: [email protected]
81+
0: [email protected] "disabled" [] []
82+
1: [email protected]
83+
0: [email protected] "=" [] []
84+
1: [email protected]
85+
0: [email protected] "{" [] []
86+
1: HTML_TEXT_EXPRESSION@18..23
87+
0: HTML_LITERAL@18..23 "false" [] []
88+
2: R_CURLY@23..24 "}" [] []
89+
3: R_ANGLE@24..25 ">" [] []
90+
1: HTML_ELEMENT_LIST@25..33
91+
0: HTML_CONTENT@25..33
92+
0: HTML_LITERAL@25..33 "Click me" [] []
93+
2: HTML_CLOSING_ELEMENT@33..42
94+
0: L_ANGLE@33..34 "<" [] []
95+
1: SLASH@34..35 "/" [] []
96+
2: HTML_TAG_NAME@35..41
97+
0: HTML_LITERAL@35..41 "button" [] []
98+
3: R_ANGLE@41..42 ">" [] []
99+
4: EOF@42..43 "" [Newline("\n")] []
100+
101+
```

0 commit comments

Comments
 (0)