Complete #89

Author: CppCXY

CodeService/src/Config/LuaStyle.cpp

@@ -224,8 +224,4 @@ void LuaStyle::ParseFromMap(std::map<std::string, std::string, std::less<>> &con
     BOOL_OPTION(ignore_space_after_colon)
 
     BOOL_OPTION(remove_call_expression_list_finish_comma)
-
-    BOOL_OPTION(table_use_continuation_indent)
-
-    BOOL_OPTION(function_call_use_continuation_indent)
 }

CodeService/src/Format/Analyzer/IndentationAnalyzer.cpp

@@ -130,22 +130,43 @@ void IndentationAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                 case LuaSyntaxNodeKind::TableExpression: {
                     auto tableFieldList = syntaxNode.GetChildSyntaxNode(LuaSyntaxNodeKind::TableFieldList, t);
                     for (auto field: tableFieldList.GetChildren(t)) {
-                        if (f.GetStyle().table_use_continuation_indent) {
-                            Indenter(field, t, IndentData(
-                                    IndentType::WhenLineBreak,
-                                    f.GetStyle().continuation_indent
-                            ));
-                        } else {
-                            Indenter(field, t, IndentData(
-                                    IndentType::WhenLineBreak,
-                                    f.GetStyle().indent_style == IndentStyle::Space ?
-                                    f.GetStyle().indent_size : f.GetStyle().tab_width
-                            ));
-                        }
+                        Indenter(field, t, IndentData(
+                                IndentType::WhenLineBreak,
+                                f.GetStyle().indent_style == IndentStyle::Space ?
+                                f.GetStyle().indent_size : f.GetStyle().tab_width
+                        ));
                     }
 
                     break;
                 }
+                case LuaSyntaxNodeKind::TableField: {
+                    if (syntaxNode.GetChildToken('=', t).IsToken(t)) {
+                        auto expr = syntaxNode.GetChildSyntaxNode(LuaSyntaxMultiKind::Expression, t);
+                        AnalyzeTableFieldKeyValuePairExpr(f, expr, t);
+                    }
+                        // suffix expr
+                    else {
+                        auto suffixedExpression = syntaxNode.GetChildSyntaxNode(NodeKind::SuffixedExpression, t);
+
+                        for (auto expr: suffixedExpression.GetChildren(t)) {
+                            if (expr.GetSyntaxKind(t) == LuaSyntaxNodeKind::IndexExpression) {
+                                Indenter(expr, t, IndentData(
+                                        IndentType::Standard,
+                                        f.GetStyle().continuation_indent
+                                ));
+                            } else if (expr.GetSyntaxKind(t) == LuaSyntaxNodeKind::CallExpression) {
+                                auto prevSibling = expr.GetPrevSibling(t);
+                                if (prevSibling.GetSyntaxKind(t) != LuaSyntaxNodeKind::NameExpression) {
+                                    Indenter(expr, t, IndentData(
+                                            IndentType::WhenPrevIndent,
+                                            f.GetStyle().continuation_indent
+                                    ));
+                                }
+                            }
+                        }
+                    }
+                    break;
+                }
                 default: {
                     break;
                 }
@@ -250,15 +271,7 @@ void IndentationAnalyzer::AnalyzeCallExprList(FormatState &f, LuaSyntaxNode &exp
     }
 
     if (shouldIndent) {
-        auto indent = f.GetStyle().function_call_use_continuation_indent
-                      ? f.GetStyle().continuation_indent
-                      : (f.GetStyle().indent_style == IndentStyle::Space
-                         ? f.GetStyle().indent_size
-                         : f.GetStyle().tab_width);
-        Indenter(exprList, t, IndentData(
-                IndentType::Standard,
-                indent
-        ));
+        Indenter(exprList, t, IndentData(IndentType::Standard));
     }
 }
 
@@ -313,3 +326,20 @@ bool IndentationAnalyzer::IsExprShouldIndent(LuaSyntaxNode &expr, const LuaSynta
     }
     return false;
 }
+
+void
+IndentationAnalyzer::AnalyzeTableFieldKeyValuePairExpr(FormatState &f, LuaSyntaxNode &expr, const LuaSyntaxTree &t) {
+    auto syntaxKind = expr.GetSyntaxKind(t);
+    // special deal with
+    if (syntaxKind == LuaSyntaxNodeKind::TableExpression
+        || syntaxKind == LuaSyntaxNodeKind::StringLiteralExpression) {
+        return;
+    }
+
+    if (IsExprShouldIndent(expr, t)) {
+        Indenter(expr, t, IndentData(
+                IndentType::Standard,
+                f.GetStyle().continuation_indent
+        ));
+    }
+}

CodeService/src/Format/Analyzer/LineBreakAnalyzer.cpp

@@ -149,6 +149,13 @@ void LineBreakAnalyzer::ComplexAnalyze(FormatState &f, const LuaSyntaxTree &t) {
 
                     break;
                 }
+                case LuaSyntaxNodeKind::TableField: {
+                    auto expr = syntaxNode.GetChildSyntaxNode(LuaSyntaxMultiKind::Expression, t);
+                    if (expr.IsNode(t)) {
+                        AnalyzeExpr(f, expr, t);
+                    }
+                    break;
+                }
                 case LuaSyntaxNodeKind::ExpressionStatement: {
                     auto suffixedExpression = syntaxNode.GetChildSyntaxNode(NodeKind::SuffixedExpression, t);
                     if (suffixedExpression.IsNode(t)) {

Test/src/FormatResult_unitest.cpp

@@ -676,8 +676,8 @@ end
             R"(
 local t = {
     a = cond
-    and "is true"
-    or "is not true"
+        and "is true"
+        or "is not true"
 }
 
 

include/CodeService/Config/LuaStyle.h

@@ -145,8 +145,4 @@ class LuaStyle {
 
     // not implement now
     bool leading_comma_style = false;
-
-    bool table_use_continuation_indent = false;
-
-    bool function_call_use_continuation_indent = false;
 };

include/CodeService/Format/Analyzer/IndentationAnalyzer.h

@@ -33,6 +33,8 @@ class IndentationAnalyzer : public FormatAnalyzer {
 
     void AnalyzeCallExprList(FormatState &f, LuaSyntaxNode &exprList, const LuaSyntaxTree &t);
 
+    void AnalyzeTableFieldKeyValuePairExpr(FormatState &f, LuaSyntaxNode &expr, const LuaSyntaxTree &t);
+
     bool IsExprShouldIndent(LuaSyntaxNode &expr, const LuaSyntaxTree &t);
 
     std::unordered_map<std::size_t, IndentData> _indent;