格式化选项测试

Author: CppCXY

CodeService/src/LuaEditorConfig.cpp

@@ -222,6 +222,11 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 		options->do_statement_no_indent = configMap.at("do_statement_no_indent") == "true";
 	}
 
+	if(configMap.count("if_condition_no_continuation_indent"))
+	{
+		options->if_condition_no_continuation_indent = configMap.at("if_condition_no_continuation_indent") == "true";
+	}
+
 	if (configMap.count("align_table_field_to_first_field"))
 	{
 		options->align_table_field_to_first_field = configMap.at("align_table_field_to_first_field") == "true";

CodeService/src/LuaFormatter.cpp

@@ -999,7 +999,13 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatIfStatement(std::shared_ptr<L
 			}
 		case LuaAstNodeType::Expression:
 			{
-				env->AddChild(FormatNode(child));
+				std::shared_ptr<FormatElement> expression = nullptr;
+				if (_options.if_condition_no_continuation_indent)
+				{
+					expression = std::make_shared<LongExpressionLayoutElement>(0);
+				}
+
+				env->AddChild(FormatExpression(child, expression));
 				env->Add<KeepBlankElement>(1);
 				break;
 			}

Test/src/CodeFormatTest.cpp

@@ -7,6 +7,7 @@
 #include "Util/format.h"
 #include "Util/CommandLine.h"
 #include "Util/StringUtil.h"
+#include "CodeService/LuaEditorConfig.h"
 
 
 bool TestFormatted(std::string input, const std::string& shouldBe, std::shared_ptr<LuaCodeStyleOptions> options)
@@ -57,10 +58,10 @@ bool TestGrammar(std::string input)
 	{
 		for (auto& error : formattedParser->GetErrors())
 			std::cout << format("error after formatted: {}, from [{},{}] to [{},{}]", error.ErrorMessage,
-				formattedParser->GetLine(error.ErrorRange.StartOffset),
-				formattedParser->GetColumn(error.ErrorRange.StartOffset),
-				formattedParser->GetLine(error.ErrorRange.EndOffset),
-				formattedParser->GetColumn(error.ErrorRange.EndOffset)
+			                    formattedParser->GetLine(error.ErrorRange.StartOffset),
+			                    formattedParser->GetColumn(error.ErrorRange.StartOffset),
+			                    formattedParser->GetLine(error.ErrorRange.EndOffset),
+			                    formattedParser->GetColumn(error.ErrorRange.EndOffset)
 			) << std::endl;
 	}
 
@@ -112,6 +113,7 @@ int main(int argc, char* argv[])
 
 	commandLine.AddTarget("CheckGrammar");
 	commandLine.AddTarget("CheckFormatResult");
+	commandLine.AddTarget("CheckFormatResultByOption");
 
 	commandLine.Add<std::string>("work-directory", "w", "special base work directory");
 	commandLine.Add<std::string>("formatted-work-directory", "f", "special formatted work directory");
@@ -156,6 +158,41 @@ int main(int argc, char* argv[])
 			std::cout << format("test format stability {} ... {}", path, passed ? "passed" : "false") << std::endl;
 		}
 	}
+	else if (target == "CheckFormatResultByOption")
+	{
+		auto editorconfigPath = workRoot / ".editorconfig";
+		auto editorConfig = LuaEditorConfig::LoadFromFile(editorconfigPath.string());
+		editorConfig->SetWorkspace(workRoot.string());
+		if (!editorConfig)
+		{
+			std::cerr << "can not find editorconfig file" << std::endl;
+			return -1;
+		}
+		std::filesystem::path formattedRoot(commandLine.Get<std::string>("formatted-work-directory"));
+		for (auto& path : luaFiles)
+		{
+			auto options = editorConfig->Generate(path);
+#ifndef _WIN32
+			options->end_of_line = "\n";
+#endif
+
+			auto waitFormattingFilePath = workRoot / path;
+			auto waitFormattingText = ReadFile(waitFormattingFilePath.string());
+
+			auto formattedFilePath = formattedRoot / path;
+
+			auto formattedText = ReadFile(formattedFilePath.string());
+
+			bool passed = TestFormatted(waitFormattingText, formattedText, options);
+
+			success &= passed;
+			std::cout << format("test format {} ... {}", path, passed ? "passed" : "false") << std::endl;
+
+			passed = TestFormatted(formattedText, formattedText, options);
+			success &= passed;
+			std::cout << format("test format stability {} ... {}", path, passed ? "passed" : "false") << std::endl;
+		}
+	}
 	else if (target == "CheckGrammar")
 	{
 		for (auto& path : luaFiles)

Test/test_script/format_text/wait_format_by_option/.editorconfig

@@ -65,4 +65,10 @@ indent_style = space
 [{indent_style-eq-tab.lua}]
 # optional space/tab
 indent_style = tab
-align_table_field_to_first_field = true
+[{indent_size-eq-2.lua}]
+indent_style = space
+indent_size = 2
+[{indent_size-eq-4.lua}]
+indent_style = space
+indent_size = 4
+

Test/test_script/format_text/wait_format_by_option/indent_size-eq-2.lua

@@ -0,0 +1,12 @@
+local t = 13
+print(function ()
+  local c = 123
+  local d = 131
+end)
+function f()
+  print("sjfoiwjfow",afff,fwfw)
+  local c = function()
+    local d = 12313
+  end
+end
+

Test/test_script/format_text/wait_format_by_option/indent_size-eq-4.lua

@@ -0,0 +1,11 @@
+local t = 13
+print(function()
+    local c = 123
+    local d = 131
+end)
+function f()
+    print("sjfoiwjfow", afff, fwfw)
+    local c = function()
+        local d = 12313
+    end
+end

Test/test_script/format_text/wait_format_by_option/indent_style-eq-space.lua

@@ -1,3 +1,4 @@
+-- base
 local t = function()
     local a = 131
     local b = function()
@@ -38,3 +39,37 @@ function ff()
         end
     end
 end
+
+-- translate tab to space
+-- TODO
+-- pcall {
+-- 	function()
+-- 		local t = 13
+-- 	end,
+-- 	a, b, c,
+-- }
+
+function fff()
+    do 
+        return
+    end
+
+    while true do
+        local c = function ()
+            for i=1,2,3 do
+                print(i)
+            end
+
+            for i,v in pairs{1,2,3,4,5,6} do
+                print(i,v)
+            end
+        end
+    end
+
+    if a then
+    elseif b then
+        local d =123
+    else
+        local c =123 
+    end
+end

Test/test_script/format_text/wait_format_by_option/indent_style-eq-tab.lua

@@ -1,13 +1,74 @@
-local t =  {
-                                        (function(a1, a2, a3, a4, a5, a6)
-                                            return {
-                                                [function()
-                                                    aaa, bbb, ccc = 1, 2, 3
-
-                                                    return aa, bb, cc, dd, ee
-                                                end] = {
-                                                    gggg
-                                                }
-                                            }
-                                        end)(1, 2, 3, 4, 5, 6)
-                                    }
+local t = function()
+	local a = 131
+	local b = function()
+		local c = {
+			d = function()
+				local e = 13
+				local f = print {
+					{
+						{
+							{
+								{
+									{
+										(function(a1, a2, a3, a4, a5, a6)
+											return {
+												[function()
+													aaa, bbb, ccc = 1, 2, 3
+
+													return aa, bb, cc, dd, ee
+												end] = {
+													gggg
+												}
+											}
+										end)(1, 2, 3, 4, 5, 6)
+									}
+								}
+							}
+						}
+					}
+				}
+			end
+		}
+	end
+end
+function ff()
+	if aaa and bbbb then
+		function dddd(aaa,
+		              bbbb, cccc, ddd)
+		end
+	end
+end
+
+-- translate space to tab
+pcall {
+    function ()
+        local t = 13
+    end,
+    a,b,c,
+}
+
+function fff()
+	do
+		return
+	end
+
+	while true do
+		local c = function()
+			for i = 1, 2, 3 do
+				print(i)
+			end
+
+			for i, v in pairs { 1, 2, 3, 4, 5, 6 } do
+				print(i, v)
+			end
+		end
+	end
+
+	if a then
+	elseif b then
+		local d = 123
+	else
+		local c = 123
+	end
+end
+

Test/test_script/format_text/wait_format_by_option_should_be/.editorconfig

@@ -0,0 +1,74 @@
+
+# see https://github.com/CppCXY/EmmyLuaCodeStyle
+[*.lua]
+# optional space/tab
+indent_style = space
+# if indent_style is space, this is valid
+indent_size = 4
+# if indent_style is tab, this is valid
+tab_width = 4
+continuation_indent_size = 4
+align_call_args = true
+keep_one_space_between_call_args_and_parentheses = false
+align_function_define_params = true
+keep_one_space_between_table_and_bracket = true
+align_table_field_to_first_field = false
+keep_one_space_between_namedef_and_attribute = false
+continuous_assign_statement_align_to_equal_sign = true
+continuous_assign_table_field_align_to_equal_sign = true
+label_no_indent = false
+do_statement_no_indent = false
+# optional crlf/lf
+end_of_line = crlf
+
+# The following configuration supports three expressions
+# minLine:${n}   
+# keepLine   
+# KeepLine:${n}
+
+keep_line_after_if_statement = minLine:1
+keep_line_after_do_statement = minLine:1
+keep_line_after_while_statement = minLine:1
+keep_line_after_repeat_statement = minLine:1
+keep_line_after_for_statement = minLine:1
+keep_line_after_local_or_assign_statement = keepLine
+keep_line_after_function_define_statement = keepLine:1
+
+# the following is code diagnostic options
+enable_check_codestyle = true
+# this mean utf8 length
+max_line_length = 120
+# this will check text end with new line(format always end with new line)
+insert_final_newline = true
+
+
+enable_name_style_check = false
+# the following is name style check rule 
+# base option off/camel_case/snake_case/upper_snake_case/pascal_case/same(filename/first_param/'<const string>', snake_case/pascal_case/camel_case)
+# all option can use '|' represent or 
+# for example:
+# snake_case | upper_snake_case
+# same(first_param, snake_case)
+# same('m')
+local_name_define_style = snake_case
+function_param_name_style = snake_case
+function_name_define_style = snake_case
+local_function_name_define_style = snake_case
+table_field_name_define_style = snake_case
+global_variable_name_define_style = snake_case|upper_snake_case
+module_name_define_style = same('m')|same(filename, snake_case)
+require_module_name_style = same(first_param, snake_case)
+class_name_define_style = same(filename, snake_case)
+[{indent_style-eq-space.lua}]
+# optional space/tab
+indent_style = space
+[{indent_style-eq-tab.lua}]
+# optional space/tab
+indent_style = tab
+[{indent_size-eq-2.lua}]
+indent_style = space
+indent_size = 2
+[{indent_size-eq-4.lua}]
+indent_style = space
+indent_size = 4
+

Test/test_script/format_text/wait_format_by_option_should_be/indent_size-eq-2.lua

@@ -0,0 +1,11 @@
+local t = 13
+print(function()
+  local c = 123
+  local d = 131
+end)
+function f()
+  print("sjfoiwjfow", afff, fwfw)
+  local c = function()
+    local d = 12313
+  end
+end