close #111

Author: CppCXY

CodeService/src/Format/Analyzer/LineBreakAnalyzer.cpp

@@ -246,6 +246,13 @@ void LineBreakAnalyzer::BreakBefore(LuaSyntaxNode n, const LuaSyntaxTree &t, std
     }
 }
 
+void LineBreakAnalyzer::BreakBefore(LuaSyntaxNode n, const LuaSyntaxTree &t, LineSpace lineSpace) {
+    auto prev = n.GetPrevSibling(t);
+    if (!prev.IsNull(t)) {
+        BreakAfter(prev, t, lineSpace);
+    }
+}
+
 void LineBreakAnalyzer::AnalyzeExprList(FormatState &f, LuaSyntaxNode &exprList, const LuaSyntaxTree &t) {
     auto exprs = exprList.GetChildSyntaxNodes(LuaSyntaxMultiKind::Expression, t);
     if (exprs.empty()) {
@@ -361,7 +368,13 @@ void LineBreakAnalyzer::AnalyzeExpr(FormatState &f, LuaSyntaxNode &expr, const L
                                                                                                            });
             }
             if (forceBreak) {
-                BreakAfter(expr.GetChildToken('{', t), t);
+                auto leftBrace = expr.GetChildToken('{', t);
+                if (leftBrace.GetNextSibling(t).GetTokenKind(t) == TK_SHORT_COMMENT || leftBrace.GetNextSibling(t).GetTokenKind(t) == TK_LONG_COMMENT) {
+                    BreakAfter(leftBrace.GetNextSibling(t), t, LineSpace(LineSpaceType::Keep));
+                } else {
+                    BreakAfter(leftBrace, t, LineSpace(LineSpaceType::Keep));
+                }
+
                 for (auto field: fields) {
                     BreakAfter(field, t, LineSpace(LineSpaceType::Keep));
                 }

Test/src/FormatResult_unitest.cpp

@@ -924,4 +924,20 @@ local t = 13 + 123
 
 local t = 13 + 123
 )"));
+}
+
+TEST(Format, feature_111) {
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local table = { -- My comment
+    elem1 = {},
+    elem2 = {}
+}
+)",
+            R"(
+local table = { -- My comment
+    elem1 = {},
+    elem2 = {}
+}
+)"));
 }

Test2/src/FormatTest2.cpp

@@ -8,10 +8,8 @@
 
 int main() {
     std::string buffer = R"(
---Some comment about the file
-
-
-tbl[i], tbl[j] = tbl[j], tbl[i]
+local t = { --131
+ }
 )";
 
     auto file = std::make_shared<LuaFile>(std::move(buffer));
@@ -26,7 +24,7 @@ tbl[i], tbl[j] = tbl[j], tbl[i]
     std::cout << t.GetDebugView() << std::endl;
 
     LuaStyle s;
-    s.trailing_table_separator = TrailingTableSeparator::Always;
+    s.break_all_list_when_line_exceed = true;
     FormatBuilder b(s);
     auto text = b.GetFormatResult(t);
     std::cout<< text << std::endl;

include/CodeService/Format/Analyzer/LineBreakAnalyzer.h

@@ -23,6 +23,8 @@ class LineBreakAnalyzer : public FormatAnalyzer {
 
     void BreakBefore(LuaSyntaxNode n, const LuaSyntaxTree &t, std::size_t line = 1);
 
+    void BreakBefore(LuaSyntaxNode n, const LuaSyntaxTree &t, LineSpace lineSpace);
+
     void MarkLazyBreak(LuaSyntaxNode n, const LuaSyntaxTree &t, LineBreakStrategy strategy);
 
     void MarkNotBreak(LuaSyntaxNode n, const LuaSyntaxTree &t);