IMPL #43

Author: CppCXY

CodeService/src/LuaEditorConfig.cpp

@@ -243,7 +243,7 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 		options->continuation_indent_size = std::stoi(configMap.at("continuation_indent_size"));
 	}
 
-	if(configMap.count("statement_inline_comment_space")
+	if (configMap.count("statement_inline_comment_space")
 		&& IsNumber(configMap.at("statement_inline_comment_space")))
 	{
 		options->statement_inline_comment_space = std::stoi(configMap.at("statement_inline_comment_space"));
@@ -346,12 +346,18 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 			configMap.at("long_chain_expression_allow_one_space_after_colon") == "true";
 	}
 
-	if(configMap.count("remove_empty_header_and_footer_lines_in_function"))
+	if (configMap.count("remove_empty_header_and_footer_lines_in_function"))
 	{
 		options->remove_empty_header_and_footer_lines_in_function =
 			configMap.at("remove_empty_header_and_footer_lines_in_function") == "true";
 	}
 
+	if (configMap.count("remove_expression_list_finish_comma"))
+	{
+		options->remove_expression_list_finish_comma =
+			configMap.at("remove_expression_list_finish_comma") == "true";
+	}
+
 	if (configMap.count("end_of_line"))
 	{
 		auto lineSeparatorSymbol = configMap.at("end_of_line");
@@ -380,10 +386,12 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 
 	if (configMap.count("max_line_length"))
 	{
-		if (IsNumber(configMap.at("max_line_length"))) {
+		if (IsNumber(configMap.at("max_line_length")))
+		{
 			options->max_line_length = std::stoi(configMap.at("max_line_length"));
 		}
-		else if(configMap.at("max_line_length") == "unset"){
+		else if (configMap.at("max_line_length") == "unset")
+		{
 			options->max_line_length = std::numeric_limits<int>::max();
 		}
 	}

CodeService/src/LuaFormatter.cpp

@@ -639,6 +639,40 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatExpressionList(std::shared_pt
 	return env;
 }
 
+std::shared_ptr<FormatElement> LuaFormatter::FormatCallArgsExpressionList(std::shared_ptr<LuaAstNode> expressionList,
+                                                                          std::shared_ptr<FormatElement> env)
+{
+	auto& children = expressionList->GetChildren();
+	for (auto& node : children)
+	{
+		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:
+			{
+				if (_options.remove_expression_list_finish_comma && node == children.back())
+				{
+					break;
+				}
+				env->Add<TextElement>(node);
+				env->Add<KeepElement>(1);
+				break;
+			}
+		default:
+			DefaultHandle(node, env);
+			env->Add<KeepElement>(1);
+		}
+	}
+
+	return env;
+}
+
 std::shared_ptr<FormatElement> LuaFormatter::FormatAssignLeftExpressionList(std::shared_ptr<LuaAstNode> expressionList)
 {
 	auto env = std::make_shared<LongExpressionLayoutElement>(_options.continuation_indent_size);
@@ -1242,7 +1276,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallArgList(std::shared_ptr<L
 					layout = std::make_shared<CallArgsListLayoutElement>();
 				}
 
-				env->AddChild(FormatExpressionList(child, layout));
+				env->AddChild(FormatCallArgsExpressionList(child, layout));
 				env->Add<KeepElement>(0);
 				break;
 			}
@@ -1341,6 +1375,11 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatParamList(std::shared_ptr<Lua
 			{
 				if (child->GetText() == ",")
 				{
+					if(_options.remove_expression_list_finish_comma
+						&& NextMatch(it, LuaAstNodeType::GeneralOperator, children))
+					{
+						break;
+					}
 					paramListLayoutEnv->Add<TextElement>(child);
 					paramListLayoutEnv->Add<KeepElement>(1);
 				}

include/CodeService/LuaFormatter.h

@@ -37,6 +37,9 @@ class LuaFormatter
 	std::shared_ptr<FormatElement> FormatExpressionList(std::shared_ptr<LuaAstNode> expressionList,
 	                                                    std::shared_ptr<FormatElement> env = nullptr);
 
+	std::shared_ptr<FormatElement> FormatCallArgsExpressionList(std::shared_ptr<LuaAstNode> expressionList,
+	                                                            std::shared_ptr<FormatElement> env);
+
 	std::shared_ptr<FormatElement> FormatAssignLeftExpressionList(std::shared_ptr<LuaAstNode> expressionList);
 
 	std::shared_ptr<FormatElement> FormatComment(std::shared_ptr<LuaAstNode> comment);