1.1 --- a/o.n.antlr.editor/src/org/netbeans/modules/antlr/editor/AntlrTokenId.java	Sat Jan 12 13:04:21 2013 +0100
     1.2 +++ b/o.n.antlr.editor/src/org/netbeans/modules/antlr/editor/AntlrTokenId.java	Mon Jan 14 13:28:06 2013 +0100
     1.3 @@ -98,25 +98,25 @@
     1.4      BANG(ANTLRv3Lexer.BANG, OTHERS),
     1.5      REWRITE(ANTLRv3Lexer.REWRITE, OTHERS),
     1.6      TOKENS(ANTLRv3Lexer.TOKENS, OTHERS),
     1.7 -    TOKEN_REF(ANTLRv3Lexer.TOKEN_REF, OTHERS),
     1.8 -    STRING_LITERAL(ANTLRv3Lexer.STRING_LITERAL, OTHERS),
     1.9 -    CHAR_LITERAL(ANTLRv3Lexer.CHAR_LITERAL, OTHERS),
    1.10 +    TOKEN_REF(ANTLRv3Lexer.TOKEN_REF, AntlrTokenIdCategory.TOKENS), 
    1.11 +    STRING_LITERAL(ANTLRv3Lexer.STRING_LITERAL, STRINGS),
    1.12 +    CHAR_LITERAL(ANTLRv3Lexer.CHAR_LITERAL, STRINGS),
    1.13      ACTION(ANTLRv3Lexer.ACTION, OTHERS),
    1.14      OPTIONS(ANTLRv3Lexer.OPTIONS, OTHERS),
    1.15      INT(ANTLRv3Lexer.INT, OTHERS),
    1.16      ARG_ACTION(ANTLRv3Lexer.ARG_ACTION, OTHERS),
    1.17 -    RULE_REF(ANTLRv3Lexer.RULE_REF, OTHERS),
    1.18 -    DOUBLE_QUOTE_STRING_LITERAL(ANTLRv3Lexer.DOUBLE_QUOTE_STRING_LITERAL, OTHERS),
    1.19 -    DOUBLE_ANGLE_STRING_LITERAL(ANTLRv3Lexer.DOUBLE_ANGLE_STRING_LITERAL, OTHERS),
    1.20 +    RULE_REF(ANTLRv3Lexer.RULE_REF, RULES),
    1.21 +    DOUBLE_QUOTE_STRING_LITERAL(ANTLRv3Lexer.DOUBLE_QUOTE_STRING_LITERAL, STRINGS),
    1.22 +    DOUBLE_ANGLE_STRING_LITERAL(ANTLRv3Lexer.DOUBLE_ANGLE_STRING_LITERAL, STRINGS),
    1.23      SRC(ANTLRv3Lexer.SRC, OTHERS),
    1.24 -    SL_COMMENT(ANTLRv3Lexer.SL_COMMENT, OTHERS),
    1.25 -    ML_COMMENT(ANTLRv3Lexer.ML_COMMENT, OTHERS),
    1.26 -    LITERAL_CHAR(ANTLRv3Lexer.LITERAL_CHAR, OTHERS),
    1.27 +    SL_COMMENT(ANTLRv3Lexer.SL_COMMENT, COMMENTS),
    1.28 +    ML_COMMENT(ANTLRv3Lexer.ML_COMMENT, COMMENTS),
    1.29 +    LITERAL_CHAR(ANTLRv3Lexer.LITERAL_CHAR, STRINGS),
    1.30      ESC(ANTLRv3Lexer.ESC, OTHERS),
    1.31      XDIGIT(ANTLRv3Lexer.XDIGIT, OTHERS),
    1.32      NESTED_ARG_ACTION(ANTLRv3Lexer.NESTED_ARG_ACTION, OTHERS),
    1.33 -    ACTION_STRING_LITERAL(ANTLRv3Lexer.ACTION_STRING_LITERAL, OTHERS),
    1.34 -    ACTION_CHAR_LITERAL(ANTLRv3Lexer.ACTION_CHAR_LITERAL, OTHERS),
    1.35 +    ACTION_STRING_LITERAL(ANTLRv3Lexer.ACTION_STRING_LITERAL, STRINGS),
    1.36 +    ACTION_CHAR_LITERAL(ANTLRv3Lexer.ACTION_CHAR_LITERAL, STRINGS),
    1.37      NESTED_ACTION(ANTLRv3Lexer.NESTED_ACTION, OTHERS),
    1.38      ACTION_ESC(ANTLRv3Lexer.ACTION_ESC, OTHERS),
    1.39      WS_LOOP(ANTLRv3Lexer.WS_LOOP, OTHERS),

     2.1 --- a/o.n.antlr.editor/src/org/netbeans/modules/antlr/editor/AntlrTokenIdCategory.java	Sat Jan 12 13:04:21 2013 +0100
     2.2 +++ b/o.n.antlr.editor/src/org/netbeans/modules/antlr/editor/AntlrTokenIdCategory.java	Mon Jan 14 13:28:06 2013 +0100
     2.3 @@ -47,7 +47,14 @@
     2.4   */
     2.5  public enum AntlrTokenIdCategory {
     2.6      
     2.7 -    KEYWORDS, ERRORS, OTHERS, NUMBERS, WHITESPACES, BRACES, IDENTIFIERS, STRINGS, 
     2.8 -    SEPARATORS, OPERATORS, COMMENTS;
     2.9 +    TOKENS,
    2.10 +    RULES,
    2.11 +    
    2.12 +    STRINGS,
    2.13 +    KEYWORDS, 
    2.14 +    OPERATORS,
    2.15 +    COMMENTS,
    2.16 +    
    2.17 +    ERRORS, OTHERS, NUMBERS, WHITESPACES, BRACES, IDENTIFIERS ;
    2.18      
    2.19  }

     3.1 --- a/o.n.antlr.editor/src/org/netbeans/modules/antlr/editor/fontsColors.xml	Sat Jan 12 13:04:21 2013 +0100
     3.2 +++ b/o.n.antlr.editor/src/org/netbeans/modules/antlr/editor/fontsColors.xml	Mon Jan 14 13:28:06 2013 +0100
     3.3 @@ -47,7 +47,24 @@
     3.4  
     3.5  <fontscolors>
     3.6      
     3.7 +    <fontcolor  name="whitespaces" default="default"/>
     3.8 +    <fontcolor  name="comments" default="comment"/>
     3.9      
    3.10 +    <fontcolor name="tokens" foreColor="007c00"> 
    3.11 +    </fontcolor>
    3.12      
    3.13 +    <fontcolor name="rules" default="identifier">
    3.14 +        <font style="bold" />
    3.15 +    </fontcolor>
    3.16 +    
    3.17 +    
    3.18 +    <fontcolor name="strings" default="string"/>
    3.19 +    
    3.20 +    <fontcolor name="others" default="default"/>    
    3.21 +    <fontcolor name="braces" default="separator"/>
    3.22 +    <fontcolor name="operators" default="operator"/>
    3.23 +    
    3.24 +    <fontcolor name="keywords" default="keyword"/>
    3.25 +    <fontcolor name="numbers" default="number"/>
    3.26      
    3.27  </fontscolors>