Drop SAC types from the CSS engine API and matcher

bundles/org.eclipse.e4.ui.css.core/.options

@@ -0,0 +1,13 @@
+# Debugging options for the org.eclipse.e4.ui.css.core plugin.
+
+# Master switch. Must be true for any of the more specific debug
+# options below to take effect.
+org.eclipse.e4.ui.css.core/debug=false
+
+# Accumulate per-phase timings inside the CSS engine (applyStyles,
+# getComputedStyle, selector match, applyStyleDeclaration,
+# applyCSSProperty) and print a summary to stdout after each
+# top-level applyStyles call. Useful for measuring where time goes
+# during a theme swap. Has no effect unless the master "debug"
+# option is also true.
+org.eclipse.e4.ui.css.core/debug/perf=false

bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF

@@ -30,7 +30,8 @@ Export-Package: org.eclipse.e4.ui.css.core;x-internal:=true,
  org.eclipse.e4.ui.css.core.impl.dom;x-internal:=true,
  org.eclipse.e4.ui.css.core.impl.dom.parsers;x-internal:=true,
  org.eclipse.e4.ui.css.core.impl.dom.properties;x-friends:="org.eclipse.e4.ui.css.swt",
- org.eclipse.e4.ui.css.core.impl.engine;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.workbench.swt",
+ org.eclipse.e4.ui.css.core.impl.engine;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.tests.performance",
+ org.eclipse.e4.ui.css.core.impl.engine.selector;x-friends:="org.eclipse.e4.ui.tests.css.core",
  org.eclipse.e4.ui.css.core.impl.sac;x-internal:=true,
  org.eclipse.e4.ui.css.core.resources;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.workbench.renderers.swt",
  org.eclipse.e4.ui.css.core.sac;x-internal:=true,

bundles/org.eclipse.e4.ui.css.core/build.properties

@@ -16,7 +16,8 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                about.html,\
-               plugin.properties
+               plugin.properties,\
+               .options
 src.includes = schema/,\
                apache_about_files/,\
                about.html

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedCSSRule.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Angelo Zerr and others.
+ * Copyright (c) 2008, 2026 Angelo Zerr and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -13,8 +13,7 @@
  *******************************************************************************/
 package org.eclipse.e4.ui.css.core.dom;
 
-import org.w3c.css.sac.Selector;
-import org.w3c.css.sac.SelectorList;
+import org.eclipse.e4.ui.css.core.impl.engine.selector.Selectors;
 import org.w3c.dom.css.CSSRule;
 
 /**
@@ -28,7 +27,7 @@ public interface ExtendedCSSRule extends CSSRule {
 	public CSSPropertyList getCSSPropertyList();
 
 	/**
-	 * Return the list of {@link Selector} of this {@link CSSRule}.
+	 * Return the list of selectors of this {@link CSSRule}.
 	 */
-	public SelectorList getSelectorList();
+	public Selectors.SelectorList getSelectorList();
 }

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedDocumentCSS.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2018 Angelo Zerr and others.
+ * Copyright (c) 2008, 2026 Angelo Zerr and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -15,9 +15,6 @@
 package org.eclipse.e4.ui.css.core.dom;
 
 import java.util.EventListener;
-import java.util.List;
-import org.w3c.css.sac.Condition;
-import org.w3c.css.sac.Selector;
 import org.w3c.dom.css.DocumentCSS;
 import org.w3c.dom.stylesheets.StyleSheet;
 
@@ -26,21 +23,10 @@
  */
 public interface ExtendedDocumentCSS extends DocumentCSS {
 
-	public static final Integer SAC_ID_CONDITION = Integer.valueOf(Condition.SAC_ID_CONDITION);
-	public static final Integer SAC_CLASS_CONDITION = Integer.valueOf(Condition.SAC_CLASS_CONDITION);
-	public static final Integer SAC_PSEUDO_CLASS_CONDITION = Integer.valueOf(Condition.SAC_PSEUDO_CLASS_CONDITION);
-	public static final Integer OTHER_SAC_CONDITIONAL_SELECTOR = Integer.valueOf(Selector.SAC_CONDITIONAL_SELECTOR);
-
-	public static final Integer OTHER_SAC_SELECTOR = Integer.valueOf(999);
-
 	public void addStyleSheet(StyleSheet styleSheet);
 
 	public void removeAllStyleSheets();
 
-	public List<?> queryConditionSelector(int conditionType);
-
-	public List<?> querySelector(int selectorType, int conditionType);
-
 	/**
 	 * @since 0.12.200
 	 */

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler.java

@@ -63,4 +63,23 @@ public default String retrieveCSSProperty(Object element, String property, Strin
 		return null;
 	}
 
+	/**
+	 * Callback method called once after all CSS properties of a single
+	 * declaration have been applied. Handlers that need to perform a final
+	 * step (re-layout, redraw, batched commit, ...) override this method;
+	 * the default is a no-op.
+	 */
+	default void onAllCSSPropertiesApplied(Object element, CSSEngine engine) throws Exception {
+		// do nothing
+	}
+
+	/**
+	 * Variant of {@link #onAllCSSPropertiesApplied(Object, CSSEngine)} that
+	 * also receives the pseudo class. Defaults to delegating to the
+	 * pseudo-less form.
+	 */
+	default void onAllCSSPropertiesApplied(Object element, CSSEngine engine, String pseudo) throws Exception {
+		onAllCSSPropertiesApplied(element, engine);
+	}
+
 }

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSEngine.java

@@ -20,11 +20,10 @@
 import org.eclipse.e4.ui.css.core.dom.IElementProvider;
 import org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler;
 import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverter;
+import org.eclipse.e4.ui.css.core.impl.engine.selector.Selectors;
 import org.eclipse.e4.ui.css.core.resources.IResourcesRegistry;
 import org.eclipse.e4.ui.css.core.util.resources.IResourcesLocatorManager;
 import org.w3c.css.sac.InputSource;
-import org.w3c.css.sac.Selector;
-import org.w3c.css.sac.SelectorList;
 import org.w3c.dom.Element;
 import org.w3c.dom.css.CSSStyleDeclaration;
 import org.w3c.dom.css.CSSStyleSheet;
@@ -105,27 +104,27 @@ public interface CSSEngine {
 	/**
 	 * Parse Selectors from String value.
 	 */
-	SelectorList parseSelectors(String text);
+	Selectors.SelectorList parseSelectors(String text);
 
 	/**
 	 * Parse Selectors from InputSource value.
 	 */
-	SelectorList parseSelectors(InputSource source) throws IOException;
+	Selectors.SelectorList parseSelectors(InputSource source) throws IOException;
 
 	/**
 	 * Parse Selectors from InputStream.
 	 */
-	SelectorList parseSelectors(InputStream stream) throws IOException;
+	Selectors.SelectorList parseSelectors(InputStream stream) throws IOException;
 
 	/**
 	 * Parse Selectors from String value.
 	 */
-	SelectorList parseSelectors(Reader reader) throws IOException;
+	Selectors.SelectorList parseSelectors(Reader reader) throws IOException;
 
 	/**
 	 * Check if the <code>selector</code> matches the object <code>node</code>.
 	 */
-	boolean matches(Selector selector, Object node, String pseudo);
+	boolean matches(Selectors.Selector selector, Object node, String pseudo);
 
 	/*--------------- Apply styles -----------------*/
 

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Angelo Zerr and others.
+ * Copyright (c) 2008, 2026 Angelo Zerr and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -17,8 +17,7 @@
 
 import org.eclipse.e4.ui.css.core.dom.CSSPropertyList;
 import org.eclipse.e4.ui.css.core.dom.ExtendedCSSRule;
-import org.w3c.css.sac.Selector;
-import org.w3c.css.sac.SelectorList;
+import org.eclipse.e4.ui.css.core.impl.engine.selector.Selectors;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.css.CSSRule;
 import org.w3c.dom.css.CSSStyleDeclaration;
@@ -27,10 +26,10 @@
 
 public class CSSStyleRuleImpl extends CSSRuleImpl implements CSSStyleRule, ExtendedCSSRule {
 
-	private final SelectorList selectors;
+	private final Selectors.SelectorList selectors;
 	private CSSStyleDeclaration styleDeclaration;
 
-	public CSSStyleRuleImpl(CSSStyleSheet parentStyleSheet, CSSRule parentRule, SelectorList selectors) {
+	public CSSStyleRuleImpl(CSSStyleSheet parentStyleSheet, CSSRule parentRule, Selectors.SelectorList selectors) {
 		super(parentStyleSheet, parentRule);
 		this.selectors = selectors;
 	}
@@ -55,17 +54,7 @@ public String getCssText() {
 
 	@Override
 	public String getSelectorText() {
-		StringBuilder sb = new StringBuilder();
-		for (int selID = 0; selID < getSelectorList().getLength(); selID++) {
-			Selector item = getSelectorList().item(selID);
-			sb.append(item.toString());
-			sb.append(", ");
-		}
-		if (getSelectorList().getLength() > 0) {
-			sb.delete(sb.length() - 2, sb.length());
-		}
-
-		return sb.toString();
+		return selectors.text();
 	}
 
 	@Override
@@ -83,7 +72,7 @@ public void setSelectorText(String selectorText) throws DOMException {
 	// Additional methods
 
 	@Override
-	public SelectorList getSelectorList() {
+	public Selectors.SelectorList getSelectorList() {
 		return selectors;
 	}