optimize BNF

Author: tangzx

gen/com/tang/intellij/lua/parser/LuaParser.java

@@ -56,9 +56,11 @@ private static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings) {
                 .after(DO).lineBreakInCode()
                 .after(THEN).lineBreakInCode()
                 .after(LOCAL).spaces(1) //local<SPACE>
+                .before(COMMA).spaces(settings.SPACE_BEFORE_COMMA ? 1 : 0)
                 .after(COMMA).spaces(settings.SPACE_AFTER_COMMA ? 1 : 0) //,<SPACE>
                 .between(LCURLY, TABLE_FIELD).spaces(1) // {<SPACE>1, 2 }
                 .between(TABLE_FIELD, RCURLY).spaces(1) // { 1, 2<SPACE>}
+                .before(TABLE_FIELD_SEP).none() // { 1<SPACE>, 2 }
                 .after(TABLE_FIELD_SEP).spaces(luaCodeStyleSettings.SPACE_AFTER_TABLE_FIELD_SEP ? 1 : 0) // { 1,<SPACE>2 }
                 .before(BLOCK).blankLines(0)
                 .afterInside(RPAREN, FUNC_BODY).lineBreakInCode()
@@ -68,7 +70,6 @@ private static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings) {
                 .around(UNARY_OP).none()
                 .around(ASSIGN).lineBreakOrForceSpace(false, settings.SPACE_AROUND_ASSIGNMENT_OPERATORS) // = 号两头不能换行
                 .around(LuaSyntaxHighlighter.KEYWORD_TOKENS).spaces(1)
-                .before(COMMA).spaces(settings.SPACE_BEFORE_COMMA ? 1 : 0)
                 .before(SEMI).spaces(0);
     }
 

gen/com/tang/intellij/lua/psi/LuaFieldList.java

@@ -41,8 +41,7 @@ open class LuaScriptBlock(private val parent: LuaScriptBlock?,
 
     //不创建 ASTBlock
     private val fakeBlockSet = TokenSet.create(
-            BLOCK,
-            FIELD_LIST
+            BLOCK
     )
 
     //回车时
@@ -71,21 +70,28 @@ open class LuaScriptBlock(private val parent: LuaScriptBlock?,
     }
 
     private fun buildChildren(parent: ASTNode, results: MutableList<Block>) {
-        var node: ASTNode? = parent.firstChildNode
+        var child: ASTNode? = parent.firstChildNode
         val parentType = parent.elementType
         var childIndent = Indent.getNoneIndent()
         if (fakeBlockSet.contains(parentType)) {
             childIndent = Indent.getNormalIndent()
         }
 
-        while (node != null) {
-            val nodeElementType = node.elementType
-            if (fakeBlockSet.contains(nodeElementType)) {
-                buildChildren(node, results)
-            } else if (shouldCreateBlockFor(node)) {
-                results.add(createBlock(node, childIndent, null))
+        while (child != null) {
+            val childType = child.elementType
+            if (parentType == TABLE_EXPR ) {
+                if (childType != LCURLY && childType != RCURLY)
+                    childIndent = Indent.getNormalIndent()
+                else
+                    childIndent = Indent.getNoneIndent()
             }
-            node = node.treeNext
+
+            if (fakeBlockSet.contains(childType)) {
+                buildChildren(child, results)
+            } else if (shouldCreateBlockFor(child)) {
+                results.add(createBlock(child, childIndent, null))
+            }
+            child = child.treeNext
         }
     }
 

gen/com/tang/intellij/lua/psi/LuaTableExpr.java

@@ -17,13 +17,11 @@
 package com.tang.intellij.lua.lang.type;
 
 import com.tang.intellij.lua.psi.LuaClassField;
-import com.tang.intellij.lua.psi.LuaFieldList;
 import com.tang.intellij.lua.psi.LuaTableExpr;
 import com.tang.intellij.lua.psi.LuaTableField;
 import com.tang.intellij.lua.search.SearchContext;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -62,11 +60,7 @@ public String getDisplayName() {
 
     private void InitFieldList() {
         if (tableFields == null) {
-            tableFields = new ArrayList<>();
-            LuaFieldList fieldList = tableConstructor.getFieldList();
-            if (fieldList != null) {
-                tableFields.addAll(fieldList.getTableFieldList());
-            }
+            tableFields =  tableConstructor.getTableFieldList();
         }
     }