flex rules, color schemes

hsz · Jan 16, 2015 · 62cca21 · 62cca21
1 parent 57f13b4
commit 62cca21
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 49 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <idea-plugin version="2">
     <id>mobi.hsz.idea.latex</id>
-    <name>LaTeX plugin for IntelliJ IDEA</name>
+    <name>LaTeX</name>
     <version>0.1</version>
     <vendor email="[email protected]" url="http://www.hsz.mobi">hsz</vendor>
 

diff --git a/resources/colorSchemes/LatexDarcula.xml b/resources/colorSchemes/LatexDarcula.xml
@@ -10,6 +10,11 @@
             <option name="FOREGROUND" value="ED7600" />
         </value>
     </option>
+    <option name="LATEX.ARGUMENT">
+        <value>
+            <option name="FOREGROUND" value="668AA1" />
+        </value>
+    </option>
     <option name="LATEX.BRACKET">
         <value>
             <option name="FOREGROUND" value="365A71" />

diff --git a/resources/colorSchemes/LatexDefault.xml b/resources/colorSchemes/LatexDefault.xml
@@ -10,6 +10,11 @@
             <option name="FOREGROUND" value="8A4A0B" />
         </value>
     </option>
+    <option name="LATEX.ARGUMENT">
+        <value>
+            <option name="FOREGROUND" value="4486B0" />
+        </value>
+    </option>
     <option name="LATEX.BRACKET">
         <value>
             <option name="FOREGROUND" value="145680" />

diff --git a/src/mobi/hsz/idea/latex/highlighter/LatexHighlighter.java b/src/mobi/hsz/idea/latex/highlighter/LatexHighlighter.java
@@ -53,6 +53,7 @@ public class LatexHighlighter extends SyntaxHighlighterBase {
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, LatexParserDefinition.COMMENTS, LatexHighlighterColors.COMMENT);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, LatexParserDefinition.INSTRUCTIONS, LatexHighlighterColors.INSTRUCTION);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, LatexParserDefinition.BRACKETS, LatexHighlighterColors.BRACKET);
+        SyntaxHighlighterBase.fillMap(ATTRIBUTES, LatexParserDefinition.ARGUMENTS, LatexHighlighterColors.ARGUMENT);
     }
 
     /** Current project. */

diff --git a/src/mobi/hsz/idea/latex/highlighter/LatexHighlighterColors.java b/src/mobi/hsz/idea/latex/highlighter/LatexHighlighterColors.java
@@ -42,4 +42,7 @@ public class LatexHighlighterColors {
 
     /** Default style for bracket: [](){} */
     public static final TextAttributesKey BRACKET = TextAttributesKey.createTextAttributesKey("LATEX.BRACKET", DefaultLanguageHighlighterColors.BRACKETS);
+
+    /** Default style for Latex instruction's argument */
+    public static final TextAttributesKey ARGUMENT = TextAttributesKey.createTextAttributesKey("LATEX.ARGUMENT", DefaultLanguageHighlighterColors.PARAMETER);
 }
diff --git a/src/mobi/hsz/idea/latex/lang/LatexParserDefinition.java b/src/mobi/hsz/idea/latex/lang/LatexParserDefinition.java
@@ -58,6 +58,9 @@ public class LatexParserDefinition implements ParserDefinition {
     /** Latex instruction started with \ */
     public static final TokenSet INSTRUCTIONS = TokenSet.create(LatexTypes.INSTRUCTION);
 
+    /** Latex instruction's argument */
+    public static final TokenSet ARGUMENTS = TokenSet.create(LatexTypes.ARGUMENT);
+
     /** All brackets: braces, brackets, parenthesis */
     public static final TokenSet BRACKETS = TokenSet.create(
             LatexTypes.LBRACE, LatexTypes.RBRACE,

diff --git a/src/mobi/hsz/idea/latex/lexer/Latex.flex b/src/mobi/hsz/idea/latex/lexer/Latex.flex
@@ -23,28 +23,38 @@ import static com.intellij.psi.TokenType.*;
 %type IElementType
 %unicode
 
-CRLF            = "\r"|"\n"|"\r\n"
+EOL             = "\r"|"\n"|"\r\n"
 LINE_WS         = [\ \t\f]
-WHITE_SPACE     = ({LINE_WS}*{CRLF}+)+
+WHITE_SPACE     = ({LINE_WS}|{EOL})+
 
 INSTRUCTION     = \\[a-zA-Z]+
-COMMENT         = %[^\r\n]*
+ARGUMENT        = [\w ]+
+COMMENT         = %.*
+SPECIAL         = [\S]
+CRLF            = [\s\r\n]+
 
 %state IN_ENTRY
 
 %%
 <YYINITIAL> {
     {WHITE_SPACE}+      { return WHITE_SPACE; }
 
-    {INSTRUCTION}       { return INSTRUCTION; }
-    {COMMENT}           { return COMMENT; }
-
-    "("                 { return LPAREN; }
-    ")"                 { return RPAREN; }
-    "["                 { return LBRACKET; }
-    "]"                 { return RBRACKET; }
     "{"                 { return LBRACE; }
     "}"                 { return RBRACE; }
+    "["                 { return LBRACKET; }
+    "]"                 { return RBRACKET; }
+    "("                 { return LPAREN; }
+    ")"                 { return RPAREN; }
+    ","                 { return COMMA; }
+    ":"                 { return COLON; }
+    "*"                 { return ASTERISK; }
+    "\\\\"              { return LINE_BREAK; }
+
+    {INSTRUCTION}       { return INSTRUCTION; }
+    {ARGUMENT}          { return ARGUMENT; }
+    {COMMENT}           { return COMMENT; }
+    {SPECIAL}           { return SPECIAL; }
+    {CRLF}              { return CRLF; }
 
     [^]                 { yybegin(YYINITIAL); return BAD_CHARACTER; }
 } // <YYINITIAL>
diff --git a/src/mobi/hsz/idea/latex/lexer/LatexLexer.java b/src/mobi/hsz/idea/latex/lexer/LatexLexer.java