:has() pseudo selector support added

Author: rbri

src/main/java/org/htmlunit/cssparser/parser/condition/Condition.java

@@ -54,6 +54,9 @@ enum ConditionType {
         /** IS_PSEUDO_CLASS_CONDITION. */
         IS_PSEUDO_CLASS_CONDITION,
 
+        /** HAS_PSEUDO_CLASS_CONDITION. */
+        HAS_PSEUDO_CLASS_CONDITION,
+
         /** NOT_PSEUDO_CLASS_CONDITION. */
         NOT_PSEUDO_CLASS_CONDITION,
 

src/main/java/org/htmlunit/cssparser/parser/condition/HasPseudoClassCondition.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2019-2024 Ronald Brill.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.htmlunit.cssparser.parser.condition;
+
+import java.io.Serializable;
+
+import org.htmlunit.cssparser.parser.AbstractLocatable;
+import org.htmlunit.cssparser.parser.Locator;
+import org.htmlunit.cssparser.parser.selector.SelectorList;
+
+/**
+ * Not condition.
+ *
+ * @author Ronald Brill
+ */
+public class HasPseudoClassCondition extends AbstractLocatable implements Condition, Serializable {
+
+    private final SelectorList selectors_;
+    private final boolean doubleColon_;
+
+    /**
+     * Ctor.
+     * @param selectors the selector list
+     * @param locator the locator
+     * @param doubleColon true if was prefixed by double colon
+     */
+    public HasPseudoClassCondition(final SelectorList selectors, final Locator locator, final boolean doubleColon) {
+        selectors_ = selectors;
+        setLocator(locator);
+        doubleColon_ = doubleColon;
+    }
+
+    @Override
+    public ConditionType getConditionType() {
+        return ConditionType.HAS_PSEUDO_CLASS_CONDITION;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getLocalName() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getValue() {
+        return selectors_.toString();
+    }
+
+    /**
+     * @return the list of selectors
+     */
+    public SelectorList getSelectors() {
+        return selectors_;
+    }
+
+    @Override
+    public String toString() {
+        return (doubleColon_ ? "::" : ":") + "has(" + getValue() + ")";
+    }
+}

src/main/java/org/htmlunit/cssparser/parser/selector/RelativeSelector.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2019-2024 Ronald Brill.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.htmlunit.cssparser.parser.selector;
+
+/**
+ * @author Ronald Brill
+ */
+public class RelativeSelector extends AbstractSelector {
+
+    private final char combinator_;
+    private final Selector selector_;
+
+    /**
+     * Ctor.
+     * @param combinator the combinator to use
+     * @param selector the selector
+     */
+    public RelativeSelector(final char combinator, final Selector selector) {
+        combinator_ = combinator;
+        selector_ = selector;
+    }
+
+    /**
+     * @return the containing selector
+     */
+    public Selector getSelector() {
+        return selector_;
+    }
+
+    @Override
+    public SelectorType getSelectorType() {
+        return SelectorType.RELATIVE_SELECTOR;
+    }
+
+    @Override
+    public SimpleSelector getSimpleSelector() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        return combinator_ + " " + selector_.toString();
+    }
+}

src/main/java/org/htmlunit/cssparser/parser/selector/Selector.java

@@ -27,16 +27,24 @@ public interface Selector extends Locatable {
     enum SelectorType {
         /** CHILD_SELECTOR. */
         CHILD_SELECTOR,
+
         /** DESCENDANT_SELECTOR. */
         DESCENDANT_SELECTOR,
+
         /** DIRECT_ADJACENT_SELECTOR. */
         DIRECT_ADJACENT_SELECTOR,
+
         /** ELEMENT_NODE_SELECTOR. */
         ELEMENT_NODE_SELECTOR,
+
         /** GENERAL_ADJACENT_SELECTOR. */
         GENERAL_ADJACENT_SELECTOR,
+
         /** PSEUDO_ELEMENT_SELECTOR. */
-        PSEUDO_ELEMENT_SELECTOR
+        PSEUDO_ELEMENT_SELECTOR,
+
+        /** RELATIVE_SELECTOR. */
+        RELATIVE_SELECTOR
     }
 
     /**

src/main/java/org/htmlunit/cssparser/parser/selector/SelectorSpecificity.java

@@ -17,6 +17,7 @@
 import java.io.Serializable;
 
 import org.htmlunit.cssparser.parser.condition.Condition;
+import org.htmlunit.cssparser.parser.condition.HasPseudoClassCondition;
 import org.htmlunit.cssparser.parser.condition.IsPseudoClassCondition;
 import org.htmlunit.cssparser.parser.condition.NotPseudoClassCondition;
 
@@ -144,6 +145,13 @@ private void readSelectorSpecificity(final Condition condition) {
                     readSelectorSpecificity(selector);
                 }
                 return;
+            case HAS_PSEUDO_CLASS_CONDITION:
+                final HasPseudoClassCondition hasPseudoCondition = (HasPseudoClassCondition) condition;
+                final SelectorList hasSelectorList = hasPseudoCondition.getSelectors();
+                for (final Selector selector : hasSelectorList) {
+                    readSelectorSpecificity(selector);
+                }
+                return;
             case PSEUDO_CLASS_CONDITION:
                 classCount_++;
                 return;

src/main/javacc/CSS3Parser.jj

@@ -48,6 +48,7 @@ import org.htmlunit.cssparser.parser.condition.ClassCondition;
 import org.htmlunit.cssparser.parser.condition.Condition;
 import org.htmlunit.cssparser.parser.condition.IdCondition;
 import org.htmlunit.cssparser.parser.condition.LangCondition;
+import org.htmlunit.cssparser.parser.condition.HasPseudoClassCondition;
 import org.htmlunit.cssparser.parser.condition.IsPseudoClassCondition;
 import org.htmlunit.cssparser.parser.condition.NotPseudoClassCondition;
 import org.htmlunit.cssparser.parser.condition.OneOfAttributeCondition;
@@ -63,6 +64,7 @@ import org.htmlunit.cssparser.parser.selector.DirectAdjacentSelector;
 import org.htmlunit.cssparser.parser.selector.ElementSelector;
 import org.htmlunit.cssparser.parser.selector.GeneralAdjacentSelector;
 import org.htmlunit.cssparser.parser.selector.PseudoElementSelector;
+import org.htmlunit.cssparser.parser.selector.RelativeSelector;
 import org.htmlunit.cssparser.parser.selector.Selector;
 import org.htmlunit.cssparser.parser.selector.SelectorList;
 import org.htmlunit.cssparser.parser.selector.SelectorListImpl;
@@ -427,6 +429,7 @@ TOKEN_MGR_DECLS :
 | < FUNCTION_LCH: ("ok")? "lch" <LROUND> >
 
 | < FUNCTION_IS: "is" <LROUND> >
+| < FUNCTION_HAS: "has" <LROUND> >
 
 | < CUSTOM_PROPERTY_NAME: < MINUS > <MINUS > <NMSTART> ( <NMCHAR> )* >
 
@@ -1006,6 +1009,19 @@ char combinator() :
   { return c; }
 }
 
+char combinatorWithoutWhitespace() :
+{
+  char c = ' ';
+}
+{
+  (
+    <PLUS> { c='+'; } ( <S> )*
+    | <GREATER> { c='>'; } ( <S> )*
+    | <TILDE> { c='~'; } ( <S> )*
+  )
+  { return c; }
+}
+
 //
 // unary_operator
 //  : '-' | PLUS
@@ -1093,6 +1109,27 @@ SelectorList selectorList() :
     }
 }
 
+SelectorList relativeSelectorList() :
+{
+    SelectorListImpl selList = new SelectorListImpl();
+    Selector sel;
+    char comb;
+}
+{
+    comb = combinatorWithoutWhitespace()
+    sel = selector() { selList.setLocator(sel.getLocator()); }
+    (   <COMMA> ( <S> )*
+        { selList.add(new RelativeSelector(comb, sel)); }
+
+        comb = combinatorWithoutWhitespace()
+        sel = selector() { selList.setLocator(sel.getLocator()); }
+    )*
+    {
+        selList.add(new RelativeSelector(comb, sel));
+        return selList;
+    }
+}
+
 //
 // selector
 //   : simple_selector_sequence [ combinator simple_selector_sequence ]*
@@ -1367,6 +1404,7 @@ Object pseudo(boolean pseudoElementFound) :
     String function;
     boolean doubleColon = false;
     SelectorList selectorList;
+    SelectorList relativeSelectorList;
     Locator locator;
 }
 {
@@ -1412,6 +1450,17 @@ Object pseudo(boolean pseudoElementFound) :
                 }
             )
             |
+            (
+                t = <FUNCTION_HAS> { function = unescape(t.image, false); }
+                ( <S> )*
+                relativeSelectorList = relativeSelectorList()
+                <RROUND>
+                {
+                    if (pseudoElementFound) { throw toCSSParseException("duplicatePseudo", new String[] { function + relativeSelectorList + ")" }, locator); }
+                    return new HasPseudoClassCondition(relativeSelectorList, locator, doubleColon);
+                }
+            )
+            |
             (
                 t = <FUNCTION_LANG> { function = unescape(t.image, false); }
                 ( <S> )*

src/test/java/org/htmlunit/cssparser/parser/CSS3ParserHasSelectorTest.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2019-2024 Ronald Brill.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.htmlunit.cssparser.parser;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.htmlunit.cssparser.parser.condition.Condition;
+import org.htmlunit.cssparser.parser.condition.Condition.ConditionType;
+import org.htmlunit.cssparser.parser.condition.HasPseudoClassCondition;
+import org.htmlunit.cssparser.parser.selector.ChildSelector;
+import org.htmlunit.cssparser.parser.selector.ElementSelector;
+import org.htmlunit.cssparser.parser.selector.RelativeSelector;
+import org.htmlunit.cssparser.parser.selector.Selector;
+import org.htmlunit.cssparser.parser.selector.Selector.SelectorType;
+import org.htmlunit.cssparser.parser.selector.SelectorList;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Ronald Brill
+ */
+public class CSS3ParserHasSelectorTest extends AbstractCSSParserTest {
+
+    /**
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void hasPlus() throws Exception {
+        // element name
+        final SelectorList selectors = createSelectors(":has(+ div#topic > #reference)");
+        assertEquals("*:has(+ div#topic > *#reference)", selectors.get(0).toString());
+
+        assertEquals(1, selectors.size());
+        final Selector selector = selectors.get(0);
+
+        assertEquals(SelectorType.ELEMENT_NODE_SELECTOR, selector.getSelectorType());
+
+        final ElementSelector elemSel = (ElementSelector) selector;
+        assertEquals(1, elemSel.getConditions().size());
+
+        final Condition condition = elemSel.getConditions().get(0);
+        assertEquals(ConditionType.HAS_PSEUDO_CLASS_CONDITION, condition.getConditionType());
+
+        final HasPseudoClassCondition pseudo = (HasPseudoClassCondition) condition;
+        assertEquals("+ div#topic > *#reference", pseudo.getValue());
+        assertEquals(":has(+ div#topic > *#reference)", pseudo.toString());
+
+        final SelectorList conditionSelectors = pseudo.getSelectors();
+        assertEquals(1, conditionSelectors.size());
+        final Selector conditionSelector = conditionSelectors.get(0);
+        final RelativeSelector conditionRelativeSelector = (RelativeSelector) conditionSelector;
+
+        final ChildSelector conditionChildSelector = (ChildSelector) conditionRelativeSelector.getSelector();
+        assertEquals("div#topic > *#reference", conditionChildSelector.toString());
+    }
+}

src/test/java/org/htmlunit/cssparser/parser/CSS3ParserRealWorldTest.java

@@ -407,8 +407,8 @@ public void bulma_1_0_2() throws Exception {
                 + "screen and (min-width: 1408px);"
                 + "screen and (min-width: 769px);"
                 + "screen and (min-width: 769px) and (max-width: 1023px);";
-        realWorld("realworld/bulma_1_0_2.css", 3036, 7226, media, 13, 13);
-        realWorld("realworld/bulma_1_0_2.min.css", 3011, 7180, media, 13, 13);
+        realWorld("realworld/bulma_1_0_2.css", 3038, 7228, media, 11, 11);
+        realWorld("realworld/bulma_1_0_2.min.css", 3013, 7182, media, 11, 11);
     }
 
     /**

src/test/java/org/htmlunit/cssparser/parser/CSS3ParserTest.java

@@ -3289,7 +3289,7 @@ public void pseudoElementsErrors() throws Exception {
         checkErrorSelector("input:before:",
                 "Error in pseudo class or element. (Invalid token \"<EOF>\". "
                 + "Was expecting one of: \"and\", \"only\", \"inherit\", \"none\", \"from\", <IDENT>, "
-                + "\":\", <FUNCTION_NOT>, <FUNCTION_LANG>, <FUNCTION_IS>, <FUNCTION>.)");
+                + "\":\", <FUNCTION_NOT>, <FUNCTION_LANG>, <FUNCTION_IS>, <FUNCTION_HAS>, <FUNCTION>.)");
 
         // pseudo element not at end
         checkErrorSelector("input:before:not(#test)",