foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-21 04:52:26 -05:00
Code Issues Packages 1 Wiki Activity

fix: descendant selector

Browse source
This commit is contained in:
Marvin Hagemeister 2024-12-17 23:41:24 +01:00
parent 6e70ba2c77
commit ef3447b5a6
3 changed files with 51 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cli/js/40_lint_selector.js
View file

@ -447,16 +447,15 @@ export function parseSelector(input, toElem, toAttr) {
});
lex.next();
// Descendant selector
if (lex.token === Token.Space) {
lex.next();
continue;
} else if (lex.token === Token.Space) {
lex.next();
if (lex.token === Token.Word) {
current.push({
type: RELATION_NODE,
op: BinOp.Space,
});
}
if (lex.token === Token.Word) {
current.push({
type: RELATION_NODE,
op: BinOp.Space,
});
}
continue;
@ -632,8 +631,14 @@ export function parseSelector(input, toElem, toAttr) {
throw new Error(`Multiple selector arguments not supported here`);
}
lex.next();
if (lex.token === Token.Space) {
lex.next();
}
popSelector(result, stack);
stack.push([]);
continue;
} else if (lex.token === Token.BraceClose) {
throwOnComma = false;
popSelector(result, stack);

30
cli/js/40_lint_selector_parser_test.ts
View file

@ -435,7 +435,7 @@ Deno.test("Parser - Pseudo nth-child", () => {
{
type: PSEUDO_NTH_CHILD,
of: null,
backwards: false,
op: null,
step: 0,
stepOffset: 1,
repeat: false,
@ -445,7 +445,7 @@ Deno.test("Parser - Pseudo nth-child", () => {
{
type: PSEUDO_NTH_CHILD,
of: null,
backwards: false,
op: null,
step: 2,
stepOffset: 0,
repeat: true,
@ -455,8 +455,8 @@ Deno.test("Parser - Pseudo nth-child", () => {
{
type: PSEUDO_NTH_CHILD,
of: null,
backwards: true,
step: 2,
op: null,
step: -2,
stepOffset: 0,
repeat: true,
},
@ -465,7 +465,7 @@ Deno.test("Parser - Pseudo nth-child", () => {
{
type: PSEUDO_NTH_CHILD,
of: null,
backwards: false,
op: "+",
step: 2,
stepOffset: 1,
repeat: true,
@ -479,7 +479,7 @@ Deno.test("Parser - Pseudo nth-child", () => {
{ type: ELEM_NODE, elem: 1, wildcard: false },
{ type: ATTR_EXISTS_NODE, prop: [4] },
],
backwards: false,
op: "+",
step: 2,
stepOffset: 1,
repeat: true,
@ -489,7 +489,6 @@ Deno.test("Parser - Pseudo nth-child", () => {
// Invalid selectors
expect(() => testParse(":nth-child(2n + 1 of Foo[attr], Bar)"))
.toThrow();
expect(() => testParse(":nth-child(2n - 1)")).toThrow();
expect(() => testParse(":nth-child(2n - 1 foo)")).toThrow();
});
@ -574,3 +573,20 @@ Deno.test("Parser - Pseudo not", () => {
},
]]);
});
Deno.test("Parser - mixed", () => {
expect(testParse("Foo[foo=true] Bar")).toEqual([[
{
type: ELEM_NODE,
elem: 1,
wildcard: false,
},
{ type: ATTR_BIN_NODE, op: BinOp.Equal, prop: [1], value: true },
{ type: RELATION_NODE, op: BinOp.Space },
{
type: ELEM_NODE,
elem: 2,
wildcard: false,
},
]]);
});

14
cli/js/40_lint_selector_test.ts
View file

@ -480,3 +480,17 @@ Deno.test("splitSelectors", () => {
"foobar",
]);
});
Deno.test("mixed", () => {
const ast: TestNode = {
type: "Foo",
attr: true,
children: [
{ type: "Foo", msg: "a" },
{ type: "Foo", msg: "b" },
{ type: "Foo", msg: "c" },
{ type: "Foo", msg: "d" },
],
};
expect(testSelector(ast, "Foo[attr=true] Foo")).toEqual(ast.children![0]);
});