fix #121

Author: CppCXY

CodeFormatCore/src/Format/Analyzer/LineBreakAnalyzer.cpp

@@ -19,7 +19,8 @@ void LineBreakAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                     BreakAfter(syntaxNode, t, LineSpace(LineSpaceType::Keep));
                     break;
                 }
-                case '{': {
+                case '{':
+                case '}': {
                     if (f.GetStyle().break_before_braces) {
                         auto parent = syntaxNode.GetParent(t);
                         if (parent.GetSyntaxKind(t) == LuaSyntaxNodeKind::TableExpression && !parent.IsSingleLineNode(t)) {

CodeFormatCore/src/Format/Analyzer/TokenAnalyzer.cpp

@@ -141,10 +141,7 @@ void TokenAnalyzer::AnalyzeTableField(FormatState &f, LuaSyntaxNode &syntaxNode,
     }
 
     if (f.GetStyle().trailing_table_separator != TrailingTableSeparator::Keep) {
-        auto nextToken = syntaxNode.GetNextToken(t);
-        while (nextToken.GetTokenKind(t) == TK_SHORT_COMMENT || nextToken.GetTokenKind(t) == TK_LONG_COMMENT) {
-            nextToken = nextToken.GetNextToken(t);
-        }
+        auto nextToken = syntaxNode.GetNextTokenSkipComment(t);
         // the last table field
         if (nextToken.GetTokenKind(t) == '}') {
             switch (f.GetStyle().trailing_table_separator) {
@@ -160,7 +157,7 @@ void TokenAnalyzer::AnalyzeTableField(FormatState &f, LuaSyntaxNode &syntaxNode,
                 }
                 case TrailingTableSeparator::Smart: {
                     auto tableFieldList = syntaxNode.GetParent(t);
-                    if (tableFieldList.GetStartLine(t) == nextToken.GetStartLine(t)) {
+                    if (tableFieldList.GetEndLine(t) == nextToken.GetStartLine(t)) {
                         auto sep = syntaxNode.GetChildSyntaxNode(LuaSyntaxNodeKind::TableFieldSep, t);
                         auto sepToken = sep.GetFirstToken(t);
                         Mark(sepToken, t, TokenStrategy::Remove);

LuaParser/CMakeLists.txt

@@ -40,3 +40,7 @@ target_sources(LuaParser
         )
 
 target_link_libraries(LuaParser PUBLIC Util)
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    target_compile_options(LuaParser PUBLIC /utf-8)
+endif ()

LuaParser/include/LuaParser/Ast/LuaSyntaxNode.h

@@ -81,6 +81,8 @@ class LuaSyntaxNode {
 
     LuaSyntaxNode GetNextToken(const LuaSyntaxTree &t) const;
 
+    LuaSyntaxNode GetNextTokenSkipComment(const LuaSyntaxTree &t) const;
+
     LuaSyntaxNode GetPrevToken(const LuaSyntaxTree &t) const;
 
     LuaSyntaxNode GetFirstToken(const LuaSyntaxTree &t) const;

LuaParser/src/Ast/LuaSyntaxNode.cpp

@@ -1,5 +1,6 @@
 #include "LuaParser/Ast/LuaSyntaxNode.h"
 #include "LuaParser/Ast/LuaSyntaxTree.h"
+#include "LuaParser/Lexer/LuaTokenTypeDetail.h"
 #include "Util/Utf8.h"
 
 LuaSyntaxNode::LuaSyntaxNode(std::size_t index)
@@ -228,6 +229,18 @@ LuaSyntaxNode LuaSyntaxNode::GetNextToken(const LuaSyntaxTree &t) const {
     return LuaSyntaxNode(t.GetNextToken(_index));
 }
 
+LuaSyntaxNode LuaSyntaxNode::GetNextTokenSkipComment(const LuaSyntaxTree &t) const {
+    if (_index == 0) {
+        return *this;
+    }
+    auto nextIndex = t.GetNextToken(_index);
+    while(t.GetTokenKind(nextIndex) == TK_SHORT_COMMENT || t.GetTokenKind(nextIndex) == TK_LONG_COMMENT) {
+        nextIndex = t.GetNextToken(nextIndex);
+    }
+
+    return LuaSyntaxNode(nextIndex);
+}
+
 LuaSyntaxNode LuaSyntaxNode::GetPrevToken(const LuaSyntaxTree &t) const {
     if (_index == 0) {
         return *this;
@@ -277,3 +290,4 @@ std::size_t LuaSyntaxNode::CountNodeChild(LuaSyntaxNodeKind kind, const LuaSynta
 bool LuaSyntaxNode::IsEmpty(const LuaSyntaxTree &t) const {
     return t.GetFirstChild(_index) == 0;
 }
+

Test/src/FormatResult_unitest.cpp

@@ -1035,4 +1035,26 @@ local t = {
     { "但是", 55, 6 }
 }
 )"));
+}
+
+TEST(Format, issue_121) {
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local t = { function ()
+    local t = 123
+end }
+
+local t = { {
+    okokok = 123
+} }
+)",
+            R"(
+local t = { function()
+    local t = 123
+end }
+
+local t = { {
+    okokok = 123
+} }
+)"));
 }

Test/src/FormatStyle_unitest.cpp

@@ -1523,12 +1523,21 @@ local t = {
 local t = {
     a = 123
 }
+local t = { {
+    okokok = 123
+} }
 )",
             R"(
 local t =
 {
     a = 123
 }
+local t =
+{
+    {
+        okokok = 123
+    }
+}
 )",
             style));
 }

Test2/src/FormatTest2.cpp

@@ -8,11 +8,13 @@
 
 int main() {
     std::string buffer = R"(
-local disable = {
-move= disableControls?.disableMovement,
-oko = disableControls?.disableLook,
-combat = disableControls?.disableCombat,
-}
+local t = { function ()
+    local t = 123
+end }
+
+local t = { {
+    okokok = 123
+} }
 )";
 
     auto file = std::make_shared<LuaFile>(std::move(buffer));
@@ -28,7 +30,6 @@ combat = disableControls?.disableCombat,
     std::cout << t.GetDebugView() << std::endl;
 
     LuaStyle s;
-    s.break_before_braces = true;
     FormatBuilder b(s);
     auto text = b.GetFormatResult(t);
     std::cout<< text << std::endl;