fix sumenko_1969

Author: CppCXY

CodeService/src/Format/Analyzer/IndentationAnalyzer.cpp

@@ -141,7 +141,7 @@ void IndentationAnalyzer::Analyze(FormatState &f, const LuaSyntaxTree &t) {
                 }
                 case LuaSyntaxNodeKind::TableField: {
                     if (syntaxNode.GetChildToken('=', t).IsToken(t)) {
-                        auto expr = syntaxNode.GetChildSyntaxNode(LuaSyntaxMultiKind::Expression, t);
+                        auto expr = syntaxNode.GetLastChildSyntaxNode(LuaSyntaxMultiKind::Expression, t);
                         AnalyzeTableFieldKeyValuePairExpr(f, expr, t);
                     }
                         // suffix expr

LuaParser/src/Ast/LuaSyntaxNode.cpp

@@ -67,6 +67,10 @@ void LuaSyntaxNode::ToNext(const LuaSyntaxTree &t) {
     _index = t.GetNextSibling(_index);
 }
 
+void LuaSyntaxNode::ToPrev(const LuaSyntaxTree &t) {
+    _index = t.GetPrevSibling(_index);
+}
+
 bool LuaSyntaxNode::IsNull(const LuaSyntaxTree &t) const {
     return _index == 0;
 }
@@ -126,6 +130,27 @@ LuaSyntaxNode LuaSyntaxNode::GetChildSyntaxNode(LuaSyntaxMultiKind kind, const L
     return child;
 }
 
+LuaSyntaxNode LuaSyntaxNode::GetLastChildSyntaxNode(LuaSyntaxNodeKind kind, const LuaSyntaxTree &t) const {
+    auto child = GetLastChild(t);
+    for (; !child.IsNull(t); child.ToPrev(t)) {
+        if (child.GetSyntaxKind(t) == kind) {
+            break;
+        }
+    }
+    return child;
+}
+
+LuaSyntaxNode LuaSyntaxNode::GetLastChildSyntaxNode(LuaSyntaxMultiKind kind, const LuaSyntaxTree &t) const {
+    auto child = GetLastChild(t);
+    for (; !child.IsNull(t); child.ToPrev(t)) {
+        if (detail::multi_match::Match(kind, child.GetSyntaxKind(t))) {
+            break;
+        }
+    }
+    return child;
+}
+
+
 LuaSyntaxNode LuaSyntaxNode::GetChildToken(LuaTokenKind kind, const LuaSyntaxTree &t) const {
     auto child = GetFirstChild(t);
     for (; !child.IsNull(t); child.ToNext(t)) {
@@ -242,3 +267,5 @@ std::size_t LuaSyntaxNode::CountNodeChild(LuaSyntaxNodeKind kind, const LuaSynta
 bool LuaSyntaxNode::IsEmpty(const LuaSyntaxTree &t) const {
     return t.GetFirstChild(_index) == 0;
 }
+
+

Test/src/FormatResult_unitest.cpp

@@ -742,4 +742,24 @@ null_ls.setup {
     }
 }
 )", style));
+}
+
+TEST(Format, sumneko_1969) {
+    EXPECT_TRUE(TestHelper::TestFormatted(
+            R"(
+Garbage = {
+	    ["BahamaFrontDesk"] = {
+		Coords = vector3( -1382.54, -592.77, 29.91),
+		--Prop = "",
+	}
+}
+)",
+            R"(
+Garbage = {
+    ["BahamaFrontDesk"] = {
+        Coords = vector3(-1382.54, -592.77, 29.91),
+        --Prop = "",
+    }
+}
+)"));
 }

include/LuaParser/Ast/LuaSyntaxNode.h

@@ -47,6 +47,8 @@ class LuaSyntaxNode {
 
     void ToNext(const LuaSyntaxTree &t);
 
+    void ToPrev(const LuaSyntaxTree &t);
+
     bool IsNull(const LuaSyntaxTree &t) const;
 
     bool IsEmpty(const LuaSyntaxTree &t) const;
@@ -61,6 +63,10 @@ class LuaSyntaxNode {
 
     LuaSyntaxNode GetChildSyntaxNode(LuaSyntaxMultiKind kind, const LuaSyntaxTree &t) const;
 
+    LuaSyntaxNode GetLastChildSyntaxNode(LuaSyntaxNodeKind kind, const LuaSyntaxTree &t) const;
+
+    LuaSyntaxNode GetLastChildSyntaxNode(LuaSyntaxMultiKind kind, const LuaSyntaxTree &t) const;
+
     LuaSyntaxNode GetChildToken(LuaTokenKind kind, const LuaSyntaxTree &t) const;
 
     LuaSyntaxNode GetChildToken(std::function<bool(LuaTokenKind)> predicated, const LuaSyntaxTree &t) const;