Fix nonstandard symbol parse

Author: CppCXY

gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java

@@ -65,7 +65,7 @@ private static int zzUnpackcmap_top(String packed, int offset, int [] result) {
   private static final int [] ZZ_CMAP_BLOCKS = zzUnpackcmap_blocks();
 
   private static final String ZZ_CMAP_BLOCKS_PACKED_0 =
-    "\11\0\1\1\1\2\1\3\1\1\1\4\22\0\1\5"+
+    "\11\0\1\1\1\2\1\3\1\4\1\5\22\0\1\1"+
     "\14\0\1\6\127\0\1\3\u01a2\0\2\3\326\0\u0100\3";
 
   private static int [] zzUnpackcmap_blocks() {
@@ -149,10 +149,10 @@ private static int zzUnpackRowMap(String packed, int offset, int [] result) {
   private static final int [] ZZ_TRANS = zzUnpacktrans();
 
   private static final String ZZ_TRANS_PACKED_0 =
-    "\1\3\1\4\1\5\1\6\1\7\1\4\1\10\1\11"+
-    "\1\4\1\5\1\11\1\7\1\12\1\11\10\0\1\4"+
-    "\3\0\1\4\3\0\1\5\12\0\1\13\1\11\2\0"+
-    "\1\11\1\0\3\11\1\4\1\0\1\11\1\0\1\12"+
+    "\1\3\1\4\1\5\1\6\1\4\1\7\1\10\1\11"+
+    "\1\12\1\5\1\11\1\4\1\7\1\11\10\0\1\4"+
+    "\2\0\1\4\4\0\1\5\12\0\1\13\2\11\1\0"+
+    "\1\11\2\0\2\11\1\12\1\0\1\11\1\4\1\0"+
     "\1\11";
 
   private static int [] zzUnpacktrans() {

src/main/java/com/tang/intellij/lua/doc.flex

@@ -36,7 +36,7 @@ import com.tang.intellij.lua.comment.psi.LuaDocTypes;
 EOL="\r"|"\n"|"\r\n"
 LINE_WS=[\ \t\f]
 WHITE_SPACE=({LINE_WS}|{EOL})+
-STRING=[^\r\n\t\f]*
+STRING=[^\r\n\f]*
 //三个-以上
 DOC_DASHES = --+
 //Strings

src/main/java/com/tang/intellij/lua/psi/parser/LuaExpressionParser.kt

@@ -27,11 +27,11 @@ object LuaExpressionParser {
 
     enum class ExprType(val ops: TokenSet) {
         // or
-        T_OR(TokenSet.create(OR)),
+        T_OR(TokenSet.create(OR, LOGICAL_OR)),
         // and
-        T_AND(TokenSet.create(AND)),
+        T_AND(TokenSet.create(AND, LOGICAL_AND)),
         // < > <= >= ~= ==
-        T_CONDITION(TokenSet.create(GT, LT, GE, LE, NE, EQ)),
+        T_CONDITION(TokenSet.create(GT, LT, GE, LE, NE, EQ, NOT_EQ)),
         // |
         T_BIT_OR(TokenSet.create(BIT_OR)),
         // ~
@@ -47,7 +47,7 @@ object LuaExpressionParser {
         // * / // %
         T_MULTIPLICATIVE(TokenSet.create(MULT, DIV, DOUBLE_DIV, MOD)),
         // not # - ~
-        T_UNARY(TokenSet.create(NOT, GETN, MINUS, BIT_TILDE)),
+        T_UNARY(TokenSet.create(NOT, GETN, MINUS, BIT_TILDE, LOGICAL_NOT)),
         // ^
         T_EXP(TokenSet.create(EXP)),
         // value expr

src/main/java/com/tang/intellij/lua/psi/parser/LuaStatementParser.kt

@@ -32,6 +32,7 @@ object LuaStatementParser : GeneratedParserUtilBase() {
             DOUBLE_COLON -> parseLabelStatement(b)
             GOTO -> parseGotoStatement(b)
             BREAK -> parseBreakStatement(b)
+            CONTINUE -> parseContinueStatement(b)
             RETURN -> parseReturnStatement(b, l)
             LOCAL -> parseLocalDef(b, l)
             FOR -> parseForStatement(b, l)
@@ -201,6 +202,14 @@ object LuaStatementParser : GeneratedParserUtilBase() {
         return m
     }
 
+    private fun parseContinueStatement(b: PsiBuilder): PsiBuilder.Marker {
+        val m = b.mark()
+        b.advanceLexer()
+
+        doneStat(b, m, CONTINUE_STAT)
+        return m
+    }
+
     private fun parseReturnStatement(b: PsiBuilder, l: Int): PsiBuilder.Marker {
         val m = b.mark()
         b.advanceLexer()
@@ -372,30 +381,41 @@ object LuaStatementParser : GeneratedParserUtilBase() {
                 NAME_EXPR, INDEX_EXPR -> {
                     var c = expr
                     var isAssignment = false
+                    var isCompoundAssignment = false
+
                     while (b.tokenType == COMMA) {
                         isAssignment = true
                         b.advanceLexer() // ,
                         expectExpr(b, l + 1)
                     }
 
-                    // =
+                    // = (普通赋值)
                     if (isAssignment) {
                         c = c.precede()
                         c.done(VAR_LIST)
                         expectError(b, ASSIGN) { "'='" }
                     } else if (b.tokenType == ASSIGN) {
                         c = c.precede()
                         c.done(VAR_LIST)
-
                         b.advanceLexer()
                         isAssignment = true
                     }
+                    // 复合赋值操作符 (+=, -=, *=, 等)
+                    else if (isCompoundAssignOp(b.tokenType)) {
+                        isCompoundAssignment = true
+                        b.advanceLexer() // 消费复合赋值操作符
+                    }
 
                     if (isAssignment) {
                         expectExprList(b, l + 1)
                         val m = c.precede()
                         doneStat(b, m, ASSIGN_STAT)
                         return m
+                    } else if (isCompoundAssignment) {
+                        expectExpr(b, l + 1) // 复合赋值只需要一个表达式
+                        val m = c.precede()
+                        doneStat(b, m, COMPOUND_ASSIGN_STAT)
+                        return m
                     }
                 }
             }
@@ -420,4 +440,14 @@ object LuaStatementParser : GeneratedParserUtilBase() {
         expect(b, SEMI)
         done(m, type)
     }
+
+    // 检查是否为复合赋值操作符
+    private fun isCompoundAssignOp(tokenType: IElementType?): Boolean {
+        return when (tokenType) {
+            PLUS_ASSIGN, MINUS_ASSIGN, MULT_ASSIGN, DIV_ASSIGN,
+            MOD_ASSIGN, EXP_ASSIGN, DOUBLE_DIV_ASSIGN,
+            BIT_OR_ASSIGN, BIT_AND_ASSIGN, BIT_LTLT_ASSIGN, BIT_RTRT_ASSIGN -> true
+            else -> false
+        }
+    }
 }