修复识别bug

CppCXY · CppCXY · commit 37714d022caf · 2022-01-05T00:28:26.000+08:00
diff --git a/CodeService/src/LuaFormatter.cpp b/CodeService/src/LuaFormatter.cpp
@@ -995,12 +995,16 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatExpressionStatement(std::shar
 	{
 		switch (child->GetType())
 		{
-			// 目前表达式语句上只有调用表达式
 		case LuaAstNodeType::CallExpression:
 			{
 				env->AddChild(FormatNode(child));
 				break;
 			}
+		case LuaAstNodeType::Expression:
+			{
+				FormatExpression(child, env);
+				break;
+			}
 			// default 一般只有一个分号
 		default:
 			{
@@ -1902,7 +1906,16 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallExpression(std::shared_pt
 		case LuaAstNodeType::CallExpression:
 			{
 				env->AddChild(FormatNode(child));
-				env->Add<KeepElement>(0);
+				auto callArg = child->FindFirstOf(LuaAstNodeType::CallArgList);
+				if (callArg->GetChildren().size() <= 1)
+				{
+					env->Add<KeepElement>(1);
+				}
+				else
+				{
+					env->Add<KeepElement>(0);
+				}
+
 				break;
 			}
 		case LuaAstNodeType::CallArgList:

Original file line number	Diff line number	Diff line change
`@@ -995,12 +995,16 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatExpressionStatement(std::shar`
`995`	`995`	`{`
`996`	`996`	`switch (child->GetType())`
`997`	`997`	`{`
`998`		`- // 目前表达式语句上只有调用表达式`
`999`	`998`	`case LuaAstNodeType::CallExpression:`
`1000`	`999`	`{`
`1001`	`1000`	`env->AddChild(FormatNode(child));`
`1002`	`1001`	`break;`
`1003`	`1002`	`}`
	`1003`	`+ case LuaAstNodeType::Expression:`
	`1004`	`+ {`
	`1005`	`+ FormatExpression(child, env);`
	`1006`	`+ break;`
	`1007`	`+ }`
`1004`	`1008`	`// default 一般只有一个分号`
`1005`	`1009`	`default:`
`1006`	`1010`	`{`
`@@ -1902,7 +1906,16 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallExpression(std::shared_pt`
`1902`	`1906`	`case LuaAstNodeType::CallExpression:`
`1903`	`1907`	`{`
`1904`	`1908`	`env->AddChild(FormatNode(child));`
`1905`		`- env->Add<KeepElement>(0);`
	`1909`	`+ auto callArg = child->FindFirstOf(LuaAstNodeType::CallArgList);`
	`1910`	`+ if (callArg->GetChildren().size() <= 1)`
	`1911`	`+ {`
	`1912`	`+ env->Add<KeepElement>(1);`
	`1913`	`+ }`
	`1914`	`+ else`
	`1915`	`+ {`
	`1916`	`+ env->Add<KeepElement>(0);`
	`1917`	`+ }`
	`1918`	`+`
`1906`	`1919`	`break;`
`1907`	`1920`	`}`
`1908`	`1921`	`case LuaAstNodeType::CallArgList:`