support some space option

Author: CppCXY

CodeService/src/LuaEditorConfig.cpp

@@ -358,6 +358,18 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 			configMap.at("remove_expression_list_finish_comma") == "true";
 	}
 
+	if(configMap.count("space_before_function_open_parenthesis"))
+	{
+		options->space_before_function_open_parenthesis =
+			configMap.at("space_before_function_open_parenthesis") == "true";
+	}
+
+	if (configMap.count("space_before_open_square_bracket"))
+	{
+		options->space_before_open_square_bracket =
+			configMap.at("space_before_open_square_bracket") == "true";
+	}
+
 	if (configMap.count("end_of_line"))
 	{
 		auto lineSeparatorSymbol = configMap.at("end_of_line");

CodeService/src/LuaFormatter.cpp

@@ -1320,6 +1320,11 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatFunctionStatement(std::shared
 			}
 		case LuaAstNodeType::FunctionBody:
 			{
+				if (_options.space_before_function_open_parenthesis)
+				{
+					env->Add<KeepBlankElement>(1);
+				}
+
 				env->AddChild(FormatNode(child));
 				break;
 			}
@@ -1449,6 +1454,10 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatClosureExpression(std::shared
 			}
 		case LuaAstNodeType::FunctionBody:
 			{
+				if (_options.space_before_function_open_parenthesis)
+				{
+					env->Add<KeepBlankElement>(1);
+				}
 				env->AddChild(FormatNode(child));
 				break;
 			}
@@ -2287,7 +2296,20 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatIndexExpression(std::shared_p
 		default:
 			{
 				FormatSubExpression(child, env);
-				env->Add<KeepElement>(0);
+
+				auto nextNode = NextNode(it, children);
+				if (_options.space_before_open_square_bracket
+					&& nextNode != nullptr
+					&& nextNode->GetType() == LuaAstNodeType::IndexOperator
+					&& nextNode->GetTokenType() == '['
+					&& !StringUtil::EndWith(child->GetText(), "]"))
+				{
+					env->Add<KeepElement>(1);
+				}
+				else
+				{
+					env->Add<KeepElement>(0);
+				}
 			}
 		}
 	}
@@ -2313,7 +2335,8 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallExpression(std::shared_pt
 				auto next = NextNode(it, children);
 				if (next && next->GetType() == LuaAstNodeType::CallArgList)
 				{
-					if (!ast_util::WillCallArgHaveParentheses(next, _options.call_arg_parentheses))
+					if (!ast_util::WillCallArgHaveParentheses(next, _options.call_arg_parentheses) || _options.
+						space_before_function_open_parenthesis)
 					{
 						//TODO workaround
 						env->Add<KeepElement>(1, false, false);

Test/test_script/format_text/wait_format_by_option/.editorconfig

@@ -163,6 +163,9 @@ align_chained_expression_statement = true
 remove_empty_header_and_footer_lines_in_function = true
 [{remove_expression_list_finish_comma-eq-true.lua}]
 remove_expression_list_finish_comma = true
+[{space_option.lua}]
+space_before_function_open_parenthesis = true
+space_before_open_square_bracket = 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_option.lua

@@ -0,0 +1,5 @@
+local t = 13
+c.t ["12313"] = t ["123131"]["123131"]
+t.cccc.ddd [1313131] = 1231
+local cc = 123
+print(123131)()

Test/test_script/format_text/wait_format_by_option_should_be/.editorconfig

@@ -161,6 +161,9 @@ align_chained_expression_statement = true
 remove_empty_header_and_footer_lines_in_function = true
 [{remove_expression_list_finish_comma-eq-true.lua}]
 remove_expression_list_finish_comma = true
+[{space_option.lua}]
+space_before_function_open_parenthesis = true
+space_before_open_square_bracket = 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_should_be/space_option.lua

@@ -0,0 +1,5 @@
+local t = 13
+c.t ["12313"] = t ["123131"]["123131"]
+t.cccc.ddd [1313131] = 1231
+local cc = 123
+print (123131)()

include/CodeService/LuaCodeStyleOptions.h

@@ -72,6 +72,10 @@ class LuaCodeStyleOptions
 	 */
 	bool keep_one_space_between_namedef_and_attribute = true;
 
+	bool space_before_function_open_parenthesis = false;
+
+	bool space_before_open_square_bracket = false;
+
 	/*
 	 * 标签无缩进
 	 */

include/CodeService/LuaFormatter.h

@@ -5,10 +5,13 @@
 #include "LuaCodeStyleOptions.h"
 #include "FormatElement/FormatElement.h"
 #include "LuaFormatRange.h"
+#include <functional>
 
 class LuaFormatter
 {
 public:
+	using BlockFilter = std::function<bool(std::shared_ptr<LuaAstNode>)>;
+
 	LuaFormatter(std::shared_ptr<LuaParser> luaParser, LuaCodeStyleOptions& options);
 	~LuaFormatter() = default;
 
@@ -27,6 +30,9 @@ class LuaFormatter
 
 	std::shared_ptr<FormatElement> FormatBlock(std::shared_ptr<LuaAstNode> blockNode);
 
+	// special handle range format
+	std::shared_ptr<FormatElement> FormatRangeBlock(std::shared_ptr<LuaAstNode> blockNode, LuaFormatRange& validRange);
+
 	std::shared_ptr<FormatElement> FormatLocalStatement(std::shared_ptr<LuaAstNode> localStatement);
 
 	std::shared_ptr<FormatElement> FormatAssignment(std::shared_ptr<LuaAstNode> assignStatement);
@@ -132,9 +138,6 @@ class LuaFormatter
 	// special rule [#8](https://github.com/CppCXY/EmmyLuaCodeStyle/issues/8)
 	std::shared_ptr<FormatElement> FormatTableAppendExpression(std::shared_ptr<LuaAstNode> expression);
 
-	// special handle range format
-	std::shared_ptr<FormatElement> FormatRangeBlock(std::shared_ptr<LuaAstNode> blockNode, LuaFormatRange& validRange);
-
 private:
 	std::shared_ptr<LuaParser> _parser;
 	LuaCodeStyleOptions& _options;

lua.template.editorconfig

@@ -59,6 +59,13 @@ end_of_line = auto
 #
 detect_end_of_line = false
 
+space_before_function_open_parenthesis = false
+
+space_before_open_square_bracket = false
+
+# this mean utf8 length , if this is 'unset' then the line width is no longer checked
+max_line_length = 120
+
 # [line layout]
 # The following configuration supports four expressions
 # minLine:${n}   
@@ -78,8 +85,7 @@ keep_line_after_expression_statement = keepLine
 # [diagnostic]
 # the following is code diagnostic options
 enable_check_codestyle = true
-# this mean utf8 length , if this is 'unset' then the line width is no longer checked
-max_line_length = 120
+
 # this will check text end with new line(format always end with new line)
 insert_final_newline = true