提供新的选项

Author: CppCXY

CodeService/src/FormatElement/AlignmentLayoutElement.cpp

@@ -59,6 +59,27 @@ void AlignmentLayoutElement::Diagnosis(DiagnosisContext& ctx, ChildIterator self
 int AlignmentLayoutElement::GetAlignPosition(FormatContext& ctx)
 {
 	auto indentState = ctx.GetCurrentIndent();
+	int alignOffset = 0;
+
+	if (!ctx.GetOptions().weak_alignment_rule)
+	{
+		alignOffset = GetAlignOffset(ctx);
+	}
+	else
+	{
+		alignOffset = GetAlignOffsetWithWeakRule(ctx);
+	}
+
+	if (alignOffset == -1)
+	{
+		return alignOffset;
+	}
+
+	return alignOffset + static_cast<int>(indentState.SpaceIndent + indentState.TabIndent);
+}
+
+int AlignmentLayoutElement::GetAlignOffset(FormatContext& ctx)
+{
 	int alignSignOffset = 0;
 	bool firstContainAlignSign = true;
 	// 先寻找等号对齐的位置，并且判断连续的带等号的语句是否应该对齐到等号
@@ -98,14 +119,59 @@ int AlignmentLayoutElement::GetAlignPosition(FormatContext& ctx)
 
 
 					alignSignOffset = std::max(alignSignOffset,
-						signPosition - ctx.GetColumn(statement->GetTextRange().StartOffset)
-						);
+					                           signPosition - ctx.GetColumn(statement->GetTextRange().StartOffset)
+					);
+				}
+			}
+		}
+	}
+	return alignSignOffset;
+}
+
+int AlignmentLayoutElement::GetAlignOffsetWithWeakRule(FormatContext& ctx)
+{
+	int alignSignOffset = 0;
+	bool canAlignToSign = false;
+	// 先寻找等号对齐的位置，并且判断连续的带等号的语句是否应该对齐到等号
+	// 连续的带等号的语句是否应该对齐到等号，这个行为由所有连续语句共同决定
+	for (auto statIt = _children.begin(); statIt != _children.end(); ++statIt)
+	{
+		const auto statement = *statIt;
+
+		auto& statementChildren = statement->GetChildren();
+
+		for (auto it = statementChildren.begin(); it != statementChildren.end(); ++it)
+		{
+			auto textChild = *it;
+			if (textChild->GetType() == FormatElementType::TextElement)
+			{
+				const auto textElement = std::dynamic_pointer_cast<TextElement>(textChild);
+				if (textElement->GetText() == _alignSign)
+				{
+					const auto signPosition = ctx.GetColumn(textElement->GetTextRange().StartOffset);
+
+					auto lastStatChild = FindLastValidChild(it, statementChildren);
+					if (lastStatChild == nullptr)
+					{
+						return -1;
+					}
+
+					const auto lastPosition = ctx.GetColumn(lastStatChild->GetTextRange().EndOffset);
+
+					if (signPosition - lastPosition >= 2)
+					{
+						canAlignToSign = true;
+					}
+
+					alignSignOffset = std::max(alignSignOffset,
+					                           signPosition - ctx.GetColumn(statement->GetTextRange().StartOffset)
+					);
 				}
 			}
 		}
 	}
 
-	return alignSignOffset + indentState.SpaceIndent + indentState.TabIndent;
+	return canAlignToSign ? alignSignOffset : -1;
 }
 
 void AlignmentLayoutElement::AlignmentSerialize(SerializeContext& ctx, ChildIterator selfIt, int alignSignPosition,

CodeService/src/LuaEditorConfig.cpp

@@ -9,6 +9,18 @@
 #include "CodeService/FormatElement/MinLineElement.h"
 #include "CodeService/NameStyle/NameStyleRuleMatcher.h"
 
+bool isNumber(std::string_view source)
+{
+	for (auto c : source)
+	{
+		if (c > '9' || c < '0')
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
 std::shared_ptr<LuaEditorConfig> LuaEditorConfig::LoadFromFile(const std::string& path)
 {
 	std::fstream fin(path, std::ios::in);
@@ -85,14 +97,14 @@ std::shared_ptr<LuaCodeStyleOptions> LuaEditorConfig::Generate(std::string_view
 			patternKey.append("#").append(sectionPattern);
 			luaSections.push_back(section);
 		}
-			// [{test.lua,lib.lua}]
-		else if (StringUtil::StartWith(sectionPattern,"{") && StringUtil::EndWith(sectionPattern, "}"))
+		// [{test.lua,lib.lua}]
+		else if (StringUtil::StartWith(sectionPattern, "{") && StringUtil::EndWith(sectionPattern, "}"))
 		{
 			auto fileListText = sectionPattern.substr(1, sectionPattern.size() - 2);
 			auto fileList = StringUtil::Split(fileListText, ",");
 			for (auto fileMatchUri : fileList)
 			{
-				if (StringUtil::EndWith(fileUri,StringUtil::TrimSpace(fileMatchUri)))
+				if (StringUtil::EndWith(fileUri, StringUtil::TrimSpace(fileMatchUri)))
 				{
 					patternKey.append("#").append(sectionPattern);
 					luaSections.push_back(section);
@@ -101,7 +113,7 @@ std::shared_ptr<LuaCodeStyleOptions> LuaEditorConfig::Generate(std::string_view
 			}
 		}
 #ifndef NOT_SURPPORT_FILE_SYSTEM
-			// [lib/**.lua]
+		// [lib/**.lua]
 		else if (StringUtil::EndWith(sectionPattern, "**.lua"))
 		{
 			std::string prefix = sectionPattern.substr(0, sectionPattern.size() - 6);
@@ -111,13 +123,13 @@ std::shared_ptr<LuaCodeStyleOptions> LuaEditorConfig::Generate(std::string_view
 			std::filesystem::path file(fileUri);
 			auto dirNormal = dirname.lexically_normal();
 			auto fileNormal = file.lexically_normal();
-			if (StringUtil::StartWith(fileNormal.string(),dirNormal.string()))
+			if (StringUtil::StartWith(fileNormal.string(), dirNormal.string()))
 			{
 				patternKey.append("#").append(sectionPattern);
 				luaSections.push_back(section);
 			}
 		}
-			//[aaa/bbb.lua]
+		//[aaa/bbb.lua]
 		else
 		{
 			std::filesystem::path workspace(_workspace);
@@ -129,7 +141,6 @@ std::shared_ptr<LuaCodeStyleOptions> LuaEditorConfig::Generate(std::string_view
 			}
 		}
 #endif
-
 	}
 
 	if (_optionPatternMap.count(patternKey) > 0)
@@ -174,27 +185,37 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 		}
 	}
 
-	if (configMap.count("indent_size"))
+	if (configMap.count("indent_size")
+		&& isNumber(configMap.at("indent_size"))
+	)
 	{
 		options->indent_size = std::stoi(configMap.at("indent_size"));
 	}
 
-	if (configMap.count("tab_width"))
+	if (configMap.count("tab_width")
+		&& isNumber(configMap.at("tab_width")))
 	{
 		options->tab_width = std::stoi(configMap.at("tab_width"));
 	}
 
-	if (configMap.count("continuation_indent_size"))
+	if (configMap.count("continuation_indent_size")
+		&& isNumber(configMap.at("continuation_indent_size")))
 	{
 		options->continuation_indent_size = std::stoi(configMap.at("continuation_indent_size"));
 	}
 
-	if(configMap.count("local_assign_continuation_align_to_first_expression"))
+	if (configMap.count("local_assign_continuation_align_to_first_expression"))
 	{
 		options->local_assign_continuation_align_to_first_expression =
 			configMap.at("local_assign_continuation_align_to_first_expression") == "true";
 	}
 
+	if (configMap.count("table_field_continuation_align_to_first_sub_expression"))
+	{
+		options->table_field_continuation_align_to_first_sub_expression =
+			configMap.at("table_field_continuation_align_to_first_sub_expression") == "true";
+	}
+
 	if (configMap.count("align_call_args"))
 	{
 		options->align_call_args = configMap.at("align_call_args") == "true";
@@ -212,23 +233,23 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 			configMap.at("keep_one_space_between_table_and_bracket") == "true";
 	}
 
-	if(configMap.count("keep_one_space_between_namedef_and_attribute"))
+	if (configMap.count("keep_one_space_between_namedef_and_attribute"))
 	{
 		options->keep_one_space_between_namedef_and_attribute =
 			configMap.at("keep_one_space_between_namedef_and_attribute") == "true";
 	}
 
-	if(configMap.count("label_no_indent"))
+	if (configMap.count("label_no_indent"))
 	{
 		options->label_no_indent = configMap.at("label_no_indent") == "true";
 	}
 
-	if(configMap.count("do_statement_no_indent"))
+	if (configMap.count("do_statement_no_indent"))
 	{
 		options->do_statement_no_indent = configMap.at("do_statement_no_indent") == "true";
 	}
 
-	if(configMap.count("if_condition_no_continuation_indent"))
+	if (configMap.count("if_condition_no_continuation_indent"))
 	{
 		options->if_condition_no_continuation_indent = configMap.at("if_condition_no_continuation_indent") == "true";
 	}
@@ -238,6 +259,19 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 		options->align_table_field_to_first_field = configMap.at("align_table_field_to_first_field") == "true";
 	}
 
+	if (configMap.count("max_continuous_line_distance")
+		&& isNumber(configMap.at("max_continuous_line_distance")))
+	{
+		options->max_continuous_line_distance =
+			std::stoi(configMap.at("max_continuous_line_distance"));
+	}
+
+	if(configMap.count("weak_alignment_rule"))
+	{
+		options->weak_alignment_rule =
+			configMap.at("weak_alignment_rule") == "true";
+	}
+
 	if (configMap.count("continuous_assign_statement_align_to_equal_sign"))
 	{
 		options->continuous_assign_statement_align_to_equal_sign =
@@ -263,7 +297,8 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 		}
 	}
 
-	if (configMap.count("max_line_length"))
+	if (configMap.count("max_line_length")
+		&& isNumber(configMap.at("max_line_length")))
 	{
 		options->max_line_length = std::stoi(configMap.at("max_line_length"));
 	}
@@ -340,7 +375,7 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 		}
 	}
 
-	if(options->indent_style == IndentStyle::Tab)
+	if (options->indent_style == IndentStyle::Tab)
 	{
 		options->align_table_field_to_first_field = false;
 	}

CodeService/src/LuaFormatter.cpp

@@ -474,7 +474,32 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatAssignment(std::shared_ptr<Lu
 				}
 				else
 				{
-					env->AddChild(FormatNode(node));
+					std::shared_ptr<FormatElement> layout = nullptr;
+					if (_options.local_assign_continuation_align_to_first_expression)
+					{
+						bool canAligned = true;
+						// 但是如果表达式列表中出现跨行表达式,则采用长表达式对齐
+						for (auto& expression : node->GetChildren())
+						{
+							if (expression->GetType() == LuaAstNodeType::Expression)
+							{
+								auto startLine = _parser->GetLine(expression->GetTextRange().StartOffset);
+								auto endLine = _parser->GetLine(expression->GetTextRange().EndOffset);
+
+								if (startLine != endLine)
+								{
+									canAligned = false;
+									break;
+								}
+							}
+						}
+						if (canAligned)
+						{
+							layout = std::make_shared<AlignToFirstElement>();
+						}
+					}
+
+					env->AddChild(FormatExpressionList(node, layout));
 				}
 
 				break;
@@ -1425,7 +1450,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatTableExpression(std::shared_p
 std::shared_ptr<FormatElement> LuaFormatter::FormatTableField(std::shared_ptr<LuaAstNode> tableField)
 {
 	auto env = std::make_shared<ExpressionElement>();
-
+	auto eqSignFounded = false;
 	for (auto& child : tableField->GetChildren())
 	{
 		switch (child->GetType())
@@ -1434,6 +1459,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatTableField(std::shared_ptr<Lu
 			{
 				if (child->GetText() == "=")
 				{
+					eqSignFounded = true;
 					env->Add<KeepBlankElement>(1);
 					env->Add<TextElement>(child);
 					env->Add<KeepBlankElement>(1);
@@ -1455,6 +1481,36 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatTableField(std::shared_ptr<Lu
 				env->Add<KeepElement>(1);
 				break;
 			}
+		case LuaAstNodeType::Expression:
+			{
+				std::shared_ptr<FormatElement> layout = nullptr;
+				if (_options.table_field_continuation_align_to_first_sub_expression && eqSignFounded)
+				{
+					bool canAligned = true;
+					// 但是如果表达式列表中出现跨行表达式,则采用长表达式对齐
+					for (auto& expression : child->GetChildren())
+					{
+						if (expression->GetType() == LuaAstNodeType::Expression)
+						{
+							auto startLine = _parser->GetLine(expression->GetTextRange().StartOffset);
+							auto endLine = _parser->GetLine(expression->GetTextRange().EndOffset);
+
+							if (startLine != endLine)
+							{
+								canAligned = false;
+								break;
+							}
+						}
+					}
+					if (canAligned)
+					{
+						layout = std::make_shared<AlignToFirstElement>();
+					}
+				}
+
+				env->AddChild(FormatExpression(child, layout));
+				break;
+			}
 		default:
 			{
 				DefaultHandle(child, env);
@@ -1499,7 +1555,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatAlignStatement(LuaAstNode::Ch
 		int currentLine = _parser->GetLine(currentChild->GetTextRange().EndOffset);
 		int nextLine = _parser->GetLine(nextChild->GetTextRange().StartOffset);
 		// 这个规则是下一个连续的赋值/local/注释语句如果和上一个赋值/local/注释语句 间距2行以上，则不认为是连续
-		if (nextLine - currentLine > 2)
+		if (nextLine - currentLine > _options.max_continuous_line_distance)
 		{
 			break;
 		}