diff --git a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextLexer.java b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextLexer.java
index 109448db6..a09f9bc26 100644
--- a/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextLexer.java
+++ b/org.eclipse.xtext.xtext.ide/src-gen/org/eclipse/xtext/xtext/ide/contentassist/antlr/internal/InternalXtextLexer.java
@@ -1745,160 +1745,163 @@ public class InternalXtextLexer extends Lexer {
         "\2\uffff\1\2\6\uffff\1\13\1\14\1\15\3\uffff\1\22\1\uffff\1\24\1\uffff\1\26\1\27\1\31\1\32\1\33\1\34\1\uffff\1\36\1\37\1\40\5\uffff\1\51\1\52\3\uffff\1\56\1\57\1\10\1\1\1\2\1\5\1\3\1\50\1\4\2\uffff\1\51\5\uffff\1\13\1\14\1\15\1\44\1\16\2\uffff\1\22\1\30\1\23\1\24\1\uffff\1\26\1\27\1\31\1\32\1\33\1\34\1\uffff\1\36\1\37\1\40\1\42\3\uffff\1\52\1\53\1\54\1\55\1\56\7\uffff\1\20\20\uffff\1\43\4\uffff\1\7\3\uffff\1\12\3\uffff\1\45\1\uffff\1\6\14\uffff\1\21\2\uffff\1\46\2\uffff\1\11\1\uffff\1\25\1\35\1\47\1\41\1\17";
     static final String DFA12_specialS =
         "\1\0\43\uffff\1\1\1\2\162\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\11\50\2\47\2\50\1\47\22\50\1\47\1\32\1\44\3\50\1\26\1\45\1\12\1\13\1\2\1\3\1\11\1\35\1\14\1\46\12\43\1\20\1\21\1\23\1\4\1\24\1\1\1\17\4\42\1\36\25\42\1\33\1\50\1\34\1\41\1\42\1\50\1\15\1\42\1\31\1\42\1\37\1\5\1\7\1\40\1\16\10\42\1\22\1\42\1\6\2\42\1\10\3\42\1\27\1\25\1\30\uff82\50",
-            "\1\51",
-            "",
-            "\1\54",
-            "\1\56",
-            "\1\60\20\uffff\1\61",
-            "\1\64\14\uffff\1\63",
-            "\1\66\14\uffff\1\65",
-            "\1\67",
-            "",
-            "",
-            "",
-            "\1\73",
-            "\1\75",
-            "\1\76",
-            "",
-            "\1\100",
-            "",
-            "\1\103",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\112",
-            "",
-            "",
-            "",
-            "\1\116",
-            "\1\117",
-            "\1\120",
-            "\1\121",
-            "\32\62\4\uffff\1\62\1\uffff\32\62",
-            "",
-            "",
-            "\0\123",
-            "\0\123",
-            "\1\124\4\uffff\1\125",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\127",
-            "\1\130",
-            "",
-            "\1\131",
-            "\1\132",
-            "\1\133",
-            "\1\134",
-            "\1\135",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\1\137",
-            "",
-            "",
-            "",
-            "",
-            "\1\140",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\141",
-            "",
-            "",
-            "",
-            "",
-            "\1\142",
-            "\1\143",
-            "\1\144",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\145",
-            "\1\146",
-            "\1\147",
-            "\1\150",
-            "\1\151",
-            "\1\152",
-            "\1\153",
-            "",
-            "\1\154",
-            "\1\155",
-            "\1\156",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\1\160",
-            "\1\161",
-            "\1\162",
-            "\1\163",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\1\165",
-            "\1\166",
-            "\1\167",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\1\171",
-            "\1\172",
-            "\1\173",
-            "",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\1\175",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\1\177",
-            "",
-            "\1\u0080",
-            "\1\u0081",
-            "\1\u0082",
-            "",
-            "\1\u0083",
-            "\1\u0084",
-            "\1\u0085",
-            "",
-            "\1\u0086",
-            "",
-            "\1\u0087",
-            "\1\u0088",
-            "\1\u0089",
-            "\1\u008a",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\1\u008c",
-            "\1\u008d",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\1\u008f",
-            "\1\u0090",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\1\u0092",
-            "",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "",
-            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
+    static final String[] DFA12_transitionS = DFA12_transitionS_.DFA12_transitionS;
+    private static final class DFA12_transitionS_ {
+        static final String[] DFA12_transitionS = {
+                "\11\50\2\47\2\50\1\47\22\50\1\47\1\32\1\44\3\50\1\26\1\45\1\12\1\13\1\2\1\3\1\11\1\35\1\14\1\46\12\43\1\20\1\21\1\23\1\4\1\24\1\1\1\17\4\42\1\36\25\42\1\33\1\50\1\34\1\41\1\42\1\50\1\15\1\42\1\31\1\42\1\37\1\5\1\7\1\40\1\16\10\42\1\22\1\42\1\6\2\42\1\10\3\42\1\27\1\25\1\30\uff82\50",
+                "\1\51",
+                "",
+                "\1\54",
+                "\1\56",
+                "\1\60\20\uffff\1\61",
+                "\1\64\14\uffff\1\63",
+                "\1\66\14\uffff\1\65",
+                "\1\67",
+                "",
+                "",
+                "",
+                "\1\73",
+                "\1\75",
+                "\1\76",
+                "",
+                "\1\100",
+                "",
+                "\1\103",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "\1\112",
+                "",
+                "",
+                "",
+                "\1\116",
+                "\1\117",
+                "\1\120",
+                "\1\121",
+                "\32\62\4\uffff\1\62\1\uffff\32\62",
+                "",
+                "",
+                "\0\123",
+                "\0\123",
+                "\1\124\4\uffff\1\125",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "\1\127",
+                "\1\130",
+                "",
+                "\1\131",
+                "\1\132",
+                "\1\133",
+                "\1\134",
+                "\1\135",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\1\137",
+                "",
+                "",
+                "",
+                "",
+                "\1\140",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "\1\141",
+                "",
+                "",
+                "",
+                "",
+                "\1\142",
+                "\1\143",
+                "\1\144",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "\1\145",
+                "\1\146",
+                "\1\147",
+                "\1\150",
+                "\1\151",
+                "\1\152",
+                "\1\153",
+                "",
+                "\1\154",
+                "\1\155",
+                "\1\156",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\1\160",
+                "\1\161",
+                "\1\162",
+                "\1\163",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\1\165",
+                "\1\166",
+                "\1\167",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\1\171",
+                "\1\172",
+                "\1\173",
+                "",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\1\175",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\1\177",
+                "",
+                "\1\u0080",
+                "\1\u0081",
+                "\1\u0082",
+                "",
+                "\1\u0083",
+                "\1\u0084",
+                "\1\u0085",
+                "",
+                "\1\u0086",
+                "",
+                "\1\u0087",
+                "\1\u0088",
+                "\1\u0089",
+                "\1\u008a",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\1\u008c",
+                "\1\u008d",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\1\u008f",
+                "\1\u0090",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\1\u0092",
+                "",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "",
+                "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+                "",
+                "",
+                "",
+                "",
+                ""
+        };
+    }
 
     static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
     static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
diff --git a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextLexer.java b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextLexer.java
index eaaa9b5fb..ca7feaa24 100644
--- a/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextLexer.java
+++ b/org.eclipse.xtext/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextLexer.java
@@ -1745,160 +1745,163 @@ public class InternalXtextLexer extends Lexer {
         "\3\uffff\1\3\1\uffff\1\5\1\6\3\uffff\1\13\1\uffff\1\15\2\uffff\1\20\1\21\1\22\1\24\1\25\2\uffff\1\30\2\uffff\1\34\1\uffff\1\37\1\uffff\1\43\1\44\3\uffff\1\51\1\52\3\uffff\1\56\1\57\2\uffff\1\51\1\uffff\1\3\1\uffff\1\5\1\6\1\47\1\7\2\uffff\1\13\2\uffff\1\15\1\uffff\1\23\1\17\1\20\1\21\1\22\1\24\1\25\1\42\1\26\1\32\1\27\1\30\1\40\1\31\1\uffff\1\34\2\uffff\1\37\1\41\1\43\1\44\2\uffff\1\52\1\53\1\54\1\55\1\56\4\uffff\1\11\24\uffff\1\46\3\uffff\1\2\6\uffff\1\35\1\uffff\1\50\5\uffff\1\36\5\uffff\1\4\1\12\4\uffff\1\1\2\uffff\1\16\1\33\1\uffff\1\10\1\14\1\45";
     static final String DFA12_specialS =
         "\1\1\43\uffff\1\0\1\2\162\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\11\50\2\47\2\50\1\47\22\50\1\47\1\33\1\44\3\50\1\23\1\45\1\5\1\6\1\14\1\25\1\3\1\34\1\7\1\46\12\43\1\16\1\17\1\20\1\27\1\21\1\24\1\12\4\42\1\37\25\42\1\35\1\50\1\36\1\41\1\42\1\50\1\10\1\42\1\30\1\42\1\40\1\13\1\1\1\4\1\11\10\42\1\15\1\42\1\32\2\42\1\2\3\42\1\26\1\22\1\31\uff82\50",
-            "\1\52\14\uffff\1\51",
-            "\1\54",
-            "",
-            "\1\56",
-            "",
-            "",
-            "\1\61",
-            "\1\63",
-            "\1\64",
-            "",
-            "\1\67\20\uffff\1\66",
-            "",
-            "\1\71",
-            "\1\72",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\101",
-            "\1\103",
-            "",
-            "\1\106",
-            "\1\110",
-            "",
-            "\1\113\14\uffff\1\112",
-            "",
-            "\1\115",
-            "",
-            "",
-            "\1\120",
-            "\1\121",
-            "\32\53\4\uffff\1\53\1\uffff\32\53",
-            "",
-            "",
-            "\0\123",
-            "\0\123",
-            "\1\124\4\uffff\1\125",
-            "",
-            "",
-            "\1\127",
-            "\1\130",
-            "",
-            "\1\131",
-            "",
-            "\1\132",
-            "",
-            "",
-            "",
-            "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\134",
-            "",
-            "\1\135",
-            "\1\136",
-            "",
-            "\1\137",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\140",
-            "",
-            "\1\141",
-            "\1\142",
-            "",
-            "",
-            "",
-            "",
-            "\1\143",
-            "\1\144",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\145",
-            "\1\146",
-            "\1\147",
-            "\1\150",
-            "",
-            "\1\151",
-            "\1\152",
-            "\1\153",
-            "\1\154",
-            "\1\155",
-            "\1\156",
-            "\1\157",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\161",
-            "\1\162",
-            "\1\163",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\165",
-            "\1\166",
-            "\1\167",
-            "\1\170",
-            "\1\171",
-            "\1\172",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\174",
-            "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\176",
-            "\1\177",
-            "",
-            "\1\u0080",
-            "\1\u0081",
-            "\1\u0082",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u0084",
-            "\1\u0085",
-            "",
-            "\1\u0086",
-            "",
-            "\1\u0087",
-            "\1\u0088",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u008b",
-            "",
-            "\1\u008c",
-            "\1\u008d",
-            "\1\u008e",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u0090",
-            "",
-            "",
-            "\1\u0091",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u0094",
-            "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "",
-            "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "",
-            "",
-            ""
-    };
+    static final String[] DFA12_transitionS = DFA12_transitionS_.DFA12_transitionS;
+    private static final class DFA12_transitionS_ {
+        static final String[] DFA12_transitionS = {
+                "\11\50\2\47\2\50\1\47\22\50\1\47\1\33\1\44\3\50\1\23\1\45\1\5\1\6\1\14\1\25\1\3\1\34\1\7\1\46\12\43\1\16\1\17\1\20\1\27\1\21\1\24\1\12\4\42\1\37\25\42\1\35\1\50\1\36\1\41\1\42\1\50\1\10\1\42\1\30\1\42\1\40\1\13\1\1\1\4\1\11\10\42\1\15\1\42\1\32\2\42\1\2\3\42\1\26\1\22\1\31\uff82\50",
+                "\1\52\14\uffff\1\51",
+                "\1\54",
+                "",
+                "\1\56",
+                "",
+                "",
+                "\1\61",
+                "\1\63",
+                "\1\64",
+                "",
+                "\1\67\20\uffff\1\66",
+                "",
+                "\1\71",
+                "\1\72",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "\1\101",
+                "\1\103",
+                "",
+                "\1\106",
+                "\1\110",
+                "",
+                "\1\113\14\uffff\1\112",
+                "",
+                "\1\115",
+                "",
+                "",
+                "\1\120",
+                "\1\121",
+                "\32\53\4\uffff\1\53\1\uffff\32\53",
+                "",
+                "",
+                "\0\123",
+                "\0\123",
+                "\1\124\4\uffff\1\125",
+                "",
+                "",
+                "\1\127",
+                "\1\130",
+                "",
+                "\1\131",
+                "",
+                "\1\132",
+                "",
+                "",
+                "",
+                "",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\1\134",
+                "",
+                "\1\135",
+                "\1\136",
+                "",
+                "\1\137",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "\1\140",
+                "",
+                "\1\141",
+                "\1\142",
+                "",
+                "",
+                "",
+                "",
+                "\1\143",
+                "\1\144",
+                "",
+                "",
+                "",
+                "",
+                "",
+                "\1\145",
+                "\1\146",
+                "\1\147",
+                "\1\150",
+                "",
+                "\1\151",
+                "\1\152",
+                "\1\153",
+                "\1\154",
+                "\1\155",
+                "\1\156",
+                "\1\157",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\1\161",
+                "\1\162",
+                "\1\163",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\1\165",
+                "\1\166",
+                "\1\167",
+                "\1\170",
+                "\1\171",
+                "\1\172",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\1\174",
+                "",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\1\176",
+                "\1\177",
+                "",
+                "\1\u0080",
+                "\1\u0081",
+                "\1\u0082",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\1\u0084",
+                "\1\u0085",
+                "",
+                "\1\u0086",
+                "",
+                "\1\u0087",
+                "\1\u0088",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\1\u008b",
+                "",
+                "\1\u008c",
+                "\1\u008d",
+                "\1\u008e",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\1\u0090",
+                "",
+                "",
+                "\1\u0091",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\1\u0094",
+                "",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "",
+                "",
+                "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+                "",
+                "",
+                ""
+        };
+    }
 
     static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
     static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);