fix #93

Author: CppCXY

CodeService/src/Format/Analyzer/IndentationAnalyzer.cpp

@@ -58,20 +58,6 @@ void IndentationAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                     if (syntaxNode.GetChildToken('(', t).IsToken(t)) {
                         auto exprList = syntaxNode.GetChildSyntaxNode(NodeKind::ExpressionList, t);
                         if (exprList.IsNode(t)) {
-//                            for (auto expr: exprList.GetChildren(t)) {
-//                                if (f.GetStyle().function_call_use_continuation_indent) {
-//                                    Indenter(expr, t, IndentData(
-//                                            IndentType::WhenLineBreak,
-//                                            f.GetStyle().continuation_indent
-//                                    ));
-//                                } else {
-//                                    Indenter(expr, t, IndentData(
-//                                            IndentType::WhenLineBreak,
-//                                            f.GetStyle().indent_style == IndentStyle::Space ?
-//                                            f.GetStyle().indent_size : f.GetStyle().tab_width
-//                                    ));
-//                                }
-//                            }
                             AnalyzeCallExprList(f, exprList, t);
                         }
                     }
@@ -296,7 +282,7 @@ bool IndentationAnalyzer::IsExprShouldIndent(LuaSyntaxNode &expr, const LuaSynta
         case LuaSyntaxNodeKind::SuffixedExpression: {
             auto subExprs = expr.GetChildSyntaxNodes(LuaSyntaxMultiKind::Expression, t);
             for (auto subExpr: subExprs) {
-                if (subExpr.GetStartLine(t) != symbolLine) {
+                if (IsExprShouldIndent(subExpr, t)) {
                     return true;
                 }
             }

Test/src/FormatResult_unitest.cpp

@@ -762,4 +762,36 @@ Garbage = {
     }
 }
 )"));
+}
+
+TEST(Format, codestyle_93) {
+    LuaStyle s;
+    s.indent_size = 2;
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+local context = {
+  form_field_token = utils.trunk(form_field_token, 2):map(function(e)
+    local form_item_token, widget = e[1], e[2]
+    return format(form_item_token, widget)
+  end):join('\n'),
+}
+local a = aaa.p(function()
+end):okok()
+local a2 = aaa.p(function()
+    end)
+    :okok()
+)",
+            R"(
+local context = {
+  form_field_token = utils.trunk(form_field_token, 2):map(function(e)
+    local form_item_token, widget = e[1], e[2]
+    return format(form_item_token, widget)
+  end):join('\n'),
+}
+local a = aaa.p(function()
+end):okok()
+local a2 = aaa.p(function()
+    end)
+    :okok()
+)", s));
 }

include/CodeService/Config/LuaStyle.h

@@ -145,4 +145,6 @@ class LuaStyle {
 
     // not implement now
     bool leading_comma_style = false;
+
+    bool table_list_special_continue_indent = true;
 };