Merge 96d9ded into 593bf37

csstree · Dec 15, 2022 · 9044035 · 9044035
2 parents 593bf37 + 96d9ded
commit 9044035
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 13 deletions.
diff --git a/fixtures/ast/selector/functional-pseudo/has.json b/fixtures/ast/selector/functional-pseudo/has.json
@@ -22,6 +22,22 @@
             ]
         }
     },
+    "no argument": {
+        "source": ":has",
+        "ast": {
+            "type": "PseudoClassSelector",
+            "name": "has",
+            "children": null
+        }
+    },
+    "empty argument": {
+        "source": ":has()",
+        "ast": {
+            "type": "PseudoClassSelector",
+            "name": "has",
+            "children": []
+        }
+    },
     "negation with selector group": {
         "source": ":has(.a,.b.c)",
         "ast": {

diff --git a/fixtures/ast/selector/functional-pseudo/host-context.json b/fixtures/ast/selector/functional-pseudo/host-context.json
@@ -17,6 +17,22 @@
             ]
         }
     },
+    "no argument": {
+        "source": ":host-context",
+        "ast": {
+            "type": "PseudoClassSelector",
+            "name": "host-context",
+            "children": null
+        }
+    },
+    "empty argument": {
+        "source": ":host-context()",
+        "ast": {
+            "type": "PseudoClassSelector",
+            "name": "host-context",
+            "children": []
+        }
+    },
     "spaces around selector": {
         "source": ":host-context(  .a.b  )",
         "generate": ":host-context(.a.b)",

diff --git a/fixtures/ast/selector/functional-pseudo/host.json b/fixtures/ast/selector/functional-pseudo/host.json
@@ -25,6 +25,14 @@
             "children": null
         }
     },
+    "empty argument": {
+        "source": ":host()",
+        "ast": {
+            "type": "PseudoClassSelector",
+            "name": "host",
+            "children": []
+        }
+    },
     "spaces around selector": {
         "source": ":host(  .a.b  )",
         "generate": ":host(.a.b)",
@@ -67,11 +75,6 @@
         }
     },
     "error": [
-        {
-            "source": ":host()",
-            "offset": "      ^",
-            "error": "Selector is expected"
-        },
         {
             "source": ":host(.a{)",
             "offset": "        ^",

diff --git a/fixtures/ast/selector/functional-pseudo/slotted.json b/fixtures/ast/selector/functional-pseudo/slotted.json
@@ -17,6 +17,22 @@
             ]
         }
     },
+    "no argument": {
+        "source": "::slotted",
+        "ast": {
+            "type": "PseudoElementSelector",
+            "name": "slotted",
+            "children": null
+        }
+    },
+    "empty argument": {
+        "source": "::slotted()",
+        "ast": {
+            "type": "PseudoElementSelector",
+            "name": "slotted",
+            "children": []
+        }
+    },
     "spaces around selector": {
         "source": "::slotted(  .a.b  )",
         "generate": "::slotted(.a.b)",

diff --git a/lib/__tests/parse.js b/lib/__tests/parse.js
@@ -60,13 +60,15 @@ describe('parse', () => {
                 });
             });
 
-            fixture.invalid.forEach(value =>
-                it(value, () =>
-                    assert.throws(
-                        () => parse(':nth-child(' + value + ')', { context: 'selector' })
+            fixture.invalid
+                .filter(value => value !== '')
+                .forEach(value =>
+                    it(value, () =>
+                        assert.throws(
+                            () => parse(':nth-child(' + value + ')', { context: 'selector' })
+                        )
                     )
-                )
-            );
+                );
         });
 
         describe('UnicodeRange', () => {

diff --git a/lib/syntax/node/PseudoClassSelector.js b/lib/syntax/node/PseudoClassSelector.js
@@ -26,7 +26,9 @@ export function parse() {
         name = this.consumeFunctionName();
         nameLowerCase = name.toLowerCase();
 
-        if (hasOwnProperty.call(this.pseudo, nameLowerCase)) {
+        if (this.lookupNonWSType(0) == RightParenthesis) {
+            children = this.createList();
+        } else if (hasOwnProperty.call(this.pseudo, nameLowerCase)) {
             this.skipSC();
             children = this.pseudo[nameLowerCase].call(this);
             this.skipSC();

diff --git a/lib/syntax/node/PseudoElementSelector.js b/lib/syntax/node/PseudoElementSelector.js
@@ -26,7 +26,9 @@ export function parse() {
         name = this.consumeFunctionName();
         nameLowerCase = name.toLowerCase();
 
-        if (hasOwnProperty.call(this.pseudo, nameLowerCase)) {
+        if (this.lookupNonWSType(0) == RightParenthesis) {
+            children = this.createList();
+        } else if (hasOwnProperty.call(this.pseudo, nameLowerCase)) {
             this.skipSC();
             children = this.pseudo[nameLowerCase].call(this);
             this.skipSC();