Fix: Added missing binding for Token color settings

29 files changed, 336 insertions, 242 deletions

diff --git a/devtools/org.eclipse.xtext.reference.ui/plugin.xml_gen b/devtools/org.eclipse.xtext.reference.ui/plugin.xml_gen
index 648547d..1b9657e 100644
--- a/devtools/org.eclipse.xtext.reference.ui/plugin.xml_gen
+++ b/devtools/org.eclipse.xtext.reference.ui/plugin.xml_gen
@@ -34,6 +34,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.reference.ReferenceGrammarExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.reference.ReferenceGrammarExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -64,17 +77,6 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.reference.ReferenceGrammarExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
 </plugin>
diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java
index ca2168e..77b39b7 100644
--- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java
+++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractReferenceGrammarUiModule extends DefaultUIModule {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.reference.ReferenceGrammarProposals.class;
 	}
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/plugin.xml_gen b/examples/org.eclipse.xtext.example.domainmodel.ui/plugin.xml_gen
index f22f277..8810c87 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/plugin.xml_gen
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/plugin.xml_gen
@@ -26,6 +26,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.example.DomainmodelExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.example.DomainmodelExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -56,17 +69,6 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.example.DomainmodelExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
 </plugin>
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
index b9b8646..5c6b630 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractDomainmodelUiModule extends DefaultUIModule {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.example.DomainmodelProposals.class;
 	}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/plugin.xml_gen b/examples/org.eclipse.xtext.example.ecoredsl.ui/plugin.xml_gen
index bb68924..c97873d 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl.ui/plugin.xml_gen
+++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/plugin.xml_gen
@@ -26,6 +26,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.example.EcoreDslExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.example.EcoreDslExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -56,17 +69,6 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.example.EcoreDslExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
 </plugin>
diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
index 2a870f7..1de0cad 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractEcoreDslUiModule extends DefaultUIModule {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.example.EcoreDslProposals.class;
 	}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/plugin.xml_gen b/examples/org.eclipse.xtext.example.fowlerdsl.ui/plugin.xml_gen
index 6e0e0a0..00bef66 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/plugin.xml_gen
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/plugin.xml_gen
@@ -26,6 +26,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.example.FowlerDslExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.example.FowlerDslExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -56,17 +69,6 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.example.FowlerDslExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
 </plugin>
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/AbstractFowlerDslUiModule.java b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/AbstractFowlerDslUiModule.java
index b43e9e8..176108c 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/AbstractFowlerDslUiModule.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/AbstractFowlerDslUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractFowlerDslUiModule extends DefaultUIModule {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.example.FowlerDslProposals.class;
 	}
diff --git a/plugins/org.eclipse.xtext.ui.generator/src/org/eclipse/xtext/ui/generator/BasicUiGeneratorFragment.xpt b/plugins/org.eclipse.xtext.ui.generator/src/org/eclipse/xtext/ui/generator/BasicUiGeneratorFragment.xpt
index bcca19a..7870a6f 100755
--- a/plugins/org.eclipse.xtext.ui.generator/src/org/eclipse/xtext/ui/generator/BasicUiGeneratorFragment.xpt
+++ b/plugins/org.eclipse.xtext.ui.generator/src/org/eclipse/xtext/ui/generator/BasicUiGeneratorFragment.xpt
@@ -42,7 +42,6 @@
 		</handler>
 	</extension>
 	
-	<!--
 	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
@@ -74,7 +73,6 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	-->
 	
 «ENDDEFINE»
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
index dfe418c..1ea354c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
@@ -435,7 +435,7 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess {
 		return getInheritedParserRuleAccess().getRule();
 	}
 
-	//org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@456e30 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@f229cd (name: OverridableParserRule) (definesHiddenTokens: false)
+	//org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@a18283 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@110fa8 (name: OverridableParserRule) (definesHiddenTokens: false)
 	public AbstractTestLanguageGrammarAccess.AbstractCallOverridenParserRuleElements getAbstractCallOverridenParserRuleAccess() {
 		return gaAbstractTestLanguage.getAbstractCallOverridenParserRuleAccess();
 	}
@@ -444,7 +444,7 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess {
 		return getAbstractCallOverridenParserRuleAccess().getRule();
 	}
 
-	//org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@41d249 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@d1f3c3 (name: ExtendableParserRule) (definesHiddenTokens: false)
+	//org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@a75bee (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@164721 (name: ExtendableParserRule) (definesHiddenTokens: false)
 	public AbstractTestLanguageGrammarAccess.AbstractCallExtendedParserRuleElements getAbstractCallExtendedParserRuleAccess() {
 		return gaAbstractTestLanguage.getAbstractCallExtendedParserRuleAccess();
 	}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/plugin.xml_gen b/tests/org.eclipse.xtext.ui.common.tests/plugin.xml_gen
index afc7ae0..852e41f 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/plugin.xml_gen
+++ b/tests/org.eclipse.xtext.ui.common.tests/plugin.xml_gen
@@ -47,6 +47,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.XtextGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.XtextGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -77,18 +90,7 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.XtextGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
@@ -134,6 +136,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -164,18 +179,7 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
 
 
@@ -223,6 +227,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.parser.keywords.KeywordsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.parser.keywords.KeywordsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -253,18 +270,7 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.parser.keywords.KeywordsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
@@ -310,6 +316,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.testlanguages.ContentAssistTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.testlanguages.ContentAssistTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -340,18 +359,7 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.testlanguages.ContentAssistTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
@@ -397,6 +405,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -427,18 +448,7 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
@@ -484,6 +494,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.testlanguages.TreeTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.testlanguages.TreeTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -514,17 +537,6 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.testlanguages.TreeTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
 </plugin>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java
index 3c7ef43..22a9f40 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractXtextGrammarTestLanguageUiModule extends DefaultUI
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.XtextGrammarTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
index 9080912..dc6e547 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
@@ -17,22 +17,28 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
+List[IScopedElement] scope_usedGrammars(Grammar this):
+	allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_usedGrammars(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
 List[IScopedElement] scope_hiddenTokens(ParserRule this):
 	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
 	
 List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_hiddenTokens(Grammar this):
+List[IScopedElement] scope_rule(RuleCall this):
 	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
+List[IScopedElement] scope_rule(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_classifier(TypeRef this):
-	allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
+	allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_classifier(emf::EObject this) :
+List[IScopedElement] scope_ePackage(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
 List[IScopedElement] scope_metamodel(TypeRef this):
@@ -41,21 +47,15 @@ List[IScopedElement] scope_metamodel(TypeRef this):
 List[IScopedElement] scope_metamodel(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_usedGrammars(Grammar this):
-	allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x));
-	
-List[IScopedElement] scope_usedGrammars(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
-List[IScopedElement] scope_rule(RuleCall this):
+List[IScopedElement] scope_hiddenTokens(Grammar this):
 	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_rule(emf::EObject this) :
+List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
-	allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_classifier(TypeRef this):
+	allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_ePackage(emf::EObject this) :
+List[IScopedElement] scope_classifier(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java
index c42889f..7cb45fd 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractKeywordsTestLanguageUiModule extends DefaultUIModu
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.parser.keywords.KeywordsTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java
index 11e04d4..dabd0ac 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractContentAssistTestLanguageUiModule extends DefaultU
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.testlanguages.ContentAssistTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java
index 0757e70..3b0f8ce 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractReferenceGrammarTestLanguageUiModule extends Defau
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java
index b17e58e..607f143 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractTreeTestLanguageUiModule extends DefaultUIModule {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.testlanguages.TreeTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
index e112e8f..7948696 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
@@ -16,18 +16,18 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
-List[IScopedElement] scope_kinder(Familie this):
-	allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x));
-	
-List[IScopedElement] scope_kinder(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
 List[IScopedElement] scope_mutter(Familie this):
 	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
 	
 List[IScopedElement] scope_mutter(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
+List[IScopedElement] scope_kinder(Familie this):
+	allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_kinder(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
 List[IScopedElement] scope_vater(Familie this):
 	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
 	
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageUiModule.java
index 9c82ff8..175d2ac 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractTwoContextsTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractTwoContextsTestLanguageUiModule extends DefaultUIM
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.ui.common.editor.contentassist.impl.TwoContextsTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/plugin.xml_gen b/tests/org.eclipse.xtext.ui.integration.tests/plugin.xml_gen
index 7b30f5b..1d7cf5a 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/plugin.xml_gen
+++ b/tests/org.eclipse.xtext.ui.integration.tests/plugin.xml_gen
@@ -47,6 +47,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.ui.integration.TestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.ui.integration.TestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -77,17 +90,6 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.ui.integration.TestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
 </plugin>
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageUiModule.java b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageUiModule.java
index 4ed059e..a7fff21 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractTestLanguageUiModule extends DefaultUIModule {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.ui.integration.TestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.xtend.tests/plugin.xml_gen b/tests/org.eclipse.xtext.xtend.tests/plugin.xml_gen
index e13d6d6..a4daecd 100644
--- a/tests/org.eclipse.xtext.xtend.tests/plugin.xml_gen
+++ b/tests/org.eclipse.xtext.xtend.tests/plugin.xml_gen
@@ -47,6 +47,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.XtextGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.XtextGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -77,18 +90,7 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.XtextGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
@@ -134,6 +136,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.parser.keywords.KeywordsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.parser.keywords.KeywordsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -164,18 +179,7 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.parser.keywords.KeywordsTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
@@ -221,6 +225,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.testlanguages.ContentAssistTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.testlanguages.ContentAssistTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -251,18 +268,7 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.testlanguages.ContentAssistTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
@@ -308,6 +314,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -338,18 +357,7 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
@@ -395,6 +403,19 @@
 		</editor>
 	</extension>
 	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.xtext.testlanguages.TreeTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="isActiveEditorAnInstanceOfXtextEditor">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	
+	<extension
 			point="org.eclipse.ui.preferencePages">
 		<page
 			class="org.eclipse.xtext.testlanguages.TreeTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.core.editor.preferences.LanguageRootPreferencePage"
@@ -425,17 +446,6 @@
 			label="Task Tags">
 		</keyword>
 	</extension>
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.xtext.testlanguages.TreeTestLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclarationHandler"
-			commandId="org.eclipse.xtext.ui.common.editor.hyperlinking.OpenDeclaration">
-			<activeWhen>
-				<reference
-					definitionId="isActiveEditorAnInstanceOfXtextEditor">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
+	
 
 </plugin>
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java
index 3c7ef43..22a9f40 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractXtextGrammarTestLanguageUiModule extends DefaultUI
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.XtextGrammarTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
index 1175afd..b97f776 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
@@ -17,28 +17,16 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
-List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
-	allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
-	
-List[IScopedElement] scope_ePackage(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
 List[IScopedElement] scope_hiddenTokens(ParserRule this):
 	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
 	
 List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_hiddenTokens(Grammar this):
-	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
-	
-List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
-List[IScopedElement] scope_rule(RuleCall this):
-	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_usedGrammars(Grammar this):
+	allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_rule(emf::EObject this) :
+List[IScopedElement] scope_usedGrammars(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
 List[IScopedElement] scope_classifier(TypeRef this):
@@ -47,10 +35,22 @@ List[IScopedElement] scope_classifier(TypeRef this):
 List[IScopedElement] scope_classifier(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_usedGrammars(Grammar this):
-	allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
+	allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_usedGrammars(emf::EObject this) :
+List[IScopedElement] scope_ePackage(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
+List[IScopedElement] scope_hiddenTokens(Grammar this):
+	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
+List[IScopedElement] scope_rule(RuleCall this):
+	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_rule(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
 List[IScopedElement] scope_metamodel(TypeRef this):
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java
index c42889f..7cb45fd 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractKeywordsTestLanguageUiModule extends DefaultUIModu
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.parser.keywords.KeywordsTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java
index 11e04d4..dabd0ac 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractContentAssistTestLanguageUiModule extends DefaultU
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.testlanguages.ContentAssistTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java
index 0757e70..3b0f8ce 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractReferenceGrammarTestLanguageUiModule extends Defau
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java
index b17e58e..607f143 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageUiModule.java
@@ -20,6 +20,10 @@ public abstract class AbstractTreeTestLanguageUiModule extends DefaultUIModule {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.ITokenStyleProvider> bindITokenStyleProvider() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenStyleProvider.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.testlanguages.TreeTestLanguageProposals.class;
 	}
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
index 7948696..e112e8f 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
@@ -16,18 +16,18 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
-List[IScopedElement] scope_mutter(Familie this):
-	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
-	
-List[IScopedElement] scope_mutter(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
 List[IScopedElement] scope_kinder(Familie this):
 	allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x));
 	
 List[IScopedElement] scope_kinder(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
+List[IScopedElement] scope_mutter(Familie this):
+	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_mutter(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
 List[IScopedElement] scope_vater(Familie this):
 	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));