support break_before_braces

Author: CppCXY

CodeFormatCore/include/CodeFormatCore/Config/LuaStyle.h

@@ -141,6 +141,8 @@ class LuaStyle {
 
     bool auto_collapse_lines = false;
 
+    bool break_before_braces = false;
+
     // [preference]
 	bool ignore_space_after_colon = false;
 

CodeFormatCore/src/Config/LuaStyle.cpp

@@ -263,6 +263,8 @@ void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &con
 
     BOOL_OPTION(auto_collapse_lines)
 
+    BOOL_OPTION(break_before_braces)
+
     BOOL_OPTION(ignore_space_after_colon)
 
     BOOL_OPTION(remove_call_expression_list_finish_comma)

CodeFormatCore/src/Format/Analyzer/LineBreakAnalyzer.cpp

@@ -19,6 +19,15 @@ void LineBreakAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                     BreakAfter(syntaxNode, t, LineSpace(LineSpaceType::Keep));
                     break;
                 }
+                case '{': {
+                    if (f.GetStyle().break_before_braces) {
+                        auto parent = syntaxNode.GetParent(t);
+                        if (parent.GetSyntaxKind(t) == LuaSyntaxNodeKind::TableExpression && !parent.IsSingleLineNode(t)) {
+                            BreakBefore(syntaxNode, t, LineSpace(LineSpaceType::Keep));
+                        }
+                    }
+                    break;
+                }
                 default: {
                     break;
                 }
@@ -240,14 +249,14 @@ void LineBreakAnalyzer::BreakAfter(LuaSyntaxNode n, const LuaSyntaxTree &t, Line
 }
 
 void LineBreakAnalyzer::BreakBefore(LuaSyntaxNode n, const LuaSyntaxTree &t, std::size_t line) {
-    auto prev = n.GetPrevSibling(t);
+    auto prev = n.GetPrevToken(t);
     if (!prev.IsNull(t)) {
         BreakAfter(prev, t, line);
     }
 }
 
 void LineBreakAnalyzer::BreakBefore(LuaSyntaxNode n, const LuaSyntaxTree &t, LineSpace lineSpace) {
-    auto prev = n.GetPrevSibling(t);
+    auto prev = n.GetPrevToken(t);
     if (!prev.IsNull(t)) {
         BreakAfter(prev, t, lineSpace);
     }

Test/src/FormatStyle_unitest.cpp

@@ -1497,6 +1497,38 @@ map("n",          "<C-j>",   quickfix_step("below"), { buffer = true })
 map("n",          "<C-k>",   quickfix_step("above"), { buffer = true })
 map("n",          "<Space>", "<CR><C-w>p",           { buffer = true })
 map({ "n", "x" }, "<CR>",    "<CR>",                 { buffer = true })
+)",
+            style));
+}
+
+TEST(FormatByStyleOption, break_before_braces) {
+    LuaStyle style;
+
+    style.break_before_braces = false;
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local t = {
+    a = 123
+}
+)",
+            R"(
+local t = {
+    a = 123
+}
+)",
+            style));
+    style.break_before_braces = true;
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local t = {
+    a = 123
+}
+)",
+            R"(
+local t =
+{
+    a = 123
+}
 )",
             style));
 }

Test2/src/FormatTest2.cpp

@@ -8,8 +8,9 @@
 
 int main() {
     std::string buffer = R"(
-map(1231, 3131, 12331113131,1 )
-map(213112, 1, 12313131,1313113131)
+local d = {
+    dddd = 23131;
+}
 )";
 
     auto file = std::make_shared<LuaFile>(std::move(buffer));
@@ -24,7 +25,7 @@ map(213112, 1, 12313131,1313113131)
     std::cout << t.GetDebugView() << std::endl;
 
     LuaStyle s;
-    s.align_continuous_similar_call_args = true;
+    s.break_before_braces = true;
     FormatBuilder b(s);
     auto text = b.GetFormatResult(t);
     std::cout<< text << std::endl;