Google Git
Sign in
eclipse/sourceediting/webtools.sourceediting/ffc5cf5a945359bc4af9c998f8305e8ed36efb8d^!/.
commit
ffc5cf5a945359bc4af9c998f8305e8ed36efb8d
[log]
author
nsandonato <nsandonato>
Wed Jul 15 18:36:35 2009 +0000
committer
nsandonato <nsandonato>
Wed Jul 15 18:36:35 2009 +0000
tree
678b6236739ca2029f37dfcd7d58980bd7890a4e
parent
31139d80903f125feddf9d74351561bffbf3eef2 [diff]
[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 57b6549..09af399 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,10 @@
 	public static String PrefsLabel_ColorNormal;
 	public static String PrefsLabel_ColorAtmarkRule;
 	public static String PrefsLabel_ColorSelector;
+	public static String PrefsLabel_ColorUniversal;
+	public static String PrefsLabel_ColorId;
+	public static String PrefsLabel_ColorPseudoClass;
+	public static String PrefsLabel_ColorClass;
 	public static String PrefsLabel_ColorMedia;
 	public static String PrefsLabel_ColorComment;
 	public static String PrefsLabel_ColorPropertyName;
@@ -65,6 +69,10 @@
 	public static String PrefsLabel_ColorSemiColon;
 	public static String PrefsLabel_ColorCurlyBrace;
 	public static String PrefsLabel_ColorError;
+	public static String PrefsLabel_ColorAttrDelimiter;
+	public static String PrefsLabel_ColorAttrName;
+	public static String PrefsLabel_ColorAttrValue;
+	public static String PrefsLabel_ColorAttrOperator;
 	public static String SortAction_0;
 	public static String _UI_WIZARD_NEW_TITLE;
 	public static String _UI_WIZARD_NEW_HEADING;

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 208dc0d..d9df032 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

@@ -34,11 +34,15 @@
 
 ## The following line is a sample CSS document.  Please translate only the following parts:
 ## Sample Styles
-PrefsLabel_ColorSample=@import url("../sample2.css");\n\n/* Sample Styles */\n\nBODY {\n\tcolor : black;\n\tbackground-color : rgb(181, 253, 211);\n\ttext-align : center;\n\tfont-family : "Heisei Mincho W3", serif\n}\n\n@page :left { margin-left : 4cm }\n\n@media aural {\n\tP.heidi {\n\t\tazimuth : center-left;\n\t\televation : 12.3deg;\n\t\tpause : 30ms 1.6s\n\t}\n}\n
+PrefsLabel_ColorSample=@import url("../sample2.css");\n\n/* Sample Styles */\n\nBODY {\n\tcolor : black;\n\tbackground-color : rgb(181, 253, 211);\n\ttext-align : center;\n\tfont-family : "Heisei Mincho W3", serif\n}\n\n#content > div *.links a[href~="http://"]:hover {\n\ttext-decoration : underline;\n}\n\n@page :left { margin-left : 4cm }\n\n@media aural {\n\tP.heidi {\n\t\tazimuth : center-left;\n\t\televation : 12.3deg;\n\t\tpause : 30ms 1.6s\n\t}\n}\n
 
 PrefsLabel_ColorNormal=Default
 PrefsLabel_ColorAtmarkRule=At-Rule
-PrefsLabel_ColorSelector=Selector
+PrefsLabel_ColorSelector=Type Selector
+PrefsLabel_ColorUniversal=Universal Selector
+PrefsLabel_ColorId=Id Selector
+PrefsLabel_ColorPseudoClass=Pseudo-class
+PrefsLabel_ColorClass=Class Selector
 PrefsLabel_ColorMedia=Media Name
 PrefsLabel_ColorComment=Comment
 PrefsLabel_ColorPropertyName=Property Name
@@ -46,9 +50,13 @@
 PrefsLabel_ColorUri=URI
 PrefsLabel_ColorString=Quoted String
 PrefsLabel_ColorColon=Property Delimiter
-PrefsLabel_ColorSemiColon=SemiColon
+PrefsLabel_ColorSemiColon=Semicolon
 PrefsLabel_ColorCurlyBrace=Curly Brace
 PrefsLabel_ColorError=Error
+PrefsLabel_ColorAttrDelimiter=Attribute Selector Delimiter
+PrefsLabel_ColorAttrName=Attribute Name
+PrefsLabel_ColorAttrValue=Attribute Value
+PrefsLabel_ColorAttrOperator=Attribute Selector Operator
 #
 SortAction_0=Sort
 #

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 c4714f0..68b9b60 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

@@ -24,13 +24,33 @@
 		// CSS Style Preferences
 		String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$
 		String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
+		String JUSTBOLD = " | null | true";
 		String styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
 		store.setDefault(IStyleConstantsCSS.NORMAL, styleValue);
 
 		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATMARK_RULE, 63, 127, 127) + NOBACKGROUNDBOLD;
 		store.setDefault(IStyleConstantsCSS.ATMARK_RULE, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.SELECTOR, 63, 127, 127) + NOBACKGROUNDBOLD;
+		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.SELECTOR, 63, 127, 127) + JUSTBOLD;
 		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.SELECTOR_CLASS, 63, 127, 127) + JUSTITALIC;
+		store.setDefault(IStyleConstantsCSS.SELECTOR_CLASS, styleValue);
+		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ID, 63, 127, 127) + JUSTITALIC;
+		store.setDefault(IStyleConstantsCSS.ID, styleValue);
+		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.PSEUDO, 63, 127, 127) + JUSTITALIC;
+		store.setDefault(IStyleConstantsCSS.PSEUDO, styleValue);
+
+		/* Attribute selector */
+		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATTRIBUTE_DELIM, 63, 127, 127) + NOBACKGROUNDBOLD;
+		store.setDefault(IStyleConstantsCSS.ATTRIBUTE_DELIM, styleValue);
+		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATTRIBUTE_NAME, 63, 127, 127) + NOBACKGROUNDBOLD;
+		store.setDefault(IStyleConstantsCSS.ATTRIBUTE_NAME, styleValue);
+		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATTRIBUTE_OPERATOR, 63, 127, 127) + NOBACKGROUNDBOLD;
+		store.setDefault(IStyleConstantsCSS.ATTRIBUTE_OPERATOR, styleValue);
+		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATTRIBUTE_VALUE, 63, 127, 127) + NOBACKGROUNDBOLD;
+		store.setDefault(IStyleConstantsCSS.ATTRIBUTE_VALUE, styleValue);
 
 		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.MEDIA, 42, 0, 225) + NOBACKGROUNDBOLD;
 		store.setDefault(IStyleConstantsCSS.MEDIA, 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 afd4014..ee444d5 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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -663,6 +663,14 @@
 			styles.add(IStyleConstantsCSS.NORMAL);
 			styles.add(IStyleConstantsCSS.ATMARK_RULE);
 			styles.add(IStyleConstantsCSS.SELECTOR);
+			styles.add(IStyleConstantsCSS.UNIVERSAL);
+			styles.add(IStyleConstantsCSS.SELECTOR_CLASS);
+			styles.add(IStyleConstantsCSS.ID);
+			styles.add(IStyleConstantsCSS.PSEUDO);
+			styles.add(IStyleConstantsCSS.ATTRIBUTE_DELIM);
+			styles.add(IStyleConstantsCSS.ATTRIBUTE_NAME);
+			styles.add(IStyleConstantsCSS.ATTRIBUTE_OPERATOR);
+			styles.add(IStyleConstantsCSS.ATTRIBUTE_VALUE);
 			styles.add(IStyleConstantsCSS.MEDIA);
 			styles.add(IStyleConstantsCSS.COMMENT);
 			styles.add(IStyleConstantsCSS.PROPERTY_NAME);
@@ -786,18 +794,21 @@
 		fContextToStyleMap.put(CSSRegionContexts.CSS_PAGE_SELECTOR, IStyleConstantsCSS.MEDIA);
 
 		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_UNIVERSAL, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_PSEUDO, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_CLASS, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ID, IStyleConstantsCSS.SELECTOR);
+		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_UNIVERSAL, IStyleConstantsCSS.UNIVERSAL);
+
+		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_PSEUDO, IStyleConstantsCSS.PSEUDO);
+		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_SEPARATOR, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_OPERATOR, IStyleConstantsCSS.SELECTOR);
+
+		/* Attribute selector */
+		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START, IStyleConstantsCSS.ATTRIBUTE_DELIM);
+		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END, IStyleConstantsCSS.ATTRIBUTE_DELIM);
+		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME, IStyleConstantsCSS.ATTRIBUTE_NAME);
+		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE, IStyleConstantsCSS.ATTRIBUTE_VALUE);
+		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_OPERATOR, IStyleConstantsCSS.ATTRIBUTE_OPERATOR);
 
 		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_PROPERTY, IStyleConstantsCSS.PROPERTY_NAME);
 		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT, IStyleConstantsCSS.PROPERTY_VALUE);
@@ -823,6 +834,14 @@
 		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.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$
+		fStyleToDescriptionMap.put(IStyleConstantsCSS.SELECTOR_CLASS, CSSUIMessages.PrefsLabel_ColorClass);//$NON-NLS-1$
+		fStyleToDescriptionMap.put(IStyleConstantsCSS.ATTRIBUTE_DELIM, CSSUIMessages.PrefsLabel_ColorAttrDelimiter);//$NON-NLS-1$
+		fStyleToDescriptionMap.put(IStyleConstantsCSS.ATTRIBUTE_NAME, CSSUIMessages.PrefsLabel_ColorAttrName);//$NON-NLS-1$
+		fStyleToDescriptionMap.put(IStyleConstantsCSS.ATTRIBUTE_OPERATOR, CSSUIMessages.PrefsLabel_ColorAttrOperator);//$NON-NLS-1$
+		fStyleToDescriptionMap.put(IStyleConstantsCSS.ATTRIBUTE_VALUE, CSSUIMessages.PrefsLabel_ColorAttrValue);//$NON-NLS-1$
 		fStyleToDescriptionMap.put(IStyleConstantsCSS.MEDIA, CSSUIMessages.PrefsLabel_ColorMedia);//$NON-NLS-1$
 		fStyleToDescriptionMap.put(IStyleConstantsCSS.COMMENT, CSSUIMessages.PrefsLabel_ColorComment);//$NON-NLS-1$
 		fStyleToDescriptionMap.put(IStyleConstantsCSS.PROPERTY_NAME, CSSUIMessages.PrefsLabel_ColorPropertyName);//$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 a9b5330..bd61618 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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,10 @@
 	public static final String NORMAL = "NORMAL"; //$NON-NLS-1$
 	public static final String ATMARK_RULE = "ATMARK_RULE"; //$NON-NLS-1$
 	public static final String SELECTOR = "SELECTOR"; //$NON-NLS-1$
+	public static final String UNIVERSAL = "UNIVERSAL"; //$NON-NLS-1$
+	public static final String PSEUDO = "PSEUDO"; //$NON-NLS-1$
+	public static final String SELECTOR_CLASS = "CLASS"; //$NON-NLS-1$
+	public static final String ID = "ID"; //$NON-NLS-1$
 	public static final String MEDIA = "MEDIA"; //$NON-NLS-1$
 	public static final String COMMENT = "COMMENT"; //$NON-NLS-1$
 	public static final String PROPERTY_NAME = "PROPERTY_NAME"; //$NON-NLS-1$
@@ -27,5 +31,9 @@
 	public static final String COLON = "COLON"; //$NON-NLS-1$
 	public static final String SEMI_COLON = "SEMI_COLON"; //$NON-NLS-1$
 	public static final String CURLY_BRACE = "CURLY_BRACE"; //$NON-NLS-1$
+	public static final String ATTRIBUTE_DELIM = "ATTRIBUTE_DELIM"; //$NON-NLS-1$
+	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 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 cb05027..df1ee71 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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,18 +86,21 @@
 		fColorTypes.put(CSSRegionContexts.CSS_PAGE_SELECTOR, IStyleConstantsCSS.MEDIA);
 
 		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_UNIVERSAL, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_PSEUDO, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_CLASS, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ID, IStyleConstantsCSS.SELECTOR);
+		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_UNIVERSAL, IStyleConstantsCSS.UNIVERSAL);
+
+		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_PSEUDO, IStyleConstantsCSS.PSEUDO);
+		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_SEPARATOR, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_OPERATOR, IStyleConstantsCSS.SELECTOR);
+
+		/* Attribute selector */
+		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START, IStyleConstantsCSS.ATTRIBUTE_DELIM);
+		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END, IStyleConstantsCSS.ATTRIBUTE_DELIM);
+		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME, IStyleConstantsCSS.ATTRIBUTE_NAME);
+		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE, IStyleConstantsCSS.ATTRIBUTE_VALUE);
+		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_OPERATOR, IStyleConstantsCSS.ATTRIBUTE_OPERATOR);
 
 		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_PROPERTY, IStyleConstantsCSS.PROPERTY_NAME);
 		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT, IStyleConstantsCSS.PROPERTY_VALUE);
@@ -139,12 +142,28 @@
 				styleKey = IStyleConstantsCSS.MEDIA;
 			} else if (IStyleConstantsCSS.NORMAL.equals(prefKey)) {
 				styleKey = IStyleConstantsCSS.NORMAL;
+			} else if (IStyleConstantsCSS.ATTRIBUTE_DELIM.equals(prefKey)) {
+				styleKey = IStyleConstantsCSS.ATTRIBUTE_DELIM;
+			} else if (IStyleConstantsCSS.ATTRIBUTE_NAME.equals(prefKey)) {
+				styleKey = IStyleConstantsCSS.ATTRIBUTE_NAME;
+			} else if (IStyleConstantsCSS.ATTRIBUTE_OPERATOR.equals(prefKey)) {
+				styleKey = IStyleConstantsCSS.ATTRIBUTE_OPERATOR;
+			} else if (IStyleConstantsCSS.ATTRIBUTE_VALUE.equals(prefKey)) {
+				styleKey = IStyleConstantsCSS.ATTRIBUTE_VALUE;
 			} else if (IStyleConstantsCSS.PROPERTY_NAME.equals(prefKey)) {
 				styleKey = IStyleConstantsCSS.PROPERTY_NAME;
 			} else if (IStyleConstantsCSS.PROPERTY_VALUE.equals(prefKey)) {
 				styleKey = IStyleConstantsCSS.PROPERTY_VALUE;
 			} else if (IStyleConstantsCSS.SELECTOR.equals(prefKey)) {
 				styleKey = IStyleConstantsCSS.SELECTOR;
+			} else if (IStyleConstantsCSS.UNIVERSAL.equals(prefKey)) {
+				styleKey = IStyleConstantsCSS.UNIVERSAL;
+			} else if (IStyleConstantsCSS.ID.equals(prefKey)) {
+				styleKey = IStyleConstantsCSS.ID;
+			} else if (IStyleConstantsCSS.PSEUDO.equals(prefKey)) {
+				styleKey = IStyleConstantsCSS.PSEUDO;
+			} else if (IStyleConstantsCSS.SELECTOR_CLASS.equals(prefKey)) {
+				styleKey = IStyleConstantsCSS.SELECTOR_CLASS;
 			} else if (IStyleConstantsCSS.SEMI_COLON.equals(prefKey)) {
 				styleKey = IStyleConstantsCSS.SEMI_COLON;
 			} else if (IStyleConstantsCSS.STRING.equals(prefKey)) {
@@ -187,6 +206,14 @@
 		addTextAttribute(IStyleConstantsCSS.PROPERTY_NAME);
 		addTextAttribute(IStyleConstantsCSS.PROPERTY_VALUE);
 		addTextAttribute(IStyleConstantsCSS.SELECTOR);
+		addTextAttribute(IStyleConstantsCSS.UNIVERSAL);
+		addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_DELIM);
+		addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_NAME);
+		addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_OPERATOR);
+		addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_VALUE);
+		addTextAttribute(IStyleConstantsCSS.ID);
+		addTextAttribute(IStyleConstantsCSS.SELECTOR_CLASS);
+		addTextAttribute(IStyleConstantsCSS.PSEUDO);
 		addTextAttribute(IStyleConstantsCSS.SEMI_COLON);
 		addTextAttribute(IStyleConstantsCSS.STRING);
 		addTextAttribute(IStyleConstantsCSS.URI);