Merge branch 'master' of github.com:CppCXY/EmmyLuaCodeStyle

Author: CppCXY

CodeService/src/AstUtil.cpp

@@ -267,20 +267,53 @@ std::shared_ptr<LuaAstNode> ast_util::FindLeftIndexExpression(std::shared_ptr<Lu
 bool ast_util::WillIndexExpressionFormatError(std::shared_ptr<LuaAstNode> expression)
 {
 	auto text = expression->GetText();
-	if(text.empty())
+	if (text.empty())
 	{
 		return false;
 	}
 
-	if(text.front() == '[')
+	if (text.front() == '[')
 	{
 		return text.length() > 2 && (text[1] == '[' || text[1] == '=');
 	}
 
-	if(text.back() == ']')
+	if (text.back() == ']')
 	{
 		return text.length() > 2 && (text[text.length() - 2] == ']' || text[text.length() - 2] == '=');
 	}
 
 	return false;
 }
+
+bool ast_util::IsNodeAfterMoreIndentionStatement(std::shared_ptr<LuaAstNode> node)
+{
+	if (!node)
+	{
+		return false;
+	}
+
+	std::shared_ptr<LuaAstNode> parent = node->GetParent();
+	while (parent)
+	{
+		switch (parent->GetType())
+		{
+		case LuaAstNodeType::LocalStatement:
+		case LuaAstNodeType::AssignStatement:
+		case LuaAstNodeType::ReturnStatement:
+			{
+				return true;
+			}
+		case LuaAstNodeType::Block:
+			{
+				return false;
+			}
+		default:
+			{
+				break;
+			}
+		}
+		parent = parent->GetParent();
+	}
+
+	return false;
+}

CodeService/src/LuaEditorConfig.cpp

@@ -263,7 +263,19 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 
 	if (configMap.count("align_call_args"))
 	{
-		options->align_call_args = configMap.at("align_call_args") == "true";
+		auto& value = configMap.at("align_call_args");
+		if(value == "true")
+		{
+			options->align_call_args = AlignCallArgs::True;
+		}
+		else if(value == "false")
+		{
+			options->align_call_args = AlignCallArgs::False;
+		}
+		else if(value == "only_after_more_indention_statement")
+		{
+			options->align_call_args = AlignCallArgs::OnlyAfterMoreIndentionStatement;
+		}
 	}
 
 	if (configMap.count("align_chained_expression_statement"))

CodeService/src/LuaFormatter.cpp

@@ -1245,7 +1245,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallArgList(std::shared_ptr<L
 		case LuaAstNodeType::ExpressionList:
 			{
 				std::shared_ptr<FormatElement> layout = nullptr;
-				if (_options.align_call_args)
+				if (_options.align_call_args != AlignCallArgs::False)
 				{
 					bool canAligned = true;
 					// 但是如果表达式列表中出现跨行表达式,则采用长表达式对齐
@@ -1272,6 +1272,14 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallArgList(std::shared_ptr<L
 						}
 					}
 
+					if(canAligned 
+						&& _options.align_call_args == AlignCallArgs::OnlyAfterMoreIndentionStatement
+						&& (!ast_util::IsNodeAfterMoreIndentionStatement(child))
+						)
+					{
+						canAligned = false;
+					}
+
 					if (canAligned)
 					{
 						layout = std::make_shared<AlignToFirstElement>();

include/CodeService/AstUtil.h

@@ -18,4 +18,6 @@ namespace ast_util
 	std::shared_ptr<LuaAstNode> FindLeftIndexExpression(std::shared_ptr<LuaAstNode> expression);
 
 	bool WillIndexExpressionFormatError(std::shared_ptr<LuaAstNode> expression);
+
+	bool IsNodeAfterMoreIndentionStatement(std::shared_ptr<LuaAstNode> node);
 }

include/CodeService/LuaCodeStyleEnum.h

@@ -22,3 +22,9 @@ enum class CallArgParentheses : int
 	UnambiguousRemoveStringOnly
 };
 
+enum class AlignCallArgs
+{
+	True,
+	False,
+	OnlyAfterMoreIndentionStatement
+};

include/CodeService/LuaCodeStyleOptions.h

@@ -52,7 +52,9 @@ class LuaCodeStyleOptions
 	/*
 	 * 调用参数对齐到第一个参数
 	 */
-	bool align_call_args = false;
+	AlignCallArgs align_call_args = AlignCallArgs::False;
+
+	bool only_align_call_args_after_assignment = false;
 
 	/*
 	 * 函数定义的参数保持对齐到第一个参数

lua.template.editorconfig

@@ -23,7 +23,7 @@ keep_one_space_between_namedef_and_attribute = true
 
 # [function]
 # function call expression's args will align to first arg
-# however, if the args has cross row arg, it will not be aligned to the first arg
+# optional true/false/only_after_more_indention_statement
 align_call_args = false