恢复缩进检测，修复格式化bug

Author: CppCXY

CodeService/src/FormatElement/KeepElement.cpp

@@ -39,6 +39,11 @@ void KeepElement::Serialize(FormatContext& ctx, int position, FormatElement& par
 
 void KeepElement::Diagnosis(DiagnosisContext& ctx, int position, FormatElement& parent)
 {
+	if(position == 0)
+	{
+		return;
+	}
+
 	int lastOffset = getLastValidOffset(position, parent);
 	int nextOffset = getNextValidOffset(position, parent);
 
@@ -57,4 +62,8 @@ void KeepElement::Diagnosis(DiagnosisContext& ctx, int position, FormatElement&
 			ctx.PushDiagnosis(format(LText("here need keep {} space"), _keepBlank), TextRange(lastOffset, nextOffset));
 		}
 	}
+	else
+	{
+		ctx.SetCharacterCount(0);
+	}
 }

CodeService/src/FormatElement/KeepLineElement.cpp

@@ -56,4 +56,6 @@ void KeepLineElement::Diagnosis(DiagnosisContext& ctx, int position, FormatEleme
 			                  TextRange(lastElementOffset, nextElementOffset));
 		}
 	}
+	ctx.SetCharacterCount(0);
+
 }

CodeService/src/FormatElement/LineElement.cpp

@@ -15,3 +15,8 @@ void LineElement::Serialize(FormatContext& ctx, int position, FormatElement& par
 {
 	ctx.PrintLine(1);
 }
+
+void LineElement::Diagnosis(DiagnosisContext& ctx, int position, FormatElement& parent)
+{
+	ctx.SetCharacterCount(0);
+}

CodeService/src/FormatElement/LongExpressionLayoutElement.cpp

@@ -1,6 +1,7 @@
 #include "CodeService/FormatElement/LongExpressionLayoutElement.h"
+#include "CodeService/FormatElement/KeepElement.h"
 
-LongExpressionLayoutElement::LongExpressionLayoutElement(int continuationIndent)
+LongExpressionLayoutElement::LongExpressionLayoutElement(int continuationIndent, bool isAssignLeftExprList)
 	: _hasContinuation(false),
 	  _continuationIndent(continuationIndent)
 {

CodeService/src/FormatElement/MinLineElement.cpp

@@ -59,4 +59,5 @@ void MinLineElement::Diagnosis(DiagnosisContext& ctx, int position, FormatElemen
 	{
 		ctx.PushDiagnosis(format(LText("here need at least {} line"), _line), TextRange(lastOffset, nextOffset));
 	}
+	ctx.SetCharacterCount(0);
 }

CodeService/src/FormatElement/StatementElement.cpp

@@ -11,3 +11,9 @@ void StatementElement::Serialize(FormatContext& ctx, int position, FormatElement
 
 	ctx.PrintLine(1);
 }
+
+void StatementElement::Diagnosis(DiagnosisContext& ctx, int position, FormatElement& parent)
+{
+	FormatElement::Diagnosis(ctx, position, parent);
+	ctx.SetCharacterCount(0);
+}

CodeService/src/LuaFormatter.cpp

@@ -382,6 +382,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatAssignment(std::shared_ptr<Lu
 					env->Add<KeepBlankElement>(1);
 					isLeftExprList = false;
 				}
+
 				break;
 			}
 		default:
@@ -461,6 +462,36 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatExpressionList(std::shared_pt
 	return env;
 }
 
+std::shared_ptr<FormatElement> LuaFormatter::FormatAssignLeftExpressionList(std::shared_ptr<LuaAstNode> expressionList)
+{
+	auto env = std::make_shared<LongExpressionLayoutElement>(_options.continuation_indent, true);
+
+	for (auto node : expressionList->GetChildren())
+	{
+		switch (node->GetType())
+		{
+		case LuaAstNodeType::Expression:
+			{
+				auto subEnv = std::make_shared<SubExpressionElement>();
+				env->AddChild(FormatExpression(node, subEnv));
+				env->Add<KeepElement>(0);
+				break;
+			}
+		case LuaAstNodeType::GeneralOperator:
+			{
+				env->Add<TextElement>(node);
+				env->Add<KeepElement>(1);
+				break;
+			}
+		default:
+			DefaultHandle(node, env);
+			env->Add<KeepElement>(1);
+		}
+	}
+
+	return env;
+}
+
 std::shared_ptr<FormatElement> LuaFormatter::FormatComment(std::shared_ptr<LuaAstNode> comment)
 {
 	auto env = std::make_shared<ExpressionElement>();
@@ -910,6 +941,10 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallArgList(std::shared_ptr<L
 				}
 				else
 				{
+					auto& exprListChildren = exprListEnv->GetChildren();
+					auto keepElement = std::make_shared<KeepElement>(0);
+					exprListChildren.insert(exprListChildren.begin(), keepElement);
+
 					env->AddChild(exprListEnv);
 				}
 
@@ -1444,8 +1479,8 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatNodeAndBlockOrEnd(int& curren
 		{
 			env->Add<KeepBlankElement>(1);
 			env->Add<TextElement>(comment);
+			currentIndex++;
 		}
-		currentIndex++;
 	}
 
 	bool blockExist = false;

include/CodeService/FormatElement/LineElement.h

@@ -10,4 +10,5 @@ class LineElement : public FormatElement
 	FormatElementType GetType() override;
 
 	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
+	void Diagnosis(DiagnosisContext& ctx, int position, FormatElement& parent) override;
 };

include/CodeService/FormatElement/LongExpressionLayoutElement.h

@@ -5,7 +5,7 @@
 class LongExpressionLayoutElement : public FormatElement
 {
 public:
-	LongExpressionLayoutElement(int continuationIndent);
+	LongExpressionLayoutElement(int continuationIndent, bool isAssignLeftExprList = false);
 
 	FormatElementType GetType() override;
 

include/CodeService/FormatElement/StatementElement.h

@@ -9,5 +9,5 @@ class StatementElement : public FormatElement
 	FormatElementType GetType() override;
 
 	void Serialize(FormatContext& ctx, int position, FormatElement& parent) override;
-
+	void Diagnosis(DiagnosisContext& ctx, int position, FormatElement& parent) override;
 };