提交更多的测试修复bug

Author: CppCXY

CodeService/src/LuaFormatter.cpp

@@ -392,6 +392,12 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatLocalStatement(std::shared_pt
 				env->AddChild(FormatNode(node));
 				break;
 			}
+		case LuaAstNodeType::Comment:
+			{
+				env->AddChild(FormatNode(node));
+				env->Add<KeepElement>(1);
+				break;
+			}
 		default:
 			DefaultHandle(node, env);
 			break;
@@ -428,6 +434,12 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatAssignment(std::shared_ptr<Lu
 					env->AddChild(FormatNode(node));
 				}
 
+				break;
+			}
+		case LuaAstNodeType::Comment:
+			{
+				env->AddChild(FormatNode(node));
+				env->Add<KeepElement>(1);
 				break;
 			}
 		default:
@@ -458,6 +470,12 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatNameDefList(std::shared_ptr<L
 				env->Add<KeepBlankElement>(1);
 				break;
 			}
+		case LuaAstNodeType::Comment:
+			{
+				env->AddChild(FormatNode(node));
+				env->Add<KeepElement>(1);
+				break;
+			}
 		default:
 			DefaultHandle(node, env);
 			break;
@@ -587,7 +605,12 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatReturnStatement(std::shared_p
 				env->AddChild(FormatNode(child));
 				break;
 			}
-
+		case LuaAstNodeType::Comment:
+			{
+				env->AddChild(FormatNode(child));
+				env->Add<KeepElement>(1);
+				break;
+			}
 		default:
 			DefaultHandle(child, env);
 			break;
@@ -1320,6 +1343,12 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatTableField(std::shared_ptr<Lu
 				env->Add<TextElement>(child, TextDefineType::TableFieldNameDefine);
 				break;
 			}
+		case LuaAstNodeType::Comment:
+			{
+				env->AddChild(FormatNode(child));
+				env->Add<KeepElement>(1);
+				break;
+			}
 		default:
 			{
 				DefaultHandle(child, env);
@@ -1333,10 +1362,6 @@ void LuaFormatter::DefaultHandle(std::shared_ptr<LuaAstNode> node, std::shared_p
 {
 	auto childEnv = FormatNode(node);
 	envElement->AddChild(childEnv);
-	if (node->GetType() == LuaAstNodeType::Comment)
-	{
-		envElement->Add<KeepElement>(1);
-	}
 }
 
 std::shared_ptr<FormatElement> LuaFormatter::FormatAlignStatement(LuaAstNode::ChildIterator& it,

Test/test_script/format_text/comment.lua

@@ -0,0 +1,25 @@
+local t = 123 -- 123131
+local -- 1313131
+t--lnfowjhfjwfiow
+=--lkwjoifgjwojgwgw
+131231--fgjoiwejgoweijgiope
+
+if aaa --ffff
+and --fjwofjiwfiw
+cccc or ok then -- heeeeeee
+    ---fff
+    print("wjfgopwjoifgw"--[[whgwhgiwh]])
+end
+
+function ff()
+    ---f2
+    --[[
+        aaaabbbb,cccc,eeee,fff
+    ]]
+    local t = 1231
+    ---@type fff2
+    local e =1231
+end
+
+return --fff
+aaa+ccc,bbb

Test/test_script/format_text/expression.lua

@@ -0,0 +1,38 @@
+local t = -1
+local t1 = not   a  and  b or c
+local t2 = not a ..b  or "" -3 + 4 -5
+local t3 = - - 2 + - - - - 5
+
+(function () end)()
+call(123,456)(789)
+call "12313" (456)
+call(123) "456"
+print [[
+    12313
+
+    456
+
+    789
+]]
+function f()
+    aaaa.bbbb.cccc.callllll()
+    aaaa["awfwfw"].bbbbb:cccccc()
+    aaaa["wfwfw"]:f()
+    aaaa[13131].bbbb.ccc:ddd()
+    aaaaa.bbb
+        .ccc()
+        .eeeee()
+        .fffff()
+        .jjjjj()
+    
+    local t = {
+        aaa,bbbb,cccc
+    }
+    local c = { aaa, 13131, 2424242 }
+    local ddd = call { aaaa, bbb, ccc }
+    local eee = calll
+        { 12313, 35353, fff }
+    local fff = function() end
+    dd.e().e().aaa =1231
+end
+

Test/test_script/format_text/expressionList.lua

@@ -0,0 +1,21 @@
+local t = aaa, bbbb, ccc, dddd
+
+local t1 = aaa,function () end,eee+ccc,dddd
+
+local t2 = c2(function()
+end),bbbb,ccc,function()end,
+function (
+
+)
+end
+
+function ff()
+    return a,b,c,
+    d
+end
+
+function fff2()
+    return aaaa and
+cc or d,a, function ()end
+end
+

Test/test_script/format_text/goto.lua

@@ -0,0 +1,23 @@
+function label()
+    while true do
+        if ok then
+            goto continue
+        end
+
+        ::continue::
+    end
+end
+
+goto label2
+
+function f2()
+while true do
+while true do
+ if true then
+ end
+
+end
+end
+::endloop::
+end
+

Test/test_script/format_text/number.lua

@@ -0,0 +1,6 @@
+local a = 1231 + 1231.123131 + 0xFFFF + 0.1e-30 + 0.9E-31
+    + 1e1 + 1E3
+
+-- luajit
+local b =1231ULL
+

Test/test_script/format_text/while.lua

@@ -2,9 +2,9 @@ while true do while false do end end
 
 while false do
     print("if \z
-    OK
-    ok
-    
+    OK\z
+    ok\z
+    \z
     ")
 
 end

Test/test_script/format_text_shouldbe/comment.lua

@@ -0,0 +1,25 @@
+local t = 123 -- 123131
+local -- 1313131
+t--lnfowjhfjwfiow
+ = --lkwjoifgjwojgwgw
+131231 --fgjoiwejgoweijgiope
+
+if aaa --ffff
+    and --fjwofjiwfiw
+    cccc or ok then -- heeeeeee
+    ---fff
+    print("wjfgopwjoifgw"--[[whgwhgiwh]] )
+end
+
+function ff()
+    ---f2
+    --[[
+        aaaabbbb,cccc,eeee,fff
+    ]]
+    local t = 1231
+    ---@type fff2
+    local e = 1231
+end
+
+return--fff
+ aaa + ccc, bbb

Test/test_script/format_text_shouldbe/expression.lua

@@ -0,0 +1,37 @@
+local t = -1
+local t1 = not a and b or c
+local t2 = not a .. b or "" - 3 + 4 - 5
+local t3 = - -2 + - - - -5
+
+(function() end)()
+call(123, 456)(789)
+call "12313"(456)
+call(123)"456"
+print [[
+    12313
+
+    456
+
+    789
+]]
+function f()
+    aaaa.bbbb.cccc.callllll()
+    aaaa["awfwfw"].bbbbb:cccccc()
+    aaaa["wfwfw"]:f()
+    aaaa[13131].bbbb.ccc:ddd()
+    aaaaa.bbb
+        .ccc()
+        .eeeee()
+        .fffff()
+        .jjjjj()
+
+    local t = {
+        aaa, bbbb, cccc
+    }
+    local c = { aaa, 13131, 2424242 }
+    local ddd = call { aaaa, bbb, ccc }
+    local eee = calll
+        { 12313, 35353, fff }
+    local fff = function() end
+    dd.e().e().aaa = 1231
+end

Test/test_script/format_text_shouldbe/expressionList.lua

@@ -0,0 +1,20 @@
+local t = aaa, bbbb, ccc, dddd
+
+local t1 = aaa, function() end, eee + ccc, dddd
+
+local t2 = c2(function()
+end), bbbb, ccc, function() end,
+    function(
+
+        )
+    end
+
+function ff()
+    return a, b, c,
+        d
+end
+
+function fff2()
+    return aaaa and
+        cc or d, a, function() end
+end