support for :has() and relative selectors

org/w3c/css/parser/CssSelectors.java

@@ -58,7 +58,7 @@ public final class CssSelectors extends SelectorsList
     /**
      * The next context.
      */
-    protected CssSelectors next;
+    protected CssSelectors next = null;
 
     // true if the element is a block-level element
     private boolean isBlock;

org/w3c/css/parser/analyzer/CssParser.jj

@@ -1981,6 +1981,27 @@ ArrayList<CssSelectors> selector_list() :
 	}		
 }
 
+ArrayList<CssSelectors> relative_selector_list() :
+{
+        CssSelectors selector;
+        ArrayList<CssSelectors> context_set = new ArrayList<CssSelectors>();
+}
+{
+        selector=relative_selector() {
+                if (selector != null) {
+                        context_set.add(selector);
+                }
+        }
+        ( <COMMA> selector=relative_selector() {
+                if (selector != null) {
+                        context_set.add(selector);
+                }
+        } )*
+        {
+                return context_set;
+        }
+}
+
 /**
  * @exception ParseException exception during the parse
  */
@@ -2136,6 +2157,38 @@ ArrayList<CssProperty> attributeDeclarations() :
     }
 }
 
+CssSelectors relative_selector() :
+{
+	String comb;
+	CssSelectors current;
+} 
+{
+	comb=combinator() {
+		current = new CssSelectors(ac);
+		               switch(comb) {
+                        case "+":
+                                current.addNextSiblingCombinator();
+                                break;
+                        case ">":
+                                current.addChildCombinator();
+                                break;
+                        case "~":
+                                current.addSubsequentSiblingCombinator();
+                                break;
+                        case "||":
+                                current.addColumnCombinator();
+                                break;
+                        default:
+                                current.addDescendantCombinator();
+                }                  
+	}
+	// FIXME should be complex_selector
+	current=simple_selector(current)
+	{
+		return current;
+	}
+
+}
 /**
  * @exception ParseException exception during the parse
  */
@@ -2619,7 +2672,7 @@ String error_str = null;
                                                 getBeginColumn(), getEndLine(), getEndColumn(), e));
                 }
 	    }
-	    | ( n=<FUNCTIONHAS> ( <S> )* selector_list=selector_list() /* FIXME should be relative list */ ) {
+	    | ( n=<FUNCTIONHAS> selector_list=relative_selector_list() ) {
 		try {
                         s.setPseudoFun(ac, convertStringIndex(n.image, 0, n.image.length() -1, false).toLowerCase(), selector_list);
                 } catch(InvalidParamException e) {

org/w3c/css/selectors/PseudoFactory.java

@@ -5,6 +5,7 @@
 package org.w3c.css.selectors;
 
 import org.w3c.css.parser.CssSelectors;
+import org.w3c.css.selectors.pseudofunctions.PseudoFunctionHas;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionIs;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionLang;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionNot;
@@ -246,6 +247,9 @@ public static PseudoFunctionSelector newPseudoFunction(String name,
         if (name.equals("where")) {
             return new PseudoFunctionWhere(name, value);
         }
+        if (name.equals("has")) {
+            return new PseudoFunctionHas(name, value);
+        }
         throw new InvalidParamException("pseudo",
                 ":" + name, ac);
     }

org/w3c/css/selectors/pseudofunctions/PseudoFunctionHas.java

@@ -0,0 +1,27 @@
+//
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2021.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.selectors.pseudofunctions;
+
+import org.w3c.css.parser.CssSelectors;
+import org.w3c.css.selectors.PseudoFunctionSelector;
+
+import java.util.ArrayList;
+
+/**
+ * PseudoFunctionHas
+ */
+public class PseudoFunctionHas extends PseudoFunctionSelector {
+
+    public PseudoFunctionHas(String name, String value) {
+        setName(name);
+        setParam(value);
+    }
+
+    public PseudoFunctionHas(String name, ArrayList<CssSelectors> selector_list) {
+        this(name, CssSelectors.toArrayString(selector_list));
+    }
+
+}