上传代码

Author: CppCXY

3rd/uriparser/CMakeLists.txt

@@ -92,4 +92,3 @@ target_compile_definitions(uriparser PRIVATE URI_LIBRARY_BUILD)
 
 target_compile_definitions(uriparser PUBLIC URI_STATIC_BUILD)
 
-target_compile_definitions(uriparser PUBLIC URI_NO_UNICODE)

CodeService/CMakeLists.txt

@@ -53,6 +53,7 @@ target_sources(CodeService
 	${CodeService_SOURCE_DIR}/src/FormatElement/AlignToFirstElement.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/IndentOnLineBreakElement.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/KeepElement.cpp	
+	${CodeService_SOURCE_DIR}/src/FormatElement/PlaceholderElement.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/SubExpressionElement.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/DiagnosisContext.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/RangeFormatContext.cpp	

CodeService/src/FormatElement/PlaceHolderElement.cpp

@@ -0,0 +1,36 @@
+#include "CodeService/FormatElement/PlaceholderElement.h"
+
+PlaceholderElement::PlaceholderElement(std::shared_ptr<FormatElement> parent, std::shared_ptr<LuaAstNode> expression)
+	: FormatElement(expression->GetTextRange()),
+	  _parent(parent),
+	  _expression(expression)
+{
+}
+
+FormatElementType PlaceholderElement::GetType()
+{
+	return FormatElementType::PlaceholderElement;
+}
+
+std::shared_ptr<LuaAstNode> PlaceholderElement::GetRawAstNode()
+{
+	return _expression;
+}
+
+void PlaceholderElement::Replace(std::shared_ptr<FormatElement> layout)
+{
+	if (!_parent.expired())
+	{
+		auto parent = _parent.lock();
+
+		auto& children = parent->GetChildren();
+		for (auto& child : children)
+		{
+			if (child.get() == this)
+			{
+				child = layout;
+				break;
+			}
+		}
+	}
+}

CodeService/src/LuaFormatter.cpp

@@ -17,6 +17,7 @@
 #include "CodeService/FormatElement/NoIndentElement.h"
 #include "CodeService/FormatElement/SerializeContext.h"
 #include "CodeService/FormatElement/IndentOnLineBreakElement.h"
+#include "CodeService/FormatElement/PlaceHolderElement.h"
 #include "Util/StringUtil.h"
 
 bool nextMatch(LuaAstNode::ChildIterator it, LuaAstNodeType type, const LuaAstNode::ChildrenContainer& container)
@@ -1029,6 +1030,9 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatIfStatement(std::shared_ptr<L
 {
 	auto env = std::make_shared<StatementElement>();
 	auto& children = ifStatement->GetChildren();
+
+	std::vector<std::shared_ptr<PlaceholderElement>> placeholderExpressions;
+
 	for (auto it = children.begin(); it != children.end(); ++it)
 	{
 		const auto child = *it;
@@ -1056,13 +1060,21 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatIfStatement(std::shared_ptr<L
 			}
 		case LuaAstNodeType::Expression:
 			{
-				std::shared_ptr<FormatElement> expression = nullptr;
-				if (_options.if_condition_no_continuation_indent)
+				if (_options.if_condition_align_with_each_other)
 				{
-					expression = std::make_shared<LongExpressionLayoutElement>(0);
+					placeholderExpressions.push_back(std::make_shared<PlaceholderElement>(env, child));
+					env->AddChild(placeholderExpressions.back());
 				}
+				else
+				{
+					std::shared_ptr<FormatElement> expression = nullptr;
+					if (_options.if_condition_no_continuation_indent)
+					{
+						expression = std::make_shared<LongExpressionLayoutElement>(0);
+					}
 
-				env->AddChild(FormatExpression(child, expression));
+					env->AddChild(FormatExpression(child, expression));
+				}
 				env->Add<KeepBlankElement>(1);
 				break;
 			}
@@ -1074,6 +1086,11 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatIfStatement(std::shared_ptr<L
 		}
 	}
 
+	if (!placeholderExpressions.empty())
+	{
+		FormatIfConditionAlign(placeholderExpressions);
+	}
+
 	return env;
 }
 
@@ -2156,6 +2173,19 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatTableAppendExpression(std::sh
 	return FormatExpression(expression, env);
 }
 
+void LuaFormatter::FormatIfConditionAlign(std::vector<std::shared_ptr<PlaceholderElement>>& placeholders)
+{
+	bool canAlign = true;
+	for(auto placeholder: placeholders)
+	{
+		
+	}
+	
+
+
+
+
+}
 
 std::shared_ptr<FormatElement> LuaFormatter::FormatRangeBlock(std::shared_ptr<LuaAstNode> blockNode,
                                                               LuaFormatRange& validRange)

include/CodeService/FormatElement/FormatElementType.h

@@ -14,6 +14,7 @@ enum class FormatElementType
 	LongExpressionLayoutElement,
 	NoIndentElement,
 	IndentOnLineBreakElement,
+	PlaceholderElement,
 
 	ControlStart,
 	KeepLineElement,

include/CodeService/FormatElement/PlaceHolderElement.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "FormatElement.h"
+
+class PlaceholderElement : public FormatElement
+{
+public:
+	PlaceholderElement(std::shared_ptr<FormatElement> parent, std::shared_ptr<LuaAstNode> expression);
+
+	FormatElementType GetType() override;
+
+	std::shared_ptr<LuaAstNode> GetRawAstNode();
+
+	void Replace(std::shared_ptr<FormatElement> layout);
+private:
+	std::weak_ptr<FormatElement> _parent;
+	std::shared_ptr<LuaAstNode> _expression;
+};

include/CodeService/LuaCodeStyleOptions.h

@@ -105,6 +105,8 @@ class LuaCodeStyleOptions
 
 	bool continuous_assign_table_field_align_to_equal_sign = true;
 
+	bool if_condition_align_with_each_other = false;
+
 	bool table_append_expression_no_space = false;
 
 	std::string end_of_line = "\r\n";

include/CodeService/LuaFormatter.h

@@ -4,6 +4,7 @@
 #include "LuaParser/LuaParser.h"
 #include "LuaCodeStyleOptions.h"
 #include "FormatElement/FormatElement.h"
+#include "FormatElement/PlaceHolderElement.h"
 #include "LuaDiagnosisInfo.h"
 #include "LuaFormatRange.h"
 
@@ -127,6 +128,8 @@ class LuaFormatter
 
 	// special rule [#8](https://github.com/CppCXY/EmmyLuaCodeStyle/issues/8)
 	std::shared_ptr<FormatElement> FormatTableAppendExpression(std::shared_ptr<LuaAstNode> expression);
+
+	void FormatIfConditionAlign(std::vector<std::shared_ptr<PlaceholderElement>>& placeholders);
 	// special handle range format
 	std::shared_ptr<FormatElement> FormatRangeBlock(std::shared_ptr<LuaAstNode> blockNode, LuaFormatRange& validRange);
 private: