Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2015-12-01 22:28:04 +0000
committerTom Schindl2015-12-01 22:28:04 +0000
commit334f2863397c7e411607e31d3a8da0a01ef6b71d (patch)
treea715beddf642819f2a4b56433ca130f3795205fe
parentae635698665cdff60b8ec7ae3e3af0b47b82eada (diff)
downloadorg.eclipse.efxclipse-334f2863397c7e411607e31d3a8da0a01ef6b71d.tar.gz
org.eclipse.efxclipse-334f2863397c7e411607e31d3a8da0a01ef6b71d.tar.xz
org.eclipse.efxclipse-334f2863397c7e411607e31d3a8da0a01ef6b71d.zip
fixed compiler error
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.ui/.gitignore1
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.tokens2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefLexer.java274
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefParser.java16
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/LDef.xtextbinbin7710 -> 7713 bytes
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.tokens2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefLexer.java274
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefParser.java14
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/services/LDefGrammarAccess.java87
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbinbin8833 -> 9102 bytes
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/JSONConfigurationConfigurator.java14
13 files changed, 381 insertions, 313 deletions
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/.gitignore b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/.gitignore
index ae3c17260..09e3bc9b2 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/.gitignore
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/.gitignore
@@ -1 +1,2 @@
/bin/
+/target/
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g
index 3eaa29c4d..6f3df521c 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g
@@ -4374,11 +4374,11 @@ rule__TokenVisuals__Group__0__Impl
}
:
(
-{ before(grammarAccess.getTokenVisualsAccess().getColorsKeyword_0()); }
+{ before(grammarAccess.getTokenVisualsAccess().getToken_defKeyword_0()); }
- 'colors'
+ 'token_def'
-{ after(grammarAccess.getTokenVisualsAccess().getColorsKeyword_0()); }
+{ after(grammarAccess.getTokenVisualsAccess().getToken_defKeyword_0()); }
)
;
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.tokens b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.tokens
index df0d4d7d9..ed56d3599 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.tokens
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.tokens
@@ -12,7 +12,6 @@
'by'=34
'character'=44
'col'=31
-'colors'=37
'containing'=43
'default'=50
'e4'=24
@@ -36,6 +35,7 @@
'script'=28
'since'=41
'single_line'=30
+'token_def'=37
'whitespace'=47
'{'=19
'}'=20
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefLexer.java b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefLexer.java
index 5776de7da..8c5892dfe 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefLexer.java
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefLexer.java
@@ -617,10 +617,10 @@ public class InternalLDefLexer extends Lexer {
try {
int _type = T__37;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:37:7: ( 'colors' )
- // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:37:9: 'colors'
+ // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:37:7: ( 'token_def' )
+ // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:37:9: 'token_def'
{
- match("colors");
+ match("token_def");
}
@@ -1772,110 +1772,110 @@ public class InternalLDefLexer extends Lexer {
protected DFA12 dfa12 = new DFA12(this);
static final String DFA12_eotS =
- "\5\uffff\1\47\2\uffff\1\47\2\uffff\2\47\1\uffff\3\47\1\41\3\47\1\uffff\1\47\1\uffff\2\47\1\41\2\uffff\3\41\6\uffff\1\47\3\uffff\1\47\1\115\1\47\2\uffff\1\47\1\120\1\47\1\122\1\uffff\5\47\1\uffff\1\131\3\47\1\uffff\1\47\1\uffff\2\47\5\uffff\5\47\1\uffff\2\47\1\uffff\1\47\1\uffff\3\47\1\155\2\47\1\uffff\14\47\1\176\4\47\1\u0083\1\47\1\uffff\2\47\1\u0087\15\47\1\uffff\3\47\1\u0098\1\uffff\3\47\1\uffff\10\47\1\u00a4\1\47\1\u00a6\1\u00a7\2\47\1\u00aa\1\47\1\uffff\1\u00ac\7\47\1\u00b4\1\47\1\u00b6\1\uffff\1\47\2\uffff\1\47\1\u00b9\1\uffff\1\47\1\uffff\6\47\1\u00c1\1\uffff\1\47\1\uffff\2\47\1\uffff\5\47\1\u00ca\1\47\1\uffff\1\u00cd\4\47\1\u00d2\2\47\1\uffff\2\47\1\uffff\3\47\1\u00da\1\uffff\1\u00db\1\47\1\u00dd\1\47\1\u00df\1\47\1\u00e1\2\uffff\1\47\1\uffff\1\u00e3\1\uffff\1\47\1\uffff\1\47\1\uffff\2\47\1\u00e8\1\47\1\uffff\5\47\1\u00ef\1\uffff";
+ "\5\uffff\1\50\2\uffff\1\50\2\uffff\2\50\1\uffff\3\50\1\42\4\50\1\uffff\1\50\1\uffff\2\50\1\42\2\uffff\3\42\6\uffff\1\50\3\uffff\1\50\1\117\1\50\2\uffff\1\50\1\122\1\50\1\124\1\uffff\5\50\1\uffff\1\133\4\50\1\uffff\1\50\1\uffff\2\50\5\uffff\5\50\1\uffff\2\50\1\uffff\1\50\1\uffff\3\50\1\157\2\50\1\uffff\15\50\1\u0081\4\50\1\u0086\1\uffff\2\50\1\u0089\16\50\1\uffff\3\50\1\u009b\1\uffff\2\50\1\uffff\11\50\1\u00a7\1\50\1\u00a9\1\u00aa\2\50\1\u00ad\1\50\1\uffff\10\50\1\u00b7\1\50\1\u00b9\1\uffff\1\50\2\uffff\1\50\1\u00bc\1\uffff\10\50\1\u00c5\1\uffff\1\50\1\uffff\2\50\1\uffff\6\50\1\u00cf\1\50\1\uffff\1\u00d2\4\50\1\u00d7\2\50\1\u00da\1\uffff\2\50\1\uffff\3\50\1\u00e0\1\uffff\1\u00e1\1\50\1\uffff\1\u00e3\1\50\1\u00e5\1\50\1\u00e7\2\uffff\1\50\1\uffff\1\u00e9\1\uffff\1\50\1\uffff\1\50\1\uffff\2\50\1\u00ee\1\50\1\uffff\5\50\1\u00f5\1\uffff";
static final String DFA12_eofS =
- "\u00f0\uffff";
+ "\u00f6\uffff";
static final String DFA12_minS =
- "\1\0\4\uffff\1\141\2\uffff\1\155\2\uffff\1\141\1\64\1\uffff\1\143\1\165\1\150\1\76\1\157\1\165\1\145\1\uffff\1\145\1\uffff\1\150\1\145\1\101\2\uffff\2\0\1\52\6\uffff\1\143\3\uffff\1\160\1\60\1\141\2\uffff\1\166\1\60\1\143\1\60\1\uffff\1\162\1\156\2\154\1\141\1\uffff\1\60\2\154\1\170\1\uffff\1\171\1\uffff\1\151\1\146\5\uffff\1\153\2\164\1\157\1\145\1\uffff\1\154\1\141\1\uffff\1\141\1\uffff\1\151\1\143\1\145\1\60\1\164\1\162\1\uffff\1\144\1\164\1\151\1\167\1\164\2\141\1\151\1\145\1\162\1\147\1\151\1\60\2\160\1\154\1\145\1\60\1\162\1\uffff\2\141\1\60\1\151\1\143\1\157\1\145\1\165\1\147\1\164\1\162\1\164\1\162\1\143\1\170\1\150\1\uffff\1\145\1\164\1\145\1\60\1\uffff\1\163\1\151\1\143\1\uffff\1\137\1\141\1\162\1\163\1\154\1\145\1\151\1\156\1\60\1\141\2\60\1\151\1\144\1\60\1\137\1\uffff\1\60\1\156\1\164\2\154\1\144\1\160\1\164\1\60\1\157\1\60\1\uffff\1\164\2\uffff\1\164\1\60\1\uffff\1\154\1\uffff\1\151\1\145\1\151\1\137\1\163\1\141\1\60\1\uffff\1\156\1\uffff\1\151\1\145\1\uffff\1\151\1\156\1\162\1\156\1\150\1\60\1\143\1\uffff\1\60\1\157\1\163\1\156\1\147\1\60\1\145\1\151\1\uffff\1\145\1\156\1\uffff\1\156\1\160\1\145\1\60\1\uffff\1\60\1\147\1\60\1\147\1\60\1\141\1\60\2\uffff\1\150\1\uffff\1\60\1\uffff\1\143\1\uffff\1\154\1\uffff\1\145\1\151\1\60\1\147\1\uffff\1\150\1\164\1\151\1\156\1\147\1\60\1\uffff";
+ "\1\0\4\uffff\1\141\2\uffff\1\155\2\uffff\1\141\1\64\1\uffff\1\143\1\165\1\150\1\76\1\157\1\165\1\145\1\157\1\uffff\1\145\1\uffff\1\150\1\145\1\101\2\uffff\2\0\1\52\6\uffff\1\143\3\uffff\1\160\1\60\1\141\2\uffff\1\166\1\60\1\143\1\60\1\uffff\1\162\1\156\2\154\1\141\1\uffff\1\60\2\154\1\170\1\153\1\uffff\1\171\1\uffff\1\151\1\146\5\uffff\1\153\2\164\1\157\1\145\1\uffff\1\154\1\141\1\uffff\1\141\1\uffff\1\151\1\143\1\145\1\60\1\164\1\162\1\uffff\1\144\1\164\1\151\1\145\1\167\1\164\2\141\1\151\1\145\1\162\1\147\1\151\1\60\2\160\1\154\1\145\1\60\1\uffff\2\141\1\60\1\151\1\143\1\156\1\157\1\145\1\165\1\147\1\164\1\162\1\164\1\162\1\143\1\170\1\150\1\uffff\1\145\1\164\1\145\1\60\1\uffff\1\151\1\143\1\uffff\1\137\1\141\1\137\1\162\1\163\1\154\1\145\1\151\1\156\1\60\1\141\2\60\1\151\1\144\1\60\1\137\1\uffff\1\156\1\164\2\154\2\144\1\160\1\164\1\60\1\157\1\60\1\uffff\1\164\2\uffff\1\164\1\60\1\uffff\1\154\1\151\1\145\1\151\1\137\1\145\1\163\1\141\1\60\1\uffff\1\156\1\uffff\1\151\1\145\1\uffff\1\151\1\156\1\162\1\156\1\150\1\146\1\60\1\143\1\uffff\1\60\1\157\1\163\1\156\1\147\1\60\1\145\1\151\1\60\1\uffff\1\145\1\156\1\uffff\1\156\1\160\1\145\1\60\1\uffff\1\60\1\147\1\uffff\1\60\1\147\1\60\1\141\1\60\2\uffff\1\150\1\uffff\1\60\1\uffff\1\143\1\uffff\1\154\1\uffff\1\145\1\151\1\60\1\147\1\uffff\1\150\1\164\1\151\1\156\1\147\1\60\1\uffff";
static final String DFA12_maxS =
- "\1\uffff\4\uffff\1\141\2\uffff\1\164\2\uffff\1\141\1\163\1\uffff\1\151\1\165\1\157\1\76\1\171\1\165\1\145\1\uffff\1\145\1\uffff\1\150\1\145\1\172\2\uffff\2\uffff\1\57\6\uffff\1\164\3\uffff\1\160\1\172\1\141\2\uffff\1\166\1\172\1\143\1\172\1\uffff\1\162\1\156\1\154\1\156\1\141\1\uffff\1\172\2\154\1\170\1\uffff\1\171\1\uffff\1\151\1\146\5\uffff\1\153\2\164\1\157\1\145\1\uffff\1\154\1\141\1\uffff\1\141\1\uffff\1\151\1\147\1\145\1\172\1\164\1\162\1\uffff\1\144\1\164\1\151\1\167\1\164\2\141\1\151\1\145\1\162\1\147\1\151\1\172\2\160\1\154\1\145\1\172\1\162\1\uffff\2\141\1\172\1\151\1\143\1\157\1\145\1\165\1\147\1\164\1\162\1\164\1\162\1\143\1\170\1\150\1\uffff\1\145\1\164\1\145\1\172\1\uffff\1\163\1\151\1\143\1\uffff\1\137\1\141\1\162\1\163\1\154\1\145\1\151\1\156\1\172\1\141\2\172\1\151\1\144\1\172\1\137\1\uffff\1\172\1\156\1\164\2\154\1\144\1\160\1\164\1\172\1\157\1\172\1\uffff\1\164\2\uffff\1\164\1\172\1\uffff\1\154\1\uffff\1\151\1\145\1\151\1\137\1\163\1\141\1\172\1\uffff\1\156\1\uffff\1\151\1\145\1\uffff\1\151\1\156\1\162\1\156\1\150\1\172\1\143\1\uffff\1\172\1\157\1\163\1\156\1\147\1\172\1\145\1\151\1\uffff\1\145\1\156\1\uffff\1\156\1\160\1\145\1\172\1\uffff\1\172\1\147\1\172\1\147\1\172\1\141\1\172\2\uffff\1\150\1\uffff\1\172\1\uffff\1\143\1\uffff\1\154\1\uffff\1\145\1\151\1\172\1\147\1\uffff\1\150\1\164\1\151\1\156\1\147\1\172\1\uffff";
+ "\1\uffff\4\uffff\1\141\2\uffff\1\164\2\uffff\1\141\1\163\1\uffff\1\151\1\165\1\157\1\76\1\171\1\165\1\145\1\157\1\uffff\1\145\1\uffff\1\150\1\145\1\172\2\uffff\2\uffff\1\57\6\uffff\1\164\3\uffff\1\160\1\172\1\141\2\uffff\1\166\1\172\1\143\1\172\1\uffff\1\162\1\156\1\154\1\156\1\141\1\uffff\1\172\2\154\1\170\1\153\1\uffff\1\171\1\uffff\1\151\1\146\5\uffff\1\153\2\164\1\157\1\145\1\uffff\1\154\1\141\1\uffff\1\141\1\uffff\1\151\1\147\1\145\1\172\1\164\1\162\1\uffff\1\144\1\164\1\151\1\145\1\167\1\164\2\141\1\151\1\145\1\162\1\147\1\151\1\172\2\160\1\154\1\145\1\172\1\uffff\2\141\1\172\1\151\1\143\1\156\1\157\1\145\1\165\1\147\1\164\1\162\1\164\1\162\1\143\1\170\1\150\1\uffff\1\145\1\164\1\145\1\172\1\uffff\1\151\1\143\1\uffff\1\137\1\141\1\137\1\162\1\163\1\154\1\145\1\151\1\156\1\172\1\141\2\172\1\151\1\144\1\172\1\137\1\uffff\1\156\1\164\2\154\2\144\1\160\1\164\1\172\1\157\1\172\1\uffff\1\164\2\uffff\1\164\1\172\1\uffff\1\154\1\151\1\145\1\151\1\137\1\145\1\163\1\141\1\172\1\uffff\1\156\1\uffff\1\151\1\145\1\uffff\1\151\1\156\1\162\1\156\1\150\1\146\1\172\1\143\1\uffff\1\172\1\157\1\163\1\156\1\147\1\172\1\145\1\151\1\172\1\uffff\1\145\1\156\1\uffff\1\156\1\160\1\145\1\172\1\uffff\1\172\1\147\1\uffff\1\172\1\147\1\172\1\141\1\172\2\uffff\1\150\1\uffff\1\172\1\uffff\1\143\1\uffff\1\154\1\uffff\1\145\1\151\1\172\1\147\1\uffff\1\150\1\164\1\151\1\156\1\147\1\172\1\uffff";
static final String DFA12_acceptS =
- "\1\uffff\1\1\1\2\1\3\1\4\1\uffff\1\6\1\7\1\uffff\1\11\1\12\2\uffff\1\17\7\uffff\1\34\1\uffff\1\36\3\uffff\1\52\1\53\3\uffff\1\57\1\60\1\1\1\2\1\3\1\4\1\uffff\1\52\1\6\1\7\3\uffff\1\11\1\12\4\uffff\1\17\5\uffff\1\26\4\uffff\1\34\1\uffff\1\36\2\uffff\1\53\1\54\1\55\1\56\1\57\5\uffff\1\44\2\uffff\1\16\1\uffff\1\43\6\uffff\1\30\23\uffff\1\25\20\uffff\1\15\4\uffff\1\23\3\uffff\1\46\20\uffff\1\37\13\uffff\1\10\1\uffff\1\47\1\14\2\uffff\1\22\1\uffff\1\33\7\uffff\1\5\1\uffff\1\40\2\uffff\1\27\7\uffff\1\50\10\uffff\1\35\2\uffff\1\21\4\uffff\1\42\7\uffff\1\41\1\31\1\uffff\1\45\1\uffff\1\13\1\uffff\1\24\1\uffff\1\20\4\uffff\1\51\6\uffff\1\32";
+ "\1\uffff\1\1\1\2\1\3\1\4\1\uffff\1\6\1\7\1\uffff\1\11\1\12\2\uffff\1\17\10\uffff\1\34\1\uffff\1\36\3\uffff\1\52\1\53\3\uffff\1\57\1\60\1\1\1\2\1\3\1\4\1\uffff\1\52\1\6\1\7\3\uffff\1\11\1\12\4\uffff\1\17\5\uffff\1\26\5\uffff\1\34\1\uffff\1\36\2\uffff\1\53\1\54\1\55\1\56\1\57\5\uffff\1\44\2\uffff\1\16\1\uffff\1\43\6\uffff\1\30\23\uffff\1\25\21\uffff\1\15\4\uffff\1\23\2\uffff\1\46\21\uffff\1\37\13\uffff\1\10\1\uffff\1\47\1\14\2\uffff\1\22\11\uffff\1\5\1\uffff\1\40\2\uffff\1\27\10\uffff\1\50\11\uffff\1\35\2\uffff\1\21\4\uffff\1\42\2\uffff\1\33\5\uffff\1\41\1\31\1\uffff\1\45\1\uffff\1\13\1\uffff\1\24\1\uffff\1\20\4\uffff\1\51\6\uffff\1\32";
static final String DFA12_specialS =
- "\1\1\34\uffff\1\2\1\0\u00d1\uffff}>";
+ "\1\2\35\uffff\1\1\1\0\u00d6\uffff}>";
static final String[] DFA12_transitionS = {
- "\11\41\2\40\2\41\1\40\22\41\1\40\1\41\1\35\4\41\1\36\1\1\1\3\1\7\1\41\1\27\1\41\1\6\1\37\12\34\1\15\1\25\1\41\1\21\3\41\32\33\1\2\1\41\1\4\1\32\1\33\1\41\1\33\1\22\1\20\1\31\1\14\3\33\1\10\1\13\1\26\1\24\1\23\2\33\1\5\1\33\1\17\1\16\3\33\1\30\3\33\1\11\1\41\1\12\uff82\41",
+ "\11\42\2\41\2\42\1\41\22\42\1\41\1\42\1\36\4\42\1\37\1\1\1\3\1\7\1\42\1\30\1\42\1\6\1\40\12\35\1\15\1\26\1\42\1\21\3\42\32\34\1\2\1\42\1\4\1\33\1\34\1\42\1\34\1\22\1\20\1\32\1\14\3\34\1\10\1\13\1\27\1\24\1\23\2\34\1\5\1\34\1\17\1\16\1\25\2\34\1\31\3\34\1\11\1\42\1\12\uff82\42",
"",
"",
"",
"",
- "\1\46",
+ "\1\47",
"",
"",
- "\1\52\1\53\5\uffff\1\54",
+ "\1\53\1\54\5\uffff\1\55",
"",
"",
- "\1\57",
- "\1\60\74\uffff\1\62\1\uffff\1\61",
+ "\1\60",
+ "\1\61\74\uffff\1\63\1\uffff\1\62",
"",
- "\1\64\5\uffff\1\65",
- "\1\66",
- "\1\70\6\uffff\1\67",
- "\1\71",
- "\1\73\11\uffff\1\72",
- "\1\74",
+ "\1\65\5\uffff\1\66",
+ "\1\67",
+ "\1\71\6\uffff\1\70",
+ "\1\72",
+ "\1\74\11\uffff\1\73",
"\1\75",
- "",
+ "\1\76",
"\1\77",
"",
"\1\101",
- "\1\102",
- "\32\47\4\uffff\1\47\1\uffff\32\47",
"",
+ "\1\103",
+ "\1\104",
+ "\32\50\4\uffff\1\50\1\uffff\32\50",
"",
- "\0\104",
- "\0\104",
- "\1\105\4\uffff\1\106",
"",
+ "\0\106",
+ "\0\106",
+ "\1\107\4\uffff\1\110",
"",
"",
"",
"",
"",
- "\1\110\16\uffff\1\111\1\uffff\1\112",
"",
+ "\1\112\16\uffff\1\113\1\uffff\1\114",
"",
"",
- "\1\113",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\23\47\1\114\6\47",
- "\1\116",
"",
+ "\1\115",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\23\50\1\116\6\50",
+ "\1\120",
"",
- "\1\117",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
- "\1\121",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
"",
+ "\1\121",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\123",
- "\1\124",
- "\1\125",
- "\1\126\1\uffff\1\127",
- "\1\130",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\1\125",
+ "\1\126",
+ "\1\127",
+ "\1\130\1\uffff\1\131",
"\1\132",
- "\1\133",
- "\1\134",
"",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+ "\1\134",
"\1\135",
- "",
"\1\136",
"\1\137",
"",
+ "\1\140",
+ "",
+ "\1\141",
+ "\1\142",
+ "",
"",
"",
"",
"",
- "\1\140",
- "\1\141",
- "\1\142",
"\1\143",
"\1\144",
- "",
"\1\145",
"\1\146",
- "",
"\1\147",
"",
"\1\150",
- "\1\152\3\uffff\1\151",
+ "\1\151",
+ "",
+ "\1\152",
+ "",
"\1\153",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\16\47\1\154\13\47",
+ "\1\155\3\uffff\1\154",
"\1\156",
- "\1\157",
- "",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\160",
"\1\161",
+ "",
"\1\162",
"\1\163",
"\1\164",
@@ -1886,19 +1886,19 @@ public class InternalLDefLexer extends Lexer {
"\1\171",
"\1\172",
"\1\173",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\5\47\1\174\20\47\1\175\3\47",
- "\1\177",
- "\1\u0080",
- "\1\u0081",
+ "\1\174",
+ "\1\175",
+ "\1\176",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\5\50\1\177\20\50\1\u0080\3\50",
"\1\u0082",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\1\u0083",
"\1\u0084",
- "",
"\1\u0085",
- "\1\u0086",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+ "",
+ "\1\u0087",
"\1\u0088",
- "\1\u0089",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\u008a",
"\1\u008b",
"\1\u008c",
@@ -1910,119 +1910,125 @@ public class InternalLDefLexer extends Lexer {
"\1\u0092",
"\1\u0093",
"\1\u0094",
- "",
"\1\u0095",
"\1\u0096",
"\1\u0097",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
"",
+ "\1\u0098",
"\1\u0099",
"\1\u009a",
- "\1\u009b",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"",
"\1\u009c",
"\1\u009d",
+ "",
"\1\u009e",
"\1\u009f",
"\1\u00a0",
"\1\u00a1",
"\1\u00a2",
"\1\u00a3",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\1\u00a4",
"\1\u00a5",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\1\u00a6",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\u00a8",
- "\1\u00a9",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\u00ab",
- "",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
- "\1\u00ad",
+ "\1\u00ac",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\u00ae",
+ "",
"\1\u00af",
"\1\u00b0",
"\1\u00b1",
"\1\u00b2",
"\1\u00b3",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\1\u00b4",
"\1\u00b5",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
- "",
- "\1\u00b7",
- "",
- "",
+ "\1\u00b6",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\u00b8",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"",
"\1\u00ba",
"",
+ "",
"\1\u00bb",
- "\1\u00bc",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+ "",
"\1\u00bd",
"\1\u00be",
"\1\u00bf",
"\1\u00c0",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
- "",
+ "\1\u00c1",
"\1\u00c2",
- "",
"\1\u00c3",
"\1\u00c4",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"",
- "\1\u00c5",
"\1\u00c6",
+ "",
"\1\u00c7",
"\1\u00c8",
+ "",
"\1\u00c9",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\1\u00ca",
"\1\u00cb",
- "",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\10\47\1\u00cc\21\47",
+ "\1\u00cc",
+ "\1\u00cd",
"\1\u00ce",
- "\1\u00cf",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\u00d0",
- "\1\u00d1",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\10\50\1\u00d1\21\50",
"\1\u00d3",
"\1\u00d4",
- "",
"\1\u00d5",
"\1\u00d6",
- "",
- "\1\u00d7",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\u00d8",
"\1\u00d9",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\1\u00db",
"\1\u00dc",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
- "\1\u00de",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
- "\1\u00e0",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
"",
+ "\1\u00dd",
+ "\1\u00de",
+ "\1\u00df",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\u00e2",
"",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
- "",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"\1\u00e4",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+ "\1\u00e6",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"",
- "\1\u00e5",
"",
- "\1\u00e6",
- "\1\u00e7",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
- "\1\u00e9",
+ "\1\u00e8",
+ "",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
"",
"\1\u00ea",
+ "",
"\1\u00eb",
+ "",
"\1\u00ec",
"\1\u00ed",
- "\1\u00ee",
- "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+ "\1\u00ef",
+ "",
+ "\1\u00f0",
+ "\1\u00f1",
+ "\1\u00f2",
+ "\1\u00f3",
+ "\1\u00f4",
+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
""
};
@@ -2063,16 +2069,26 @@ public class InternalLDefLexer extends Lexer {
int _s = s;
switch ( s ) {
case 0 :
- int LA12_30 = input.LA(1);
+ int LA12_31 = input.LA(1);
s = -1;
- if ( ((LA12_30>='\u0000' && LA12_30<='\uFFFF')) ) {s = 68;}
+ if ( ((LA12_31>='\u0000' && LA12_31<='\uFFFF')) ) {s = 70;}
- else s = 33;
+ else s = 34;
if ( s>=0 ) return s;
break;
case 1 :
+ int LA12_30 = input.LA(1);
+
+ s = -1;
+ if ( ((LA12_30>='\u0000' && LA12_30<='\uFFFF')) ) {s = 70;}
+
+ else s = 34;
+
+ if ( s>=0 ) return s;
+ break;
+ case 2 :
int LA12_0 = input.LA(1);
s = -1;
@@ -2116,41 +2132,33 @@ public class InternalLDefLexer extends Lexer {
else if ( (LA12_0=='l') ) {s = 20;}
- else if ( (LA12_0==';') ) {s = 21;}
-
- else if ( (LA12_0=='k') ) {s = 22;}
-
- else if ( (LA12_0==',') ) {s = 23;}
+ else if ( (LA12_0=='t') ) {s = 21;}
- else if ( (LA12_0=='w') ) {s = 24;}
+ else if ( (LA12_0==';') ) {s = 22;}
- else if ( (LA12_0=='d') ) {s = 25;}
+ else if ( (LA12_0=='k') ) {s = 23;}
- else if ( (LA12_0=='^') ) {s = 26;}
+ else if ( (LA12_0==',') ) {s = 24;}
- else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='a'||(LA12_0>='f' && LA12_0<='h')||(LA12_0>='n' && LA12_0<='o')||LA12_0=='q'||(LA12_0>='t' && LA12_0<='v')||(LA12_0>='x' && LA12_0<='z')) ) {s = 27;}
+ else if ( (LA12_0=='w') ) {s = 25;}
- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 28;}
+ else if ( (LA12_0=='d') ) {s = 26;}
- else if ( (LA12_0=='\"') ) {s = 29;}
+ else if ( (LA12_0=='^') ) {s = 27;}
- else if ( (LA12_0=='\'') ) {s = 30;}
+ else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='a'||(LA12_0>='f' && LA12_0<='h')||(LA12_0>='n' && LA12_0<='o')||LA12_0=='q'||(LA12_0>='u' && LA12_0<='v')||(LA12_0>='x' && LA12_0<='z')) ) {s = 28;}
- else if ( (LA12_0=='/') ) {s = 31;}
+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 29;}
- else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 32;}
+ else if ( (LA12_0=='\"') ) {s = 30;}
- else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||LA12_0=='+'||LA12_0=='-'||LA12_0=='<'||(LA12_0>='>' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 33;}
+ else if ( (LA12_0=='\'') ) {s = 31;}
- if ( s>=0 ) return s;
- break;
- case 2 :
- int LA12_29 = input.LA(1);
+ else if ( (LA12_0=='/') ) {s = 32;}
- s = -1;
- if ( ((LA12_29>='\u0000' && LA12_29<='\uFFFF')) ) {s = 68;}
+ else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 33;}
- else s = 33;
+ else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||LA12_0=='+'||LA12_0=='-'||LA12_0=='<'||(LA12_0>='>' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 34;}
if ( s>=0 ) return s;
break;
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefParser.java b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefParser.java
index 6044537b7..c4e49bf50 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefParser.java
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDefParser.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
@SuppressWarnings("all")
public class InternalLDefParser extends AbstractInternalContentAssistParser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'('", "'['", "')'", "']'", "'package'", "'.'", "'*'", "'import'", "'{'", "'}'", "'integration'", "'javafx'", "'java'", "'e4'", "':'", "'partitioning'", "'partition'", "'script'", "'rule'", "'single_line'", "'col'", "'=>'", "'escaped'", "'by'", "'multi_line'", "'lexical_highlighting'", "'colors'", "';'", "'keywords'", "','", "'since'", "'pattern'", "'containing'", "'character'", "'eq'", "'in'", "'whitespace'", "'bold'", "'italic'", "'default'", "'javawhitespace'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'('", "'['", "')'", "']'", "'package'", "'.'", "'*'", "'import'", "'{'", "'}'", "'integration'", "'javafx'", "'java'", "'e4'", "':'", "'partitioning'", "'partition'", "'script'", "'rule'", "'single_line'", "'col'", "'=>'", "'escaped'", "'by'", "'multi_line'", "'lexical_highlighting'", "'token_def'", "';'", "'keywords'", "','", "'since'", "'pattern'", "'containing'", "'character'", "'eq'", "'in'", "'whitespace'", "'bold'", "'italic'", "'default'", "'javawhitespace'"
};
public static final int T__50=50;
public static final int T__19=19;
@@ -12605,24 +12605,24 @@ public class InternalLDefParser extends AbstractInternalContentAssistParser {
// $ANTLR start "rule__TokenVisuals__Group__0__Impl"
- // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4371:1: rule__TokenVisuals__Group__0__Impl : ( 'colors' ) ;
+ // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4371:1: rule__TokenVisuals__Group__0__Impl : ( 'token_def' ) ;
public final void rule__TokenVisuals__Group__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4375:1: ( ( 'colors' ) )
- // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4376:1: ( 'colors' )
+ // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4375:1: ( ( 'token_def' ) )
+ // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4376:1: ( 'token_def' )
{
- // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4376:1: ( 'colors' )
- // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4377:1: 'colors'
+ // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4376:1: ( 'token_def' )
+ // ../org.eclipse.fx.code.editor.ldef.ui/src-gen/org/eclipse/fx/code/editor/ldef/ui/contentassist/antlr/internal/InternalLDef.g:4377:1: 'token_def'
{
if ( state.backtracking==0 ) {
- before(grammarAccess.getTokenVisualsAccess().getColorsKeyword_0());
+ before(grammarAccess.getTokenVisualsAccess().getToken_defKeyword_0());
}
match(input,37,FOLLOW_37_in_rule__TokenVisuals__Group__0__Impl8858); if (state.failed) return ;
if ( state.backtracking==0 ) {
- after(grammarAccess.getTokenVisualsAccess().getColorsKeyword_0());
+ after(grammarAccess.getTokenVisualsAccess().getToken_defKeyword_0());
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/LDef.xtextbin b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/LDef.xtextbin
index dba6f6624..41693b0dc 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/LDef.xtextbin
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/LDef.xtextbin
Binary files differ
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g
index a83b9d7c6..23ae13b86 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g
@@ -1428,9 +1428,9 @@ ruleTokenVisuals returns [EObject current=null]
@init { enterRule();
}
@after { leaveRule(); }:
-( otherlv_0='colors'
+( otherlv_0='token_def'
{
- newLeafNode(otherlv_0, grammarAccess.getTokenVisualsAccess().getColorsKeyword_0());
+ newLeafNode(otherlv_0, grammarAccess.getTokenVisualsAccess().getToken_defKeyword_0());
}
otherlv_1='{'
{
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.tokens b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.tokens
index c85e2fd88..032f8a229 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.tokens
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.tokens
@@ -12,7 +12,6 @@
'by'=30
'character'=45
'col'=27
-'colors'=33
'containing'=44
'default'=37
'e4'=20
@@ -36,6 +35,7 @@
'script'=24
'since'=42
'single_line'=26
+'token_def'=33
'whitespace'=50
'{'=15
'}'=16
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefLexer.java b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefLexer.java
index 78842cf54..1b9c2f2e7 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefLexer.java
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefLexer.java
@@ -537,10 +537,10 @@ public class InternalLDefLexer extends Lexer {
try {
int _type = T__33;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:33:7: ( 'colors' )
- // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:33:9: 'colors'
+ // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:33:7: ( 'token_def' )
+ // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:33:9: 'token_def'
{
- match("colors");
+ match("token_def");
}
@@ -1772,110 +1772,110 @@ public class InternalLDefLexer extends Lexer {
protected DFA12 dfa12 = new DFA12(this);
static final String DFA12_eotS =
- "\1\uffff\1\43\2\uffff\1\43\2\uffff\2\43\1\uffff\3\43\1\41\3\43\1\uffff\2\43\5\uffff\1\43\1\41\2\uffff\3\41\2\uffff\1\43\3\uffff\1\43\1\115\1\43\2\uffff\1\43\1\120\1\43\1\122\1\uffff\5\43\1\uffff\1\131\3\43\1\uffff\2\43\5\uffff\1\43\5\uffff\5\43\1\uffff\2\43\1\uffff\1\43\1\uffff\3\43\1\155\2\43\1\uffff\14\43\1\176\4\43\1\u0083\1\43\1\uffff\2\43\1\u0087\15\43\1\uffff\3\43\1\u0098\1\uffff\3\43\1\uffff\10\43\1\u00a4\1\43\1\u00a6\1\u00a7\2\43\1\u00aa\1\43\1\uffff\1\u00ac\7\43\1\u00b4\1\43\1\u00b6\1\uffff\1\43\2\uffff\1\43\1\u00b9\1\uffff\1\43\1\uffff\4\43\1\u00bf\2\43\1\uffff\1\43\1\uffff\2\43\1\uffff\5\43\1\uffff\1\u00ca\1\43\1\u00cd\4\43\1\u00d2\2\43\1\uffff\2\43\1\uffff\3\43\1\u00da\1\uffff\1\u00db\1\43\1\u00dd\1\43\1\u00df\1\43\1\u00e1\2\uffff\1\43\1\uffff\1\u00e3\1\uffff\1\43\1\uffff\1\43\1\uffff\2\43\1\u00e8\1\43\1\uffff\5\43\1\u00ef\1\uffff";
+ "\1\uffff\1\44\2\uffff\1\44\2\uffff\2\44\1\uffff\3\44\1\42\4\44\1\uffff\2\44\5\uffff\1\44\1\42\2\uffff\3\42\2\uffff\1\44\3\uffff\1\44\1\117\1\44\2\uffff\1\44\1\122\1\44\1\124\1\uffff\5\44\1\uffff\1\133\4\44\1\uffff\2\44\5\uffff\1\44\5\uffff\5\44\1\uffff\2\44\1\uffff\1\44\1\uffff\3\44\1\157\2\44\1\uffff\15\44\1\u0081\4\44\1\u0086\1\uffff\2\44\1\u0089\16\44\1\uffff\3\44\1\u009b\1\uffff\2\44\1\uffff\11\44\1\u00a7\1\44\1\u00a9\1\u00aa\2\44\1\u00ad\1\44\1\uffff\10\44\1\u00b7\1\44\1\u00b9\1\uffff\1\44\2\uffff\1\44\1\u00bc\1\uffff\6\44\1\u00c3\2\44\1\uffff\1\44\1\uffff\2\44\1\uffff\6\44\1\uffff\1\u00cf\1\44\1\u00d2\4\44\1\u00d7\2\44\1\u00da\1\uffff\2\44\1\uffff\3\44\1\u00e0\1\uffff\1\u00e1\1\44\1\uffff\1\u00e3\1\44\1\u00e5\1\44\1\u00e7\2\uffff\1\44\1\uffff\1\u00e9\1\uffff\1\44\1\uffff\1\44\1\uffff\2\44\1\u00ee\1\44\1\uffff\5\44\1\u00f5\1\uffff";
static final String DFA12_eofS =
- "\u00f0\uffff";
+ "\u00f6\uffff";
static final String DFA12_minS =
- "\1\0\1\141\2\uffff\1\155\2\uffff\1\141\1\64\1\uffff\1\143\1\165\1\150\1\76\1\157\1\165\1\145\1\uffff\2\145\5\uffff\1\150\1\101\2\uffff\2\0\1\52\2\uffff\1\143\3\uffff\1\160\1\60\1\141\2\uffff\1\166\1\60\1\143\1\60\1\uffff\1\162\1\156\2\154\1\141\1\uffff\1\60\2\154\1\170\1\uffff\1\146\1\171\5\uffff\1\151\5\uffff\1\153\2\164\1\157\1\145\1\uffff\1\154\1\141\1\uffff\1\141\1\uffff\1\151\1\143\1\145\1\60\1\164\1\162\1\uffff\1\144\1\164\1\151\1\141\1\167\1\164\1\141\1\151\1\145\1\162\1\147\1\151\1\60\2\160\1\154\1\145\1\60\1\162\1\uffff\2\141\1\60\1\151\1\143\1\165\1\157\1\145\1\147\1\164\1\162\1\164\1\162\1\143\1\170\1\150\1\uffff\1\145\1\164\1\145\1\60\1\uffff\1\163\1\151\1\143\1\uffff\1\137\1\141\1\154\1\162\1\163\1\145\1\151\1\156\1\60\1\141\2\60\1\151\1\144\1\60\1\137\1\uffff\1\60\1\156\1\164\2\154\1\164\1\144\1\160\1\60\1\157\1\60\1\uffff\1\164\2\uffff\1\164\1\60\1\uffff\1\154\1\uffff\1\151\1\145\1\151\1\137\1\60\1\163\1\141\1\uffff\1\156\1\uffff\1\151\1\145\1\uffff\1\151\1\156\1\162\1\156\1\150\1\uffff\1\60\1\143\1\60\1\157\1\163\1\156\1\147\1\60\1\145\1\151\1\uffff\1\145\1\156\1\uffff\1\156\1\160\1\145\1\60\1\uffff\1\60\1\147\1\60\1\147\1\60\1\141\1\60\2\uffff\1\150\1\uffff\1\60\1\uffff\1\143\1\uffff\1\154\1\uffff\1\145\1\151\1\60\1\147\1\uffff\1\150\1\164\1\151\1\156\1\147\1\60\1\uffff";
+ "\1\0\1\141\2\uffff\1\155\2\uffff\1\141\1\64\1\uffff\1\143\1\165\1\150\1\76\1\157\1\165\1\145\1\157\1\uffff\2\145\5\uffff\1\150\1\101\2\uffff\2\0\1\52\2\uffff\1\143\3\uffff\1\160\1\60\1\141\2\uffff\1\166\1\60\1\143\1\60\1\uffff\1\162\1\156\2\154\1\141\1\uffff\1\60\2\154\1\170\1\153\1\uffff\1\146\1\171\5\uffff\1\151\5\uffff\1\153\2\164\1\157\1\145\1\uffff\1\154\1\141\1\uffff\1\141\1\uffff\1\151\1\143\1\145\1\60\1\164\1\162\1\uffff\1\144\1\164\1\151\1\145\1\141\1\167\1\164\1\141\1\151\1\145\1\162\1\147\1\151\1\60\2\160\1\154\1\145\1\60\1\uffff\2\141\1\60\1\151\1\143\1\156\1\165\1\157\1\145\1\147\1\164\1\162\1\164\1\162\1\143\1\170\1\150\1\uffff\1\145\1\164\1\145\1\60\1\uffff\1\151\1\143\1\uffff\1\137\1\141\1\137\1\154\1\162\1\163\1\145\1\151\1\156\1\60\1\141\2\60\1\151\1\144\1\60\1\137\1\uffff\1\156\1\164\2\154\1\144\1\164\1\144\1\160\1\60\1\157\1\60\1\uffff\1\164\2\uffff\1\164\1\60\1\uffff\1\154\1\151\1\145\1\151\1\137\1\145\1\60\1\163\1\141\1\uffff\1\156\1\uffff\1\151\1\145\1\uffff\1\151\1\156\1\162\1\156\1\150\1\146\1\uffff\1\60\1\143\1\60\1\157\1\163\1\156\1\147\1\60\1\145\1\151\1\60\1\uffff\1\145\1\156\1\uffff\1\156\1\160\1\145\1\60\1\uffff\1\60\1\147\1\uffff\1\60\1\147\1\60\1\141\1\60\2\uffff\1\150\1\uffff\1\60\1\uffff\1\143\1\uffff\1\154\1\uffff\1\145\1\151\1\60\1\147\1\uffff\1\150\1\164\1\151\1\156\1\147\1\60\1\uffff";
static final String DFA12_maxS =
- "\1\uffff\1\141\2\uffff\1\164\2\uffff\1\141\1\163\1\uffff\1\151\1\165\1\157\1\76\1\171\1\165\1\145\1\uffff\2\145\5\uffff\1\150\1\172\2\uffff\2\uffff\1\57\2\uffff\1\164\3\uffff\1\160\1\172\1\141\2\uffff\1\166\1\172\1\143\1\172\1\uffff\1\162\1\156\1\154\1\156\1\141\1\uffff\1\172\2\154\1\170\1\uffff\1\146\1\171\5\uffff\1\151\5\uffff\1\153\2\164\1\157\1\145\1\uffff\1\154\1\141\1\uffff\1\141\1\uffff\1\151\1\147\1\145\1\172\1\164\1\162\1\uffff\1\144\1\164\1\151\1\141\1\167\1\164\1\141\1\151\1\145\1\162\1\147\1\151\1\172\2\160\1\154\1\145\1\172\1\162\1\uffff\2\141\1\172\1\151\1\143\1\165\1\157\1\145\1\147\1\164\1\162\1\164\1\162\1\143\1\170\1\150\1\uffff\1\145\1\164\1\145\1\172\1\uffff\1\163\1\151\1\143\1\uffff\1\137\1\141\1\154\1\162\1\163\1\145\1\151\1\156\1\172\1\141\2\172\1\151\1\144\1\172\1\137\1\uffff\1\172\1\156\1\164\2\154\1\164\1\144\1\160\1\172\1\157\1\172\1\uffff\1\164\2\uffff\1\164\1\172\1\uffff\1\154\1\uffff\1\151\1\145\1\151\1\137\1\172\1\163\1\141\1\uffff\1\156\1\uffff\1\151\1\145\1\uffff\1\151\1\156\1\162\1\156\1\150\1\uffff\1\172\1\143\1\172\1\157\1\163\1\156\1\147\1\172\1\145\1\151\1\uffff\1\145\1\156\1\uffff\1\156\1\160\1\145\1\172\1\uffff\1\172\1\147\1\172\1\147\1\172\1\141\1\172\2\uffff\1\150\1\uffff\1\172\1\uffff\1\143\1\uffff\1\154\1\uffff\1\145\1\151\1\172\1\147\1\uffff\1\150\1\164\1\151\1\156\1\147\1\172\1\uffff";
+ "\1\uffff\1\141\2\uffff\1\164\2\uffff\1\141\1\163\1\uffff\1\151\1\165\1\157\1\76\1\171\1\165\1\145\1\157\1\uffff\2\145\5\uffff\1\150\1\172\2\uffff\2\uffff\1\57\2\uffff\1\164\3\uffff\1\160\1\172\1\141\2\uffff\1\166\1\172\1\143\1\172\1\uffff\1\162\1\156\1\154\1\156\1\141\1\uffff\1\172\2\154\1\170\1\153\1\uffff\1\146\1\171\5\uffff\1\151\5\uffff\1\153\2\164\1\157\1\145\1\uffff\1\154\1\141\1\uffff\1\141\1\uffff\1\151\1\147\1\145\1\172\1\164\1\162\1\uffff\1\144\1\164\1\151\1\145\1\141\1\167\1\164\1\141\1\151\1\145\1\162\1\147\1\151\1\172\2\160\1\154\1\145\1\172\1\uffff\2\141\1\172\1\151\1\143\1\156\1\165\1\157\1\145\1\147\1\164\1\162\1\164\1\162\1\143\1\170\1\150\1\uffff\1\145\1\164\1\145\1\172\1\uffff\1\151\1\143\1\uffff\1\137\1\141\1\137\1\154\1\162\1\163\1\145\1\151\1\156\1\172\1\141\2\172\1\151\1\144\1\172\1\137\1\uffff\1\156\1\164\2\154\1\144\1\164\1\144\1\160\1\172\1\157\1\172\1\uffff\1\164\2\uffff\1\164\1\172\1\uffff\1\154\1\151\1\145\1\151\1\137\1\145\1\172\1\163\1\141\1\uffff\1\156\1\uffff\1\151\1\145\1\uffff\1\151\1\156\1\162\1\156\1\150\1\146\1\uffff\1\172\1\143\1\172\1\157\1\163\1\156\1\147\1\172\1\145\1\151\1\172\1\uffff\1\145\1\156\1\uffff\1\156\1\160\1\145\1\172\1\uffff\1\172\1\147\1\uffff\1\172\1\147\1\172\1\141\1\172\2\uffff\1\150\1\uffff\1\172\1\uffff\1\143\1\uffff\1\154\1\uffff\1\145\1\151\1\172\1\147\1\uffff\1\150\1\164\1\151\1\156\1\147\1\172\1\uffff";
static final String DFA12_acceptS =
- "\2\uffff\1\2\1\3\1\uffff\1\5\1\6\2\uffff\1\13\7\uffff\1\30\2\uffff\1\35\1\36\1\37\1\46\1\47\2\uffff\1\52\1\53\3\uffff\1\57\1\60\1\uffff\1\52\1\2\1\3\3\uffff\1\5\1\6\4\uffff\1\13\5\uffff\1\22\4\uffff\1\30\2\uffff\1\35\1\36\1\37\1\46\1\47\1\uffff\1\53\1\54\1\55\1\56\1\57\5\uffff\1\45\2\uffff\1\12\1\uffff\1\44\6\uffff\1\24\23\uffff\1\21\20\uffff\1\11\4\uffff\1\17\3\uffff\1\31\20\uffff\1\40\13\uffff\1\4\1\uffff\1\32\1\10\2\uffff\1\16\1\uffff\1\27\7\uffff\1\1\1\uffff\1\41\2\uffff\1\23\5\uffff\1\33\12\uffff\1\34\2\uffff\1\15\4\uffff\1\43\7\uffff\1\42\1\25\1\uffff\1\50\1\uffff\1\7\1\uffff\1\20\1\uffff\1\14\4\uffff\1\51\6\uffff\1\26";
+ "\2\uffff\1\2\1\3\1\uffff\1\5\1\6\2\uffff\1\13\10\uffff\1\30\2\uffff\1\35\1\36\1\37\1\46\1\47\2\uffff\1\52\1\53\3\uffff\1\57\1\60\1\uffff\1\52\1\2\1\3\3\uffff\1\5\1\6\4\uffff\1\13\5\uffff\1\22\5\uffff\1\30\2\uffff\1\35\1\36\1\37\1\46\1\47\1\uffff\1\53\1\54\1\55\1\56\1\57\5\uffff\1\45\2\uffff\1\12\1\uffff\1\44\6\uffff\1\24\23\uffff\1\21\21\uffff\1\11\4\uffff\1\17\2\uffff\1\31\21\uffff\1\40\13\uffff\1\4\1\uffff\1\32\1\10\2\uffff\1\16\11\uffff\1\1\1\uffff\1\41\2\uffff\1\23\6\uffff\1\33\13\uffff\1\34\2\uffff\1\15\4\uffff\1\43\2\uffff\1\27\5\uffff\1\42\1\25\1\uffff\1\50\1\uffff\1\7\1\uffff\1\20\1\uffff\1\14\4\uffff\1\51\6\uffff\1\26";
static final String DFA12_specialS =
- "\1\1\34\uffff\1\2\1\0\u00d1\uffff}>";
+ "\1\1\35\uffff\1\2\1\0\u00d6\uffff}>";
static final String[] DFA12_transitionS = {
- "\11\41\2\40\2\41\1\40\22\41\1\40\1\41\1\35\4\41\1\36\1\27\1\30\1\3\1\41\1\25\1\41\1\2\1\37\12\34\1\11\1\21\1\41\1\15\3\41\32\33\1\24\1\41\1\26\1\32\1\33\1\41\1\33\1\16\1\14\1\22\1\10\3\33\1\4\1\7\1\23\1\20\1\17\2\33\1\1\1\33\1\13\1\12\3\33\1\31\3\33\1\5\1\41\1\6\uff82\41",
- "\1\42",
+ "\11\42\2\41\2\42\1\41\22\42\1\41\1\42\1\36\4\42\1\37\1\30\1\31\1\3\1\42\1\26\1\42\1\2\1\40\12\35\1\11\1\22\1\42\1\15\3\42\32\34\1\25\1\42\1\27\1\33\1\34\1\42\1\34\1\16\1\14\1\23\1\10\3\34\1\4\1\7\1\24\1\20\1\17\2\34\1\1\1\34\1\13\1\12\1\21\2\34\1\32\3\34\1\5\1\42\1\6\uff82\42",
+ "\1\43",
"",
"",
- "\1\46\1\47\5\uffff\1\50",
+ "\1\47\1\50\5\uffff\1\51",
"",
"",
- "\1\53",
- "\1\54\74\uffff\1\56\1\uffff\1\55",
+ "\1\54",
+ "\1\55\74\uffff\1\57\1\uffff\1\56",
"",
- "\1\60\5\uffff\1\61",
- "\1\62",
- "\1\64\6\uffff\1\63",
- "\1\65",
- "\1\67\11\uffff\1\66",
- "\1\70",
+ "\1\61\5\uffff\1\62",
+ "\1\63",
+ "\1\65\6\uffff\1\64",
+ "\1\66",
+ "\1\70\11\uffff\1\67",
"\1\71",
- "",
+ "\1\72",
"\1\73",
- "\1\74",
"",
+ "\1\75",
+ "\1\76",
"",
"",
"",
"",
- "\1\102",
- "\32\43\4\uffff\1\43\1\uffff\32\43",
"",
+ "\1\104",
+ "\32\44\4\uffff\1\44\1\uffff\32\44",
"",
- "\0\104",
- "\0\104",
- "\1\105\4\uffff\1\106",
"",
+ "\0\106",
+ "\0\106",
+ "\1\107\4\uffff\1\110",
"",
- "\1\110\16\uffff\1\111\1\uffff\1\112",
"",
+ "\1\112\16\uffff\1\113\1\uffff\1\114",
"",
"",
- "\1\113",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\23\43\1\114\6\43",
- "\1\116",
"",
+ "\1\115",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\23\44\1\116\6\44",
+ "\1\120",
"",
- "\1\117",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
- "\1\121",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
"",
+ "\1\121",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\123",
- "\1\124",
- "\1\125",
- "\1\126\1\uffff\1\127",
- "\1\130",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\1\125",
+ "\1\126",
+ "\1\127",
+ "\1\130\1\uffff\1\131",
"\1\132",
- "\1\133",
- "\1\134",
"",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+ "\1\134",
"\1\135",
"\1\136",
+ "\1\137",
"",
+ "\1\140",
+ "\1\141",
"",
"",
"",
"",
- "\1\137",
+ "",
+ "\1\142",
"",
"",
"",
"",
"",
- "\1\140",
- "\1\141",
- "\1\142",
"\1\143",
"\1\144",
- "",
"\1\145",
"\1\146",
- "",
"\1\147",
"",
"\1\150",
- "\1\152\3\uffff\1\151",
+ "\1\151",
+ "",
+ "\1\152",
+ "",
"\1\153",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\16\43\1\154\13\43",
+ "\1\155\3\uffff\1\154",
"\1\156",
- "\1\157",
- "",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\160",
"\1\161",
+ "",
"\1\162",
"\1\163",
"\1\164",
@@ -1886,19 +1886,19 @@ public class InternalLDefLexer extends Lexer {
"\1\171",
"\1\172",
"\1\173",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\5\43\1\174\20\43\1\175\3\43",
- "\1\177",
- "\1\u0080",
- "\1\u0081",
+ "\1\174",
+ "\1\175",
+ "\1\176",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\5\44\1\177\20\44\1\u0080\3\44",
"\1\u0082",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\1\u0083",
"\1\u0084",
- "",
"\1\u0085",
- "\1\u0086",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+ "",
+ "\1\u0087",
"\1\u0088",
- "\1\u0089",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u008a",
"\1\u008b",
"\1\u008c",
@@ -1910,119 +1910,125 @@ public class InternalLDefLexer extends Lexer {
"\1\u0092",
"\1\u0093",
"\1\u0094",
- "",
"\1\u0095",
"\1\u0096",
"\1\u0097",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
"",
+ "\1\u0098",
"\1\u0099",
"\1\u009a",
- "\1\u009b",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"",
"\1\u009c",
"\1\u009d",
+ "",
"\1\u009e",
"\1\u009f",
"\1\u00a0",
"\1\u00a1",
"\1\u00a2",
"\1\u00a3",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\1\u00a4",
"\1\u00a5",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\1\u00a6",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u00a8",
- "\1\u00a9",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u00ab",
- "",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
- "\1\u00ad",
+ "\1\u00ac",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u00ae",
+ "",
"\1\u00af",
"\1\u00b0",
"\1\u00b1",
"\1\u00b2",
"\1\u00b3",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\1\u00b4",
"\1\u00b5",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
- "",
- "\1\u00b7",
- "",
- "",
+ "\1\u00b6",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u00b8",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"",
"\1\u00ba",
"",
+ "",
"\1\u00bb",
- "\1\u00bc",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+ "",
"\1\u00bd",
"\1\u00be",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\1\u00bf",
"\1\u00c0",
"\1\u00c1",
- "",
"\1\u00c2",
- "",
- "\1\u00c3",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u00c4",
- "",
"\1\u00c5",
+ "",
"\1\u00c6",
+ "",
"\1\u00c7",
"\1\u00c8",
- "\1\u00c9",
"",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\1\u00c9",
+ "\1\u00ca",
"\1\u00cb",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\10\43\1\u00cc\21\43",
+ "\1\u00cc",
+ "\1\u00cd",
"\1\u00ce",
- "\1\u00cf",
+ "",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u00d0",
- "\1\u00d1",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\10\44\1\u00d1\21\44",
"\1\u00d3",
"\1\u00d4",
- "",
"\1\u00d5",
"\1\u00d6",
- "",
- "\1\u00d7",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u00d8",
"\1\u00d9",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\1\u00db",
"\1\u00dc",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
- "\1\u00de",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
- "\1\u00e0",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
"",
+ "\1\u00dd",
+ "\1\u00de",
+ "\1\u00df",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u00e2",
"",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
- "",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"\1\u00e4",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+ "\1\u00e6",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"",
- "\1\u00e5",
"",
- "\1\u00e6",
- "\1\u00e7",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
- "\1\u00e9",
+ "\1\u00e8",
+ "",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
"",
"\1\u00ea",
+ "",
"\1\u00eb",
+ "",
"\1\u00ec",
"\1\u00ed",
- "\1\u00ee",
- "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+ "\1\u00ef",
+ "",
+ "\1\u00f0",
+ "\1\u00f1",
+ "\1\u00f2",
+ "\1\u00f3",
+ "\1\u00f4",
+ "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
""
};
@@ -2063,12 +2069,12 @@ public class InternalLDefLexer extends Lexer {
int _s = s;
switch ( s ) {
case 0 :
- int LA12_30 = input.LA(1);
+ int LA12_31 = input.LA(1);
s = -1;
- if ( ((LA12_30>='\u0000' && LA12_30<='\uFFFF')) ) {s = 68;}
+ if ( ((LA12_31>='\u0000' && LA12_31<='\uFFFF')) ) {s = 70;}
- else s = 33;
+ else s = 34;
if ( s>=0 ) return s;
break;
@@ -2108,49 +2114,51 @@ public class InternalLDefLexer extends Lexer {
else if ( (LA12_0=='l') ) {s = 16;}
- else if ( (LA12_0==';') ) {s = 17;}
+ else if ( (LA12_0=='t') ) {s = 17;}
+
+ else if ( (LA12_0==';') ) {s = 18;}
- else if ( (LA12_0=='d') ) {s = 18;}
+ else if ( (LA12_0=='d') ) {s = 19;}
- else if ( (LA12_0=='k') ) {s = 19;}
+ else if ( (LA12_0=='k') ) {s = 20;}
- else if ( (LA12_0=='[') ) {s = 20;}
+ else if ( (LA12_0=='[') ) {s = 21;}
- else if ( (LA12_0==',') ) {s = 21;}
+ else if ( (LA12_0==',') ) {s = 22;}
- else if ( (LA12_0==']') ) {s = 22;}
+ else if ( (LA12_0==']') ) {s = 23;}
- else if ( (LA12_0=='(') ) {s = 23;}
+ else if ( (LA12_0=='(') ) {s = 24;}
- else if ( (LA12_0==')') ) {s = 24;}
+ else if ( (LA12_0==')') ) {s = 25;}
- else if ( (LA12_0=='w') ) {s = 25;}
+ else if ( (LA12_0=='w') ) {s = 26;}
- else if ( (LA12_0=='^') ) {s = 26;}
+ else if ( (LA12_0=='^') ) {s = 27;}
- else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='a'||(LA12_0>='f' && LA12_0<='h')||(LA12_0>='n' && LA12_0<='o')||LA12_0=='q'||(LA12_0>='t' && LA12_0<='v')||(LA12_0>='x' && LA12_0<='z')) ) {s = 27;}
+ else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='a'||(LA12_0>='f' && LA12_0<='h')||(LA12_0>='n' && LA12_0<='o')||LA12_0=='q'||(LA12_0>='u' && LA12_0<='v')||(LA12_0>='x' && LA12_0<='z')) ) {s = 28;}
- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 28;}
+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 29;}
- else if ( (LA12_0=='\"') ) {s = 29;}
+ else if ( (LA12_0=='\"') ) {s = 30;}
- else if ( (LA12_0=='\'') ) {s = 30;}
+ else if ( (LA12_0=='\'') ) {s = 31;}
- else if ( (LA12_0=='/') ) {s = 31;}
+ else if ( (LA12_0=='/') ) {s = 32;}
- else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 32;}
+ else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 33;}
- else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||LA12_0=='+'||LA12_0=='-'||LA12_0=='<'||(LA12_0>='>' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 33;}
+ else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||LA12_0=='+'||LA12_0=='-'||LA12_0=='<'||(LA12_0>='>' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 34;}
if ( s>=0 ) return s;
break;
case 2 :
- int LA12_29 = input.LA(1);
+ int LA12_30 = input.LA(1);
s = -1;
- if ( ((LA12_29>='\u0000' && LA12_29<='\uFFFF')) ) {s = 68;}
+ if ( ((LA12_30>='\u0000' && LA12_30<='\uFFFF')) ) {s = 70;}
- else s = 33;
+ else s = 34;
if ( s>=0 ) return s;
break;
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefParser.java b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefParser.java
index a4f6c3b47..4e55162a7 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefParser.java
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDefParser.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
@SuppressWarnings("all")
public class InternalLDefParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'.'", "'*'", "'import'", "'{'", "'}'", "'integration'", "'javafx'", "'java'", "'e4'", "':'", "'partitioning'", "'partition'", "'script'", "'rule'", "'single_line'", "'col'", "'=>'", "'escaped'", "'by'", "'multi_line'", "'lexical_highlighting'", "'colors'", "';'", "'bold'", "'italic'", "'default'", "'keywords'", "'['", "','", "']'", "'since'", "'pattern'", "'containing'", "'character'", "'eq'", "'in'", "'('", "')'", "'whitespace'", "'javawhitespace'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'.'", "'*'", "'import'", "'{'", "'}'", "'integration'", "'javafx'", "'java'", "'e4'", "':'", "'partitioning'", "'partition'", "'script'", "'rule'", "'single_line'", "'col'", "'=>'", "'escaped'", "'by'", "'multi_line'", "'lexical_highlighting'", "'token_def'", "';'", "'bold'", "'italic'", "'default'", "'keywords'", "'['", "','", "']'", "'since'", "'pattern'", "'containing'", "'character'", "'eq'", "'in'", "'('", "')'", "'whitespace'", "'javawhitespace'"
};
public static final int T__50=50;
public static final int T__19=19;
@@ -4035,7 +4035,7 @@ public class InternalLDefParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleTokenVisuals"
- // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1427:1: ruleTokenVisuals returns [EObject current=null] : (otherlv_0= 'colors' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}' ) ;
+ // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1427:1: ruleTokenVisuals returns [EObject current=null] : (otherlv_0= 'token_def' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}' ) ;
public final EObject ruleTokenVisuals() throws RecognitionException {
EObject current = null;
@@ -4049,16 +4049,16 @@ public class InternalLDefParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1430:28: ( (otherlv_0= 'colors' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}' ) )
- // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1431:1: (otherlv_0= 'colors' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}' )
+ // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1430:28: ( (otherlv_0= 'token_def' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}' ) )
+ // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1431:1: (otherlv_0= 'token_def' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}' )
{
- // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1431:1: (otherlv_0= 'colors' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}' )
- // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1431:3: otherlv_0= 'colors' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}'
+ // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1431:1: (otherlv_0= 'token_def' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}' )
+ // ../org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/parser/antlr/internal/InternalLDef.g:1431:3: otherlv_0= 'token_def' otherlv_1= '{' ( ( (lv_tokenVisuals_2_0= ruleTokenVisual ) ) otherlv_3= ';' )+ otherlv_4= '}'
{
otherlv_0=(Token)match(input,33,FOLLOW_33_in_ruleTokenVisuals3267); if (state.failed) return current;
if ( state.backtracking==0 ) {
- newLeafNode(otherlv_0, grammarAccess.getTokenVisualsAccess().getColorsKeyword_0());
+ newLeafNode(otherlv_0, grammarAccess.getTokenVisualsAccess().getToken_defKeyword_0());
}
otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleTokenVisuals3279); if (state.failed) return current;
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/services/LDefGrammarAccess.java b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/services/LDefGrammarAccess.java
index 41feeab61..2f0337f1c 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/services/LDefGrammarAccess.java
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/src-gen/org/eclipse/fx/code/editor/ldef/services/LDefGrammarAccess.java
@@ -830,7 +830,7 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
public class TokenVisualsElements extends AbstractParserRuleElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TokenVisuals");
private final Group cGroup = (Group)rule.eContents().get(1);
- private final Keyword cColorsKeyword_0 = (Keyword)cGroup.eContents().get(0);
+ private final Keyword cToken_defKeyword_0 = (Keyword)cGroup.eContents().get(0);
private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
private final Assignment cTokenVisualsAssignment_2_0 = (Assignment)cGroup_2.eContents().get(0);
@@ -839,14 +839,14 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cRightCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);
//TokenVisuals:
- // "colors" "{" (tokenVisuals+=TokenVisual ";")+ "}";
+ // "token_def" "{" (tokenVisuals+=TokenVisual ";")+ "}";
@Override public ParserRule getRule() { return rule; }
- //"colors" "{" (tokenVisuals+=TokenVisual ";")+ "}"
+ //"token_def" "{" (tokenVisuals+=TokenVisual ";")+ "}"
public Group getGroup() { return cGroup; }
- //"colors"
- public Keyword getColorsKeyword_0() { return cColorsKeyword_0; }
+ //"token_def"
+ public Keyword getToken_defKeyword_0() { return cToken_defKeyword_0; }
//"{"
public Keyword getLeftCurlyBracketKeyword_1() { return cLeftCurlyBracketKeyword_1; }
@@ -1228,10 +1228,11 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cEscapeSeqSTRINGTerminalRuleCall_4_2_0 = (RuleCall)cEscapeSeqAssignment_4_2.eContents().get(0);
//Scanner_SingleLineRule:
- // "single_line" startSeq=STRING ("col" check=Check)? ("=>" endSeq=STRING?)? ("escaped" "by" escapeSeq=STRING)?;
+ // "single_line" startSeq=STRING ("col" check=Check)? ("=>" endSeq=STRING?)? ("escaped" "by" escapeSeq=STRING)? //( 'enabledif' enabledIf=ScannerCondition)?
+ //;
@Override public ParserRule getRule() { return rule; }
- //"single_line" startSeq=STRING ("col" check=Check)? ("=>" endSeq=STRING?)? ("escaped" "by" escapeSeq=STRING)?
+ //"single_line" startSeq=STRING ("col" check=Check)? ("=>" endSeq=STRING?)? ("escaped" "by" escapeSeq=STRING)? //( 'enabledif' enabledIf=ScannerCondition)?
public Group getGroup() { return cGroup; }
//"single_line"
@@ -1303,10 +1304,11 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cEscapeSeqSTRINGTerminalRuleCall_5_2_0 = (RuleCall)cEscapeSeqAssignment_5_2.eContents().get(0);
//Scanner_MultiLineRule:
- // "multi_line" startSeq=STRING ("col" check=Check)? "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)?;
+ // "multi_line" startSeq=STRING ("col" check=Check)? "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)? //( 'enabledif' enabledIf=ScannerCondition)?
+ //;
@Override public ParserRule getRule() { return rule; }
- //"multi_line" startSeq=STRING ("col" check=Check)? "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)?
+ //"multi_line" startSeq=STRING ("col" check=Check)? "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)? //( 'enabledif' enabledIf=ScannerCondition)?
public Group getGroup() { return cGroup; }
//"multi_line"
@@ -1372,10 +1374,12 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cContentPatternSTRINGTerminalRuleCall_5_0 = (RuleCall)cContentPatternAssignment_5.eContents().get(0);
//Scanner_PatternRule:
- // "pattern" startPattern=STRING length=INT? ("col" check=Check)? "containing" contentPattern=STRING;
+ // "pattern" startPattern=STRING length=INT? ("col" check=Check)? "containing" contentPattern= //( 'enabledif' enabledIf=ScannerCondition)?
+ // STRING;
@Override public ParserRule getRule() { return rule; }
- //"pattern" startPattern=STRING length=INT? ("col" check=Check)? "containing" contentPattern=STRING
+ //"pattern" startPattern=STRING length=INT? ("col" check=Check)? "containing" contentPattern= //( 'enabledif' enabledIf=ScannerCondition)?
+ //STRING
public Group getGroup() { return cGroup; }
//"pattern"
@@ -1408,9 +1412,11 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
//"containing"
public Keyword getContainingKeyword_4() { return cContainingKeyword_4; }
- //contentPattern=STRING
+ //contentPattern= //( 'enabledif' enabledIf=ScannerCondition)?
+ //STRING
public Assignment getContentPatternAssignment_5() { return cContentPatternAssignment_5; }
+ ////( 'enabledif' enabledIf=ScannerCondition)?
//STRING
public RuleCall getContentPatternSTRINGTerminalRuleCall_5_0() { return cContentPatternSTRINGTerminalRuleCall_5_0; }
}
@@ -1433,10 +1439,11 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cCheckCheckParserRuleCall_5_1_0 = (RuleCall)cCheckAssignment_5_1.eContents().get(0);
//Scanner_CharacterRule:
- // "character" "[" characters+=STRING ("," characters+=STRING)* "]" ("col" check=Check)?;
+ // "character" "[" characters+=STRING ("," characters+=STRING)* "]" ("col" check=Check)? //( 'enabledif' enabledIf=ScannerCondition)?
+ //;
@Override public ParserRule getRule() { return rule; }
- //"character" "[" characters+=STRING ("," characters+=STRING)* "]" ("col" check=Check)?
+ //"character" "[" characters+=STRING ("," characters+=STRING)* "]" ("col" check=Check)? //( 'enabledif' enabledIf=ScannerCondition)?
public Group getGroup() { return cGroup; }
//"character"
@@ -1491,10 +1498,11 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cCheckCheckParserRuleCall_2_1_0 = (RuleCall)cCheckAssignment_2_1.eContents().get(0);
//Scanner_JSRule:
- // "script" fileURI=STRING ("col" check=Check)?;
+ // "script" fileURI=STRING ("col" check=Check)? //( 'enabledif' condition=ScannerCondition)?
+ //;
@Override public ParserRule getRule() { return rule; }
- //"script" fileURI=STRING ("col" check=Check)?
+ //"script" fileURI=STRING ("col" check=Check)? //( 'enabledif' condition=ScannerCondition)?
public Group getGroup() { return cGroup; }
//"script"
@@ -1525,6 +1533,21 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cRangeParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
private final RuleCall cEqualsParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+ ////ScannerCondition:
+ //// ScannerConditionExits | ScannerConditionEquals | ScannerConditionJs
+ ////;
+ ////
+ ////ScannerConditionExits:
+ //// key=STRING 'exists'
+ ////;
+ ////
+ ////ScannerConditionEquals:
+ //// key=STRING 'eq' value=STRING
+ ////;
+ ////
+ ////ScannerConditionJs:
+ //// 'script' value=STRING
+ ////;
//Check:
// Range | Equals;
@Override public ParserRule getRule() { return rule; }
@@ -2057,7 +2080,7 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
}
//TokenVisuals:
- // "colors" "{" (tokenVisuals+=TokenVisual ";")+ "}";
+ // "token_def" "{" (tokenVisuals+=TokenVisual ";")+ "}";
public TokenVisualsElements getTokenVisualsAccess() {
return pTokenVisuals;
}
@@ -2157,7 +2180,8 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
}
//Scanner_SingleLineRule:
- // "single_line" startSeq=STRING ("col" check=Check)? ("=>" endSeq=STRING?)? ("escaped" "by" escapeSeq=STRING)?;
+ // "single_line" startSeq=STRING ("col" check=Check)? ("=>" endSeq=STRING?)? ("escaped" "by" escapeSeq=STRING)? //( 'enabledif' enabledIf=ScannerCondition)?
+ //;
public Scanner_SingleLineRuleElements getScanner_SingleLineRuleAccess() {
return pScanner_SingleLineRule;
}
@@ -2167,7 +2191,8 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
}
//Scanner_MultiLineRule:
- // "multi_line" startSeq=STRING ("col" check=Check)? "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)?;
+ // "multi_line" startSeq=STRING ("col" check=Check)? "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)? //( 'enabledif' enabledIf=ScannerCondition)?
+ //;
public Scanner_MultiLineRuleElements getScanner_MultiLineRuleAccess() {
return pScanner_MultiLineRule;
}
@@ -2177,7 +2202,8 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
}
//Scanner_PatternRule:
- // "pattern" startPattern=STRING length=INT? ("col" check=Check)? "containing" contentPattern=STRING;
+ // "pattern" startPattern=STRING length=INT? ("col" check=Check)? "containing" contentPattern= //( 'enabledif' enabledIf=ScannerCondition)?
+ // STRING;
public Scanner_PatternRuleElements getScanner_PatternRuleAccess() {
return pScanner_PatternRule;
}
@@ -2187,7 +2213,8 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
}
//Scanner_CharacterRule:
- // "character" "[" characters+=STRING ("," characters+=STRING)* "]" ("col" check=Check)?;
+ // "character" "[" characters+=STRING ("," characters+=STRING)* "]" ("col" check=Check)? //( 'enabledif' enabledIf=ScannerCondition)?
+ //;
public Scanner_CharacterRuleElements getScanner_CharacterRuleAccess() {
return pScanner_CharacterRule;
}
@@ -2197,7 +2224,8 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
}
//Scanner_JSRule:
- // "script" fileURI=STRING ("col" check=Check)?;
+ // "script" fileURI=STRING ("col" check=Check)? //( 'enabledif' condition=ScannerCondition)?
+ //;
public Scanner_JSRuleElements getScanner_JSRuleAccess() {
return pScanner_JSRule;
}
@@ -2206,6 +2234,21 @@ public class LDefGrammarAccess extends AbstractGrammarElementFinder {
return getScanner_JSRuleAccess().getRule();
}
+ ////ScannerCondition:
+ //// ScannerConditionExits | ScannerConditionEquals | ScannerConditionJs
+ ////;
+ ////
+ ////ScannerConditionExits:
+ //// key=STRING 'exists'
+ ////;
+ ////
+ ////ScannerConditionEquals:
+ //// key=STRING 'eq' value=STRING
+ ////;
+ ////
+ ////ScannerConditionJs:
+ //// 'script' value=STRING
+ ////;
//Check:
// Range | Equals;
public CheckElements getCheckAccess() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin
index a6f76c6e5..a9a9e55be 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin
Binary files differ
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/JSONConfigurationConfigurator.java b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/JSONConfigurationConfigurator.java
index d3d2ac30d..84126233e 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/JSONConfigurationConfigurator.java
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/JSONConfigurationConfigurator.java
@@ -2,6 +2,7 @@ package org.eclipse.fx.code.editor.ldef.generator;
import com.google.common.base.Objects;
import com.google.common.collect.Iterables;
+import java.util.Collections;
import java.util.List;
import java.util.function.Function;
import org.eclipse.emf.common.util.EList;
@@ -125,9 +126,10 @@ public class JSONConfigurationConfigurator {
String _escapeSeq_1 = ((Partition_MultiLineRule)prl).getEscapeSeq();
PartitionRule_MultiLine.Builder _escapedBy_1 = _endSeq_3.escapedBy(_escapeSeq_1);
return _escapedBy_1.build();
+ } else {
+ throw new IllegalStateException((("Unknown rule \'" + prl) + "\'"));
}
}
- return null;
};
Iterable<PartitionRule> _map = IterableExtensions.<Partition_Rule, PartitionRule>map(_filter, _function_1);
return IterableExtensions.<PartitionRule>toList(_map);
@@ -159,7 +161,13 @@ public class JSONConfigurationConfigurator {
return ListExtensions.<org.eclipse.fx.code.editor.ldef.lDef.Token, Token>map(_tokenList, _function_2);
};
Iterable<List<Token>> _map = IterableExtensions.<LexicalPartitionHighlighting_Rule, List<Token>>map(_filter_1, _function_1);
- return IterableExtensions.<List<Token>>head(_map);
+ final List<Token> rv = IterableExtensions.<List<Token>>head(_map);
+ boolean _equals = Objects.equal(rv, null);
+ if (_equals) {
+ return Collections.<Token>emptyList();
+ } else {
+ return rv;
+ }
}
public List<TokenScanner> tokenScannerList(final EditorGModel m, final org.eclipse.fx.code.editor.ldef.lDef.Token t) {
@@ -271,7 +279,7 @@ public class JSONConfigurationConfigurator {
public static void main(final String[] args) {
LDefStandaloneSetup.doSetup();
final ResourceSetImpl rs = new ResourceSetImpl();
- URI _createURI = URI.createURI("file:/Users/tomschindl/git/efxclipse/bundles/code/org.eclipse.fx.code.editor.ldef.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart/dart.ldef");
+ URI _createURI = URI.createURI("file:/Users/tomschindl/git/efxclipse/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/asciidoc/asciidoc.ldef");
final Resource r = rs.getResource(_createURI, true);
JSONConfigurationConfigurator _jSONConfigurationConfigurator = new JSONConfigurationConfigurator();
EList<EObject> _contents = r.getContents();

Back to the top