[283444] Support more syntax highlighting preferences for selectors
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIMessages.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIMessages.java index 09af399..a96cc40 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIMessages.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIMessages.java
@@ -55,6 +55,7 @@ public static String PrefsLabel_ColorNormal; public static String PrefsLabel_ColorAtmarkRule; public static String PrefsLabel_ColorSelector; + public static String PrefsLabel_ColorCombinator; public static String PrefsLabel_ColorUniversal; public static String PrefsLabel_ColorId; public static String PrefsLabel_ColorPseudoClass;
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPluginResources.properties b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPluginResources.properties index d9df032..f1adecd 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPluginResources.properties +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPluginResources.properties
@@ -39,6 +39,7 @@ PrefsLabel_ColorNormal=Default PrefsLabel_ColorAtmarkRule=At-Rule PrefsLabel_ColorSelector=Type Selector +PrefsLabel_ColorCombinator=Combinator PrefsLabel_ColorUniversal=Universal Selector PrefsLabel_ColorId=Id Selector PrefsLabel_ColorPseudoClass=Pseudo-class
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java index 68b9b60..dc4b215 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java
@@ -34,6 +34,8 @@ store.setDefault(IStyleConstantsCSS.SELECTOR, styleValue); styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.UNIVERSAL, 63, 127, 127) + NOBACKGROUNDBOLD; store.setDefault(IStyleConstantsCSS.UNIVERSAL, styleValue); + styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.COMBINATOR, 63, 127, 127) + NOBACKGROUNDBOLD; + store.setDefault(IStyleConstantsCSS.COMBINATOR, styleValue); styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.SELECTOR_CLASS, 63, 127, 127) + JUSTITALIC; store.setDefault(IStyleConstantsCSS.SELECTOR_CLASS, styleValue);
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSyntaxColoringPage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSyntaxColoringPage.java index ee444d5..c840995 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSyntaxColoringPage.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSyntaxColoringPage.java
@@ -664,6 +664,7 @@ styles.add(IStyleConstantsCSS.ATMARK_RULE); styles.add(IStyleConstantsCSS.SELECTOR); styles.add(IStyleConstantsCSS.UNIVERSAL); + styles.add(IStyleConstantsCSS.COMBINATOR); styles.add(IStyleConstantsCSS.SELECTOR_CLASS); styles.add(IStyleConstantsCSS.ID); styles.add(IStyleConstantsCSS.PSEUDO); @@ -800,7 +801,7 @@ fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_CLASS, IStyleConstantsCSS.SELECTOR_CLASS); fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ID, IStyleConstantsCSS.ID); - fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_COMBINATOR, IStyleConstantsCSS.SELECTOR); + fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_COMBINATOR, IStyleConstantsCSS.COMBINATOR); fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_SEPARATOR, IStyleConstantsCSS.SELECTOR); /* Attribute selector */ @@ -834,6 +835,7 @@ fStyleToDescriptionMap.put(IStyleConstantsCSS.NORMAL, CSSUIMessages.PrefsLabel_ColorNormal);//$NON-NLS-1$ fStyleToDescriptionMap.put(IStyleConstantsCSS.ATMARK_RULE, CSSUIMessages.PrefsLabel_ColorAtmarkRule);//$NON-NLS-1$ fStyleToDescriptionMap.put(IStyleConstantsCSS.SELECTOR, CSSUIMessages.PrefsLabel_ColorSelector);//$NON-NLS-1$ + fStyleToDescriptionMap.put(IStyleConstantsCSS.COMBINATOR, CSSUIMessages.PrefsLabel_ColorCombinator);//$NON-NLS-1$ fStyleToDescriptionMap.put(IStyleConstantsCSS.UNIVERSAL, CSSUIMessages.PrefsLabel_ColorUniversal);//$NON-NLS-1$ fStyleToDescriptionMap.put(IStyleConstantsCSS.ID, CSSUIMessages.PrefsLabel_ColorId);//$NON-NLS-1$ fStyleToDescriptionMap.put(IStyleConstantsCSS.PSEUDO, CSSUIMessages.PrefsLabel_ColorPseudoClass);//$NON-NLS-1$
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/IStyleConstantsCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/IStyleConstantsCSS.java index bd61618..2287a63 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/IStyleConstantsCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/IStyleConstantsCSS.java
@@ -35,5 +35,6 @@ public static final String ATTRIBUTE_NAME = "ATTRIBUTE_NAME"; //$NON-NLS-1$ public static final String ATTRIBUTE_OPERATOR = "ATTRIBUTE_OPERATOR"; //$NON-NLS-1$ public static final String ATTRIBUTE_VALUE = "ATTRIBUTE_VALUE"; //$NON-NLS-1$ + public static final String COMBINATOR = "COMBINATOR"; //$NON-NLS-1$ public static final String ERROR = "ERROR"; //$NON-NLS-1$ }
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForCSS.java index df1ee71..8cffa99 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForCSS.java
@@ -92,7 +92,7 @@ fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_CLASS, IStyleConstantsCSS.SELECTOR_CLASS); fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ID, IStyleConstantsCSS.ID); - fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_COMBINATOR, IStyleConstantsCSS.SELECTOR); + fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_COMBINATOR, IStyleConstantsCSS.COMBINATOR); fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_SEPARATOR, IStyleConstantsCSS.SELECTOR); /* Attribute selector */ @@ -150,6 +150,8 @@ styleKey = IStyleConstantsCSS.ATTRIBUTE_OPERATOR; } else if (IStyleConstantsCSS.ATTRIBUTE_VALUE.equals(prefKey)) { styleKey = IStyleConstantsCSS.ATTRIBUTE_VALUE; + } else if (IStyleConstantsCSS.COMBINATOR.equals(prefKey)) { + styleKey = IStyleConstantsCSS.COMBINATOR; } else if (IStyleConstantsCSS.PROPERTY_NAME.equals(prefKey)) { styleKey = IStyleConstantsCSS.PROPERTY_NAME; } else if (IStyleConstantsCSS.PROPERTY_VALUE.equals(prefKey)) { @@ -211,6 +213,7 @@ addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_NAME); addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_OPERATOR); addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_VALUE); + addTextAttribute(IStyleConstantsCSS.COMBINATOR); addTextAttribute(IStyleConstantsCSS.ID); addTextAttribute(IStyleConstantsCSS.SELECTOR_CLASS); addTextAttribute(IStyleConstantsCSS.PSEUDO);