added ::slotted() :host() and :host-context() per css-scoping-1

ylafon · ylafon · commit 57732b779d29 · 2021-10-01T15:27:17.000+02:00
Fixed the improper assumption that :: was only followed by ident
diff --git a/org/w3c/css/parser/analyzer/CssParser.jj b/org/w3c/css/parser/analyzer/CssParser.jj
@@ -763,18 +763,21 @@ TOKEN [IGNORE_CASE] :
 <DEFAULT>
 TOKEN [IGNORE_CASE] :
 {
-    < FUNCTIONLANG   : "lang("  >
-    | <FUNCTIONDIR   : "dir("   >
-    | <FUNCTIONIS    : "is("    >
-    | <FUNCTIONWHERE : "where(" >
-    | <FUNCTIONHAS   : "has("   >
-    | <FUNCTIONNOT   : "not("  >
-    | <FUNCTIONCALC  : "calc(" | "-moz-calc(" | "-webkit-calc(" >
-    | <FUNCTIONMIN   : "min("   >
-    | <FUNCTIONMAX   : "max("   >
-    | <FUNCTIONCLAMP : "clamp(" >
-    | <FUNCTIONATTR  : "attr("  >
-    | <FUNCTIONVAR   : "var(" >
+    < FUNCTIONLANG         : "lang("         >
+    | <FUNCTIONDIR         : "dir("          >
+    | <FUNCTIONIS          : "is("           >
+    | <FUNCTIONWHERE       : "where("        >
+    | <FUNCTIONHAS         : "has("          >
+    | <FUNCTIONSLOTTED     : "slotted("      >
+    | <FUNCTIONHOST        : "host("         >
+    | <FUNCTIONHOSTCONTEXT : "host-context(" >
+    | <FUNCTIONNOT         : "not("          >
+    | <FUNCTIONCALC        : "calc(" | "-moz-calc(" | "-webkit-calc(" >
+    | <FUNCTIONMIN         : "min("          >
+    | <FUNCTIONMAX         : "max("          >
+    | <FUNCTIONCLAMP       : "clamp("        >
+    | <FUNCTIONATTR        : "attr("         >
+    | <FUNCTIONVAR         : "var("          >
 }
 
 <DEFAULT>
@@ -2623,9 +2626,10 @@ void attribute_selector(CssSelectors s) :
 void pseudo_element_selector(CssSelectors s) :
 {
 	Token n;
+	CssSelectors sel = null;
 }
 {
-	<PSEUDOELEMENT_SYM> ( n=ident() ) {
+	<PSEUDOELEMENT_SYM> ( ( n=ident() {
 		try {
 		// should be >CSS3
 			if (ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0) {
@@ -2640,6 +2644,19 @@ void pseudo_element_selector(CssSelectors s) :
 			throw new ParseException(e.getMessage());
 		}
 	}
+	)
+	| ( ( n=<FUNCTIONSLOTTED> ) ( <S> )* sel=compound_selector(null) <RPAREN> ) {
+		try {
+			ArrayList<CssSelectors> list = new ArrayList<CssSelectors>();
+			list.add(sel);
+			s.setPseudoFun(ac, convertStringIndex(n.image, 0, n.image.length() -1, false).toLowerCase(), list);
+		} catch(InvalidParamException e) {
+			removeThisRule();
+			ac.getFrame().addError(new CssError(getSourceFile(), getBeginLine(),
+						getBeginColumn(), getEndLine(), getEndColumn(), e));
+		}
+	}
+	)
 }
 
 void pseudo(CssSelectors s) :
@@ -2656,6 +2673,7 @@ void pseudo_class_selector(CssSelectors s) :
 Token language = null;
 CssExpression param = null;
 ArrayList<CssSelectors> selector_list = null;
+CssSelectors sel = null;
 String error_str = null;
 }
 {
@@ -2714,6 +2732,17 @@ String error_str = null;
                                                 getBeginColumn(), getEndLine(), getEndColumn(), e));
                 }
 	    }
+	    | ( ( n=<FUNCTIONHOST> | n=<FUNCTIONHOSTCONTEXT> ) ( <S> )* sel=compound_selector(null) ) {
+		try {
+			ArrayList<CssSelectors> list = new ArrayList<CssSelectors>();
+			list.add(sel);
+			s.setPseudoFun(ac, convertStringIndex(n.image, 0, n.image.length() -1, false).toLowerCase(), list);
+		} catch(InvalidParamException e) {
+			removeThisRule();
+			ac.getFrame().addError(new CssError(getSourceFile(), getBeginLine(),
+						getBeginColumn(), getEndLine(), getEndColumn(), e));
+		}
+	    }
 	    | ( n=<FUNCTION> ( <S> )* param=expression() ) {
 		try {
 		    s.setPseudoFun(ac, convertStringIndex(n.image, 0, n.image.length() -1, false).toLowerCase(),
@@ -3764,6 +3793,9 @@ String skip_to_matching_paren() {
 	    case FUNCTIONIS:
 	    case FUNCTIONWHERE:
 	    case FUNCTIONHAS:
+	    case FUNCTIONHOST:
+	    case FUNCTIONHOSTCONTEXT:
+	    case FUNCTIONSLOTTED:
             case FUNCTIONNOT:
             case FUNCTIONCALC:
             case FUNCTIONMIN:
diff --git a/org/w3c/css/selectors/PseudoFactory.java b/org/w3c/css/selectors/PseudoFactory.java
@@ -6,13 +6,16 @@
 
 import org.w3c.css.parser.CssSelectors;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionHas;
+import org.w3c.css.selectors.pseudofunctions.PseudoFunctionHost;
+import org.w3c.css.selectors.pseudofunctions.PseudoFunctionHostContext;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionIs;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionLang;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionNot;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionNthChild;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionNthLastChild;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionNthLastOfType;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionNthOfType;
+import org.w3c.css.selectors.pseudofunctions.PseudoFunctionSlotted;
 import org.w3c.css.selectors.pseudofunctions.PseudoFunctionWhere;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.CssProfile;
@@ -83,7 +86,9 @@ public class PseudoFactory {
             // https://fullscreen.spec.whatwg.org/#::backdrop-pseudo-element
             "backdrop",
             // https://www.w3.org/TR/2019/CR-webvtt1-20190404/#css-extensions
-            "cue", "cue-region"
+            "cue", "cue-region",
+            // https://www.w3.org/TR/2014/WD-css-scoping-1-20140403/ (20211001 draft)
+            "content", "shadow"
     };
 
     private static final String[] PSEUDOELEMENT_CONSTANTSCSS2 = {
@@ -94,10 +99,12 @@ public class PseudoFactory {
             "first-line", "first-letter"
     };
 
-    private static final String[] PSEUDOFUNCTION_CONSTANTSCSS3 = {
+    private static final String[] PSEUDOCLASS_FUNCTION_CONSTANTSCSS3 = {
             "nth-child", "nth-last-child", "nth-of-type", "nth-last-of-type",
             "lang", "not" // from selectors-4 unstable list (20190624)
-            , "nth-col", "nth-last-col", "is", "where", "has", "dir"
+            , "nth-col", "nth-last-col", "is", "where", "has", "dir",
+            // // https://www.w3.org/TR/2014/WD-css-scoping-1-20140403/
+            "host", "host-context", "slotted"
     };
 
     private static final String[] PSEUDOFUNCTION_CONSTANTSCSS2 = {
@@ -167,7 +174,7 @@ public static String[] getPseudoFunction(CssVersion version) {
             case CSS21:
                 return PSEUDOFUNCTION_CONSTANTSCSS2;
             case CSS3:
-                return PSEUDOFUNCTION_CONSTANTSCSS3;
+                return PSEUDOCLASS_FUNCTION_CONSTANTSCSS3;
             case CSS1:
             default:
                 return null;
@@ -226,6 +233,15 @@ public static PseudoFunctionSelector newPseudoFunction(String name,
         if (name.equals("nth-last-of-type")) {
             return new PseudoFunctionNthLastOfType(name, value);
         }
+        if (name.equals("slotted")) {
+            return new PseudoFunctionSlotted(name, value);
+        }
+        if (name.equals("host")) {
+            return new PseudoFunctionSlotted(name, value);
+        }
+        if (name.equals("host-context")) {
+            return new PseudoFunctionSlotted(name, value);
+        }
         throw new InvalidParamException("pseudo",
                 ":" + name, ac);
     }
@@ -250,6 +266,15 @@ public static PseudoFunctionSelector newPseudoFunction(String name,
         if (name.equals("has")) {
             return new PseudoFunctionHas(name, value);
         }
+        if (name.equals("slotted")) {
+            return new PseudoFunctionSlotted(name, value);
+        }
+        if (name.equals("host")) {
+            return new PseudoFunctionHost(name, value);
+        }
+        if (name.equals("host-context")) {
+            return new PseudoFunctionHostContext(name, value);
+        }
         throw new InvalidParamException("pseudo",
                 ":" + name, ac);
     }
diff --git a/org/w3c/css/selectors/PseudoFunctionSelector.java b/org/w3c/css/selectors/PseudoFunctionSelector.java
@@ -12,6 +12,7 @@ public class PseudoFunctionSelector implements Selector {
 
     private String name;
     private Object param;
+    private boolean isElement = false;
     private String representation = null;
 
     /**
@@ -55,6 +56,13 @@ public void setParam(Object param) {
         this.param = param;
     }
 
+    public void setAsPseudoElement() {
+        isElement = true;
+    }
+
+    public void setAsPseudoClass() {
+        isElement = false;
+    }
     /**
      * Returns the specifictiy of this pseudo-function
      *
@@ -77,6 +85,9 @@ public boolean canApply(Selector other) {
     public String toString() {
         if (representation == null) {
             StringBuilder sb = new StringBuilder();
+            if (isElement) {
+                sb.append(':');
+            }
             sb.append(':');
             sb.append(name);
             sb.append('(');
diff --git a/org/w3c/css/selectors/pseudofunctions/PseudoFunctionHost.java b/org/w3c/css/selectors/pseudofunctions/PseudoFunctionHost.java
@@ -0,0 +1,29 @@
+//
+// 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;
+
+/**
+ * PseudoFunctionHost
+ */
+public class PseudoFunctionHost extends PseudoFunctionSelector {
+
+    private String representation = null;
+
+    public PseudoFunctionHost(String name, String value) {
+        setName(name);
+        setParam(value);
+    }
+
+    public PseudoFunctionHost(String name, ArrayList<CssSelectors> selector_list) {
+        this(name, CssSelectors.toArrayString(selector_list));
+    }
+
+}
diff --git a/org/w3c/css/selectors/pseudofunctions/PseudoFunctionHostContext.java b/org/w3c/css/selectors/pseudofunctions/PseudoFunctionHostContext.java
@@ -0,0 +1,29 @@
+//
+// 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;
+
+/**
+ * PseudoFunctionHostContext
+ */
+public class PseudoFunctionHostContext extends PseudoFunctionSelector {
+
+    private String representation = null;
+
+    public PseudoFunctionHostContext(String name, String value) {
+        setName(name);
+        setParam(value);
+    }
+
+    public PseudoFunctionHostContext(String name, ArrayList<CssSelectors> selector_list) {
+        this(name, CssSelectors.toArrayString(selector_list));
+    }
+
+}
diff --git a/org/w3c/css/selectors/pseudofunctions/PseudoFunctionSlotted.java b/org/w3c/css/selectors/pseudofunctions/PseudoFunctionSlotted.java
@@ -0,0 +1,30 @@
+//
+// 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;
+
+/**
+ * PseudoFunctionSlotted
+ */
+public class PseudoFunctionSlotted extends PseudoFunctionSelector {
+
+    private String representation = null;
+
+    public PseudoFunctionSlotted(String name, String value) {
+        setName(name);
+        setParam(value);
+        setAsPseudoElement();
+    }
+
+    public PseudoFunctionSlotted(String name, ArrayList<CssSelectors> selector_list) {
+        this(name, CssSelectors.toArrayString(selector_list));
+    }
+
+}
