修复bug，提供大量测试用例

Author: CppCXY

CodeService/src/FormatElement/FormatElement.cpp

@@ -22,7 +22,7 @@ TextRange FormatElement::GetTextRange()
 
 void FormatElement::AddChild(std::shared_ptr<FormatElement> child)
 {
-	if (static_cast<int>(child->GetType()) < static_cast<int>(FormatElementType::ControlStart))
+	if (!child->GetTextRange().IsEmpty())
 	{
 		const auto range = child->GetTextRange();
 		AddTextRange(range);

CodeService/src/LuaFormatter.cpp

@@ -262,7 +262,8 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatBlock(std::shared_ptr<LuaAstN
 			}
 		case LuaAstNodeType::RepeatStatement:
 			{
-				indentEnv->AddChild(FormatNode(statement));
+				auto child = FormatNode(statement);
+				indentEnv->AddChild(child);
 				indentEnv->AddChild(_options.keep_line_after_repeat_statement);
 				break;
 			}
@@ -868,7 +869,14 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatRepeatStatement(std::shared_p
 				{
 					bool singleLine = false;
 					env->AddChild(FormatNodeAndBlockOrEnd(it, singleLine, children));
-					env->Add<KeepLineElement>();
+					if (singleLine)
+					{
+						env->Add<KeepElement>(1);
+					}
+					else
+					{
+						env->Add<KeepLineElement>();
+					}
 				}
 				else
 				{
@@ -1723,9 +1731,10 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatBinaryExpression(std::shared_
 std::shared_ptr<FormatElement> LuaFormatter::FormatUnaryExpression(std::shared_ptr<LuaAstNode> unaryExpression)
 {
 	auto env = std::make_shared<SubExpressionElement>();
-
-	for (const auto& child : unaryExpression->GetChildren())
+	auto& children = unaryExpression->GetChildren();
+	for (auto it = children.begin(); it != children.end(); ++it)
 	{
+		auto child = *it;
 		switch (child->GetType())
 		{
 		case LuaAstNodeType::UnaryOperator:
@@ -1737,6 +1746,13 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatUnaryExpression(std::shared_p
 				}
 				else
 				{
+					auto next = nextNode(it, children);
+					if (next && (next->GetType() == LuaAstNodeType::UnaryExpression || next->GetType() ==
+						LuaAstNodeType::Comment))
+					{
+						env->Add<KeepElement>(1);
+						break;
+					}
 					env->Add<KeepElement>(0);
 				}
 				break;

Test/src/CodeFormatTest.cpp

@@ -38,6 +38,30 @@ bool TestGrammar(std::string input)
 			                    parser->GetLine(error.ErrorRange.EndOffset),
 			                    parser->GetColumn(error.ErrorRange.EndOffset)
 			) << std::endl;
+		return result;
+	}
+
+	auto options = std::make_shared<LuaCodeStyleOptions>();
+
+	LuaFormatter formatter(parser, *options);
+
+	formatter.BuildFormattedElement();
+
+	auto formattedText = formatter.GetFormattedText();
+	auto formattedParser = LuaParser::LoadFromBuffer(std::move(formattedText));
+
+	formattedParser->BuildAstWithComment();
+	result = formattedParser->GetErrors().empty();
+
+	if (!result)
+	{
+		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)
+			) << std::endl;
 	}
 
 	return result;

Test/test_script/format_text/do.lua

@@ -0,0 +1,9 @@
+do return end
+do print("end") end
+do 
+    return x,b,v
+end
+do
+
+do return end
+end

Test/test_script/format_text/function.lua

@@ -0,0 +1,20 @@
+local function f()
+end
+local function func()
+    -- body
+end
+
+local function f2() end
+
+local function func() --[[hh]] end
+
+function c2()end
+
+function ccc.bbbb()end
+
+function ttt.bbb:ccc() end
+
+function f3()
+local function f() end
+
+end

Test/test_script/format_text/if.lua

@@ -0,0 +1,26 @@
+if aaa then end
+if aaa+bbb+ccc == 123 then end
+
+if aaa+bbb and
+ccc or eee then
+    local t = 123
+    if aaa then 
+    end
+
+    if ddd then
+    else --hahh
+    end
+end
+if a then
+elseif aa then
+elseif ccc then
+else
+end
+
+
+
+
+
+
+
+

Test/test_script/format_text/local_or_assign.lua

@@ -0,0 +1,27 @@
+local a = 123
+local c,d=123
+local c<const> = 123
+local d<close> = {}
+ccc=123
+ddd = a+b+c+d
+eee = b,1321,353
+hhh,vvv=123,456
+
+
+aaa  = 123
+yyy =2342
+mmmmmmm = 098
+
+
+local f = function()
+end
+
+local f2 = function(a,b,c) end
+
+local f3,f4 = function()end,
+function (x,y) return x+y end
+
+aaa.bbb = 123
+aaa().ccc =1231
+
+yyy,iiii.cccc=123,456

Test/test_script/format_text/repeat.lua

@@ -0,0 +1,8 @@
+repeat
+do print() end
+until true
+repeat
+local function f() do return end end
+until aa + bbb+ccc
+    > 123
+

Test/test_script/format_text_shouldbe/do.lua

@@ -0,0 +1,12 @@
+do return end
+
+do print("end") end
+
+do
+    return x, b, v
+end
+
+do
+
+    do return end
+end

Test/test_script/format_text_shouldbe/function.lua

@@ -0,0 +1,21 @@
+local function f()
+end
+
+local function func()
+    -- body
+end
+
+local function f2() end
+
+local function func() --[[hh]] end
+
+function c2() end
+
+function ccc.bbbb() end
+
+function ttt.bbb:ccc() end
+
+function f3()
+    local function f() end
+
+end