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

only check selector that are direct children of :global #6435

Merged
merged 10 commits into from
Jun 29, 2021
Merged

only check selector that are direct children of :global #6435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
57ea279
failing test for i6434
ignatiusmb Jun 23, 2021
611a515
use string match to simplify regexp
ignatiusmb Jun 23, 2021
39056ab
more tests
ignatiusmb Jun 23, 2021
286fb98
separate test suite
ignatiusmb Jun 28, 2021
3313e48
test for commas inside attributes
ignatiusmb Jun 28, 2021
ae5aac3
stricter regex pattern
ignatiusmb Jun 28, 2021
4e0ea72
test escaped brackets and parentheses
ignatiusmb Jun 29, 2021
0e3a348
change latest test selector to lists
ignatiusmb Jun 29, 2021
60c820d
correct failing test for escaped parentheses
ignatiusmb Jun 29, 2021
2588a08
update with proposed pattern
ignatiusmb Jun 29, 2021
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
2 changes: 1 addition & 1 deletion src/compiler/compile/css/Selector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export default class Selector {
for (const block of this.blocks) {
for (const selector of block.selectors) {
if (selector.type === 'PseudoClassSelector' && selector.name === 'global') {
if (/[^\\],/.test(selector.children[0].value)) {
if (/[^\\],(?!([^([]+[^\\]|[^([\\])[)\]])/.test(selector.children[0].value)) {
component.error(selector, {
code: 'css-invalid-global-selector',
message: ':global(...) must contain a single selector'
Expand Down
17 changes: 17 additions & 0 deletions test/validator/samples/css-invalid-global-selector-2/errors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"code": "css-invalid-global-selector",
"message": ":global(...) must contain a single selector",
"start": {
"line": 11,
"column": 5,
"character": 156
},
"end": {
"line": 11,
"column": 29,
"character": 180
},
"pos": 156
}
]
18 changes: 18 additions & 0 deletions test/validator/samples/css-invalid-global-selector-2/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<style>
div :global(:is(h1, h2)) {
color: red;
}
div :global(:where(h1, h2)) {
color: red;
}
div :global(h1 ~ :is(h2, h3)) {
color: red;
}
div :global(:is(h1, h2), h3) {
color: red;
}
</style>

<div>
<h1>hello world</h1>
</div>
17 changes: 17 additions & 0 deletions test/validator/samples/css-invalid-global-selector-3/errors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"code": "css-invalid-global-selector",
"message": ":global(...) must contain a single selector",
"start": {
"line": 5,
"column": 5,
"character": 77
},
"end": {
"line": 5,
"column": 44,
"character": 116
},
"pos": 77
}
]
12 changes: 12 additions & 0 deletions test/validator/samples/css-invalid-global-selector-3/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<style>
div :global(h1[data-title="Hello, world!"]) {
color: red;
}
div :global(h1[attribute], video[autoplay]) {
color: red;
}
</style>

<div>
<h1>hello world</h1>
</div>
17 changes: 17 additions & 0 deletions test/validator/samples/css-invalid-global-selector-4/errors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"code": "css-invalid-global-selector",
"message": ":global(...) must contain a single selector",
"start": {
"line": 2,
"column": 5,
"character": 13
},
"end": {
"line": 2,
"column": 24,
"character": 32
},
"pos": 13
}
]
9 changes: 9 additions & 0 deletions test/validator/samples/css-invalid-global-selector-4/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<style>
div :global(h1, .abc\)) {
color: red;
}
</style>

<div>
<h1>hello world</h1>
</div>