Add space_inside_function_param_list_parentheses option.

Author: obszczymucha

CodeService/src/LuaEditorConfig.cpp

@@ -387,6 +387,12 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 			configMap.at("space_inside_function_call_parentheses") == "true";
 	}
 
+	if(configMap.count("space_inside_function_param_list_parentheses"))
+	{
+		options->space_inside_function_param_list_parentheses =
+			configMap.at("space_inside_function_param_list_parentheses") == "true";
+	}
+
 	if (configMap.count("space_before_open_square_bracket"))
 	{
 		options->space_before_open_square_bracket =

CodeService/src/LuaFormatter.cpp

@@ -1476,12 +1476,18 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatParamList(std::shared_ptr<Lua
 					paramListLayoutEnv->Add<OperatorElement>(child);
 					paramListLayoutEnv->Add<KeepElement>(1);
 				}
+				else if (child->GetTokenType() == '(')
+				{
+					env->Add<OperatorElement>(child);
+					env->Add<KeepElement>(_options.space_inside_function_param_list_parentheses
+						&& children.size() > 2 ? 1 : 0);
+				}
 				else if (child->GetTokenType() == ')')
 				{
 					env->AddChild(paramListLayoutEnv);
 					if (!paramListLayoutEnv->GetChildren().empty())
 					{
-						env->Add<KeepElement>(0);
+						env->Add<KeepElement>(_options.space_inside_function_param_list_parentheses ? 1 : 0);
 					}
 
 					env->Add<OperatorElement>(child);

Test/test_script/format_text/wait_format_by_option/.editorconfig

@@ -170,6 +170,8 @@ space_before_function_open_parenthesis = true
 space_before_open_square_bracket = true
 [{space_inside_function_call_parentheses.lua}]
 space_inside_function_call_parentheses = true
+[{space_inside_function_param_list_parentheses.lua}]
+space_inside_function_param_list_parentheses = true
 [{minLine-eq-1.lua}]
 keep_line_after_if_statement = minLine:1
 keep_line_after_do_statement = minLine:1

Test/test_script/format_text/wait_format_by_option/space_inside_function_param_list_parentheses.lua

@@ -0,0 +1,33 @@
+local f0 = function()
+end
+
+local f1 = function(a)
+  return a
+end
+
+local f2 = function(a,b)
+  return a, b
+end
+
+local f3 = function(a,b,c)
+  return a, b, c
+end
+
+f0()
+
+local a = f1(123)
+local b1, b2 = f2(           'b1','b2')
+local c1, c2, c3 = f3('c1',    'c2','c3'    )
+
+function t:fffff(
+aaa
+)
+    local t = 13
+end
+
+local already_formatted = function( x, y, z )
+  return x, y, z
+end
+
+already_formatted( 'a', 'b', 'c' )
+

Test/test_script/format_text/wait_format_by_option_should_be/space_inside_function_param_list_parentheses.lua

@@ -0,0 +1,33 @@
+local f0 = function()
+end
+
+local f1 = function( a )
+    return a
+end
+
+local f2 = function( a, b )
+    return a, b
+end
+
+local f3 = function( a, b, c )
+    return a, b, c
+end
+
+f0()
+
+local a = f1(123)
+local b1, b2 = f2('b1', 'b2')
+local c1, c2, c3 = f3('c1', 'c2', 'c3')
+
+function t:fffff(
+aaa
+)
+    local t = 13
+end
+
+local already_formatted = function( x, y, z )
+    return x, y, z
+end
+
+already_formatted('a', 'b', 'c')
+

include/CodeService/LuaCodeStyleOptions.h

@@ -80,6 +80,8 @@ class LuaCodeStyleOptions
 
 	bool space_inside_function_call_parentheses = false;
 
+	bool space_inside_function_param_list_parentheses = false;
+
 	bool space_before_open_square_bracket = false;
 
 	/*

lua.template.editorconfig

@@ -101,6 +101,8 @@ space_before_function_open_parenthesis = false
 
 space_inside_function_call_parentheses = false
 
+space_inside_function_param_list_parentheses = false
+
 space_before_open_square_bracket = false
 
 # if true, ormat like this "local t <const> = 1"