Skip to content

fix: improve style parser whitespace handling #10077

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
merged 5 commits into from
Jan 4, 2024
Merged

fix: improve style parser whitespace handling #10077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a1e1ad
fix: improve style parser whitespace handling
navorite Jan 4, 2024
0729066
do we even need this?
navorite Jan 4, 2024
7c18385
prettier
navorite Jan 4, 2024
241c629
invert
navorite Jan 4, 2024
3f01290
allow comments, remove trim
navorite Jan 4, 2024
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
5 changes: 5 additions & 0 deletions .changeset/dry-eggs-retire.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: improve style parser whitespace handling
7 changes: 5 additions & 2 deletions packages/svelte/src/compiler/phases/1-parse/read/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const REGEX_COMBINATOR_WHITESPACE = /^\s*(\+|~|>|\|\|)\s*/;
const REGEX_COMBINATOR = /^(\+|~|>|\|\|)/;
const REGEX_PERCENTAGE = /^\d+(\.\d+)?%/;
const REGEX_NTH_OF =
/^\s*(even|odd|\+?(\d+|\d*n(\s*[+-]\s*\d+)?)|-\d*n(\s*\+\s*\d+))(\s*(?=[,)])|\s+of\s+)/;
/^(even|odd|\+?(\d+|\d*n(\s*[+-]\s*\d+)?)|-\d*n(\s*\+\s*\d+))((?=\s*[,)])|\s+of\s+)/;
const REGEX_WHITESPACE_OR_COLON = /[\s:]/;
const REGEX_BRACE_OR_SEMICOLON = /[{;]/;
const REGEX_LEADING_HYPHEN_OR_DIGIT = /-?\d/;
Expand Down Expand Up @@ -153,6 +153,8 @@ function read_selector_list(parser, inside_pseudo_class = false) {
/** @type {import('#compiler').Css.Selector[]} */
const children = [];

allow_comment_or_whitespace(parser);

const start = parser.index;

while (parser.index < parser.template.length) {
Expand Down Expand Up @@ -286,9 +288,10 @@ function read_selector(parser, inside_pseudo_class = false) {
});
} else if (inside_pseudo_class && parser.match_regex(REGEX_NTH_OF)) {
// nth of matcher must come before combinator matcher to prevent collision else the '+' in '+2n-1' would be parsed as a combinator

children.push({
type: 'Nth',
value: /** @type {string} */ (parser.read(REGEX_NTH_OF)),
value: /**@type {string} */ (parser.read(REGEX_NTH_OF)),
start,
end: parser.index
});
Expand Down
14 changes: 7 additions & 7 deletions packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,19 +495,19 @@
"name": "nth-child",
"args": {
"type": "SelectorList",
"start": 476,
"end": 491,
"start": 485,
"end": 486,
"children": [
{
"type": "Selector",
"start": 476,
"end": 491,
"start": 485,
"end": 486,
"children": [
{
"type": "Nth",
"value": "\n n\n ",
"start": 476,
"end": 491
"value": "n",
"start": 485,
"end": 486
}
]
}
Expand Down
6 changes: 6 additions & 0 deletions packages/svelte/tests/parser-modern/samples/css-pseudo-classes/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,10 @@
::slotted(.content) {
color: red;
}
:is( /*button*/
button, /*p after h1*/
h1 + p
){
color: red;
}
</style>
90 changes: 87 additions & 3 deletions packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"css": {
"type": "Style",
"start": 0,
"end": 313,
"end": 386,
"attributes": [],
"children": [
{
Expand Down Expand Up @@ -225,12 +225,96 @@
},
"start": 266,
"end": 304
},
{
"type": "Rule",
"prelude": {
"type": "SelectorList",
"start": 306,
"end": 359,
"children": [
{
"type": "Selector",
"start": 306,
"end": 359,
"children": [
{
"type": "PseudoClassSelector",
"name": "is",
"args": {
"type": "SelectorList",
"start": 324,
"end": 355,
"children": [
{
"type": "Selector",
"start": 324,
"end": 330,
"children": [
{
"type": "TypeSelector",
"name": "button",
"start": 324,
"end": 330
}
]
},
{
"type": "Selector",
"start": 349,
"end": 355,
"children": [
{
"type": "TypeSelector",
"name": "h1",
"start": 349,
"end": 351
},
{
"type": "Combinator",
"name": "+",
"start": 352,
"end": 353
},
{
"type": "TypeSelector",
"name": "p",
"start": 354,
"end": 355
}
]
}
]
},
"start": 306,
"end": 359
}
]
}
]
},
"block": {
"type": "Block",
"start": 359,
"end": 377,
"children": [
{
"type": "Declaration",
"start": 363,
"end": 373,
"property": "color",
"value": "red"
}
]
},
"start": 306,
"end": 377
}
],
"content": {
"start": 7,
"end": 305,
"styles": "\n /* test that all these are parsed correctly */\n\t::view-transition-old(x-y) {\n\t\tcolor: red;\n }\n\t:global(::view-transition-old(x-y)) {\n\t\tcolor: red;\n }\n\t::highlight(rainbow-color-1) {\n\t\tcolor: red;\n\t}\n\tcustom-element::part(foo) {\n\t\tcolor: red;\n\t}\n\t::slotted(.content) {\n\t\tcolor: red;\n\t}\n"
"end": 378,
"styles": "\n /* test that all these are parsed correctly */\n\t::view-transition-old(x-y) {\n\t\tcolor: red;\n }\n\t:global(::view-transition-old(x-y)) {\n\t\tcolor: red;\n }\n\t::highlight(rainbow-color-1) {\n\t\tcolor: red;\n\t}\n\tcustom-element::part(foo) {\n\t\tcolor: red;\n\t}\n\t::slotted(.content) {\n\t\tcolor: red;\n\t}\n\t:is( /*button*/\n\t\tbutton, /*p after h1*/\n\t\th1 + p\n\t\t){\n\t\tcolor: red;\n\t}\n"
}
},
"js": [],
Expand Down