试图让折行更合理一些

Author: CppCXY

CodeService/src/FormatElement/AlignToFirstElement.cpp

@@ -70,6 +70,10 @@ void AlignToFirstElement::Serialize(SerializeContext& ctx, ChildIterator selfIt,
 
 			keepElement->AllowBreakLineSerialize(ctx, it, *this);
 		}
+		else if(child->Is(FormatElementType::SubExpressionElement))
+		{
+			SerializeSubExpression(ctx, *child);
+		}
 		else
 		{
 			child->Serialize(ctx, it, *this);
@@ -143,3 +147,26 @@ void AlignToFirstElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
 		ctx.RecoverIndent();
 	}
 }
+
+void AlignToFirstElement::SerializeSubExpression(SerializeContext& ctx, FormatElement& parent)
+{
+	auto& children = parent.GetChildren();
+	for (auto it = children.begin(); it != children.end(); ++it)
+	{
+		auto child = *it;
+
+		if (child->Is(FormatElementType::SubExpressionElement))
+		{
+			SerializeSubExpression(ctx, *child);
+		}
+		else if (child->Is(FormatElementType::KeepElement))
+		{
+			auto keepElement = std::dynamic_pointer_cast<KeepElement>(child);
+			keepElement->AllowBreakLineSerialize(ctx, it, parent);
+		}
+		else
+		{
+			child->Serialize(ctx, it, parent);
+		}
+	}
+}

CodeService/src/FormatElement/SubExpressionElement.cpp

@@ -1,6 +1,9 @@
 #include "CodeService/FormatElement/SubExpressionElement.h"
 
+#include "CodeService/FormatElement/KeepElement.h"
+
 FormatElementType SubExpressionElement::GetType()
 {
 	return FormatElementType::SubExpressionElement;
 }
+

include/CodeService/FormatElement/AlignToFirstElement.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "FormatElement.h"
 
@@ -11,4 +11,6 @@ class AlignToFirstElement : public FormatElement
 
 	void Serialize(SerializeContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 	void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
+private:
+	void SerializeSubExpression(SerializeContext& ctx, FormatElement& parent);
 };

include/CodeService/LuaCodeStyleOptions.h

@@ -54,8 +54,6 @@ class LuaCodeStyleOptions
 	 */
 	AlignCallArgs align_call_args = AlignCallArgs::False;
 
-	bool only_align_call_args_after_assignment = false;
-
 	/*
 	 * 函数定义的参数保持对齐到第一个参数
 	 * 函数的定义通常不会太长，这种默认行为是可以接受的