修复一个多余缩进的问题

Author: CppCXY

CodeService/src/Format/Analyzer/IndentationAnalyzer.cpp

@@ -108,7 +108,7 @@ void IndentationAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                             ));
                         } else if (expr.GetSyntaxKind(t) == LuaSyntaxNodeKind::CallExpression) {
                             auto prevSibling = expr.GetPrevSibling(t);
-                            if(prevSibling.GetSyntaxKind(t) != LuaSyntaxNodeKind::NameExpression) {
+                            if (prevSibling.GetSyntaxKind(t) != LuaSyntaxNodeKind::NameExpression) {
                                 Indenter(expr, t, IndentData(
                                         IndentType::WhenPrevIndent,
                                         f.GetStyle().continuation_indent
@@ -147,7 +147,13 @@ void IndentationAnalyzer::AnalyzeExprList(FormatState &f, LuaSyntaxNode &exprLis
             || syntaxKind == LuaSyntaxNodeKind::StringLiteralExpression) {
             return;
         }
-//        if()
+        if (syntaxKind == LuaSyntaxNodeKind::SuffixedExpression) {
+            auto callExpr = expr.GetChildSyntaxNode(LuaSyntaxNodeKind::CallExpression, t);
+            if (callExpr.IsNode(t)
+                && (callExpr.GetPrevToken(t).GetStartLine(t) == expr.GetPrevToken(t).GetStartLine(t))) {
+                return;
+            }
+        }
     }
     Indenter(exprList, t, IndentData(
             IndentType::Standard,

Test2/src/FormatTest2.cpp

@@ -6,31 +6,27 @@
 #include "CodeService/Config/EditorconfigPattern.h"
 
 int main() {
-//    std::string buffer = R"(
-//p("456")
-//)";
-//
-//    auto file = std::make_shared<LuaFile>(std::move(buffer));
-//    LuaLexer luaLexer(file);
-//    luaLexer.Parse();
-//
-//    LuaParser p(file, std::move(luaLexer.GetTokens()));
-//    p.Parse();
-//
-//    LuaSyntaxTree t;
-//    t.BuildTree(p);
-//    std::cout << t.GetDebugView() << std::endl;
-//
-//    LuaStyle s;
-//    s.call_arg_parentheses = CallArgParentheses::Remove;
-//    FormatBuilder b(s);
-//    auto text = b.GetFormatResult(t);
-//    std::cout<< text << std::endl;
+    std::string buffer = R"(
+local t = a.b.c.setmetatable(f, function ()
+end)
+)";
 
-    EditorconfigPattern p;
-    p.Compile("Content/**.lua");
+    auto file = std::make_shared<LuaFile>(std::move(buffer));
+    LuaLexer luaLexer(file);
+    luaLexer.Parse();
 
-    p.Match("Content/1.lua");
+    LuaParser p(file, std::move(luaLexer.GetTokens()));
+    p.Parse();
+
+    LuaSyntaxTree t;
+    t.BuildTree(p);
+    std::cout << t.GetDebugView() << std::endl;
+
+    LuaStyle s;
+    s.call_arg_parentheses = CallArgParentheses::Remove;
+    FormatBuilder b(s);
+    auto text = b.GetFormatResult(t);
+    std::cout<< text << std::endl;
 
 //    LuaDiagnosticStyle style;
 //    StyleDiagnostic d(style);