Improve AT lexer to handle really bad naming

If some poor unfortunate soul tires to use Spigot mappings in an AT file
they'll find highlighting doesn't work right. This commit should
fix that. The regex for class names and field names has also been
expanded to more correctly accept unicode identifiers and non dollar
sign currency symbols.

Author: DenWav

gradle.properties

@@ -13,5 +13,5 @@ ideaVersion = 2018.2
 
 name = MinecraftDev
 group = com.demonwav.minecraft-dev
-version = 2018.2-1.2.9
+version = 2018.2-1.2.10
 downloadIdeaSources = true

readme.md

@@ -11,7 +11,7 @@ Minecraft Development for IntelliJ
 |   **Travis (macOS)**   |[![Travis macOS Build Status](https://travis-matrix-badges.herokuapp.com/repos/minecraft-dev/MinecraftDev/branches/dev/2)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 | **TeamCity (Windows)** |[![TeamCity Windows Build Status](https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_WindowsBuild)/statusIcon)](https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_WindowsBuild)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.2--1.2.9-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.2--1.2.10-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

src/main/grammars/AtLexer.flex

@@ -28,34 +28,46 @@ import static com.intellij.psi.TokenType.*;
 %implements FlexLexer
 %function advance
 %type IElementType
+
+%s CLASS_NAME
+%s MEMBER_NAME
+%s TYPES
+
 %unicode
 
 PRIMITIVE=[ZBCSIFDJV]
-CLASS_VALUE=\[*([ZBCSIFDJ]|L[^;\n]+;)
+CLASS_VALUE=(\[+[ZBCSIFDJ]|(\[*L[^;\n]+;))
 KEYWORD_ELEMENT=(public|private|protected|default)([-+]f)?
-NAME_ELEMENT=[a-zA-Z0-9_]+|<init>
-CLASS_NAME_ELEMENT=[a-zA-Z_$0-9\.]*[a-zA-Z_$0-9]
+NAME_ELEMENT=([\p{L}_\p{Sc}][\p{L}\p{N}_\p{Sc}]*)|<init>
+CLASS_NAME_ELEMENT=([\p{L}_\p{Sc}][\p{L}\p{N}_\p{Sc}]*\.)*[\p{L}_\p{Sc}][\p{L}\p{N}_\p{Sc}]*
 COMMENT=#.*
 CRLF=\n|\r|\r\n
 WHITE_SPACE=\s
 
 %%
 
 <YYINITIAL> {
-    {CRLF}                                      { return CRLF; }
-    {WHITE_SPACE}                               { return WHITE_SPACE; }
+    {KEYWORD_ELEMENT}                           { yybegin(CLASS_NAME); return KEYWORD_ELEMENT; }
+}
 
-    "("                                         { return OPEN_PAREN; }
-    ")"                                         { return CLOSE_PAREN; }
-    "*" | "*()"                                 { return ASTERISK_ELEMENT; }
+<CLASS_NAME> {
+    {CLASS_NAME_ELEMENT}                        { yybegin(MEMBER_NAME); return CLASS_NAME_ELEMENT; }
+}
 
-    {PRIMITIVE} ({PRIMITIVE}|{CLASS_VALUE})*    { zzMarkedPos = zzStartRead + 1; return PRIMITIVE; }
+<MEMBER_NAME> {
+    "*" | "*()"                                 { return ASTERISK_ELEMENT; }
+    {NAME_ELEMENT}                              { yybegin(TYPES); return NAME_ELEMENT; }
+}
 
+<TYPES> {
+    "("                                         { return OPEN_PAREN; }
+    ")"                                         { return CLOSE_PAREN; }
     {CLASS_VALUE}                               { return CLASS_VALUE; }
-    {KEYWORD_ELEMENT}                           { return KEYWORD_ELEMENT; }
-    {NAME_ELEMENT}                              { return NAME_ELEMENT; }
-    {CLASS_NAME_ELEMENT}                        { return CLASS_NAME_ELEMENT; }
-    {COMMENT}                                   { return COMMENT; }
+    {PRIMITIVE} ({PRIMITIVE}|{CLASS_VALUE})*    { zzMarkedPos = zzStartRead + 1; return PRIMITIVE; }
 }
 
+{CRLF}                                          { yybegin(YYINITIAL); return CRLF; }
+{WHITE_SPACE}                                   { return WHITE_SPACE; }
+
+{COMMENT}                                       { return COMMENT; }
 [^]                                             { return BAD_CHARACTER; }

src/main/resources/META-INF/plugin.xml

@@ -28,7 +28,7 @@
       <div>
         Please report issues to <a href="https://github.com/minecraft-dev/MinecraftDev/issues">the issue tracker</a>!
         <p>
-        v. 2018.2-1.2.9
+        v. 2018.2-1.2.10
       </div>
     ]]>
     </change-notes>