Merge branch 'master' of github.com:CppCXY/EmmyLuaCodeStyle

Author: CppCXY

CMakeLists.txt

@@ -11,7 +11,6 @@ option(EnableTest "Test project" ON)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	add_definitions(-DMSVC)
-	# ÓÅ»¯Ñ¡Ïî
 else()
 	set(CMAKE_C_FLAGS_RELEASE "-O2")
     set(CMAKE_CXX_FLAGS_RELEASE "-O2")

CodeFormatServer/src/Service/AstUtil/ModuleFinder.cpp

@@ -46,7 +46,7 @@ void ModuleFinder::VisitParamList(const std::shared_ptr<LuaAstNode>& paramList)
 {
 	for (auto param : paramList->GetChildren())
 	{
-		if (param->GetType() == LuaAstNodeType::Identify)
+		if (param->GetType() == LuaAstNodeType::Param)
 		{
 			RecordLocalVariable(param);
 		}

CodeService/src/LuaFormatter.cpp

@@ -1088,12 +1088,13 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatIfStatement(std::shared_ptr<L
 				}
 
 				env->AddChild(FormatExpression(child, expression));
-				env->Add<KeepBlankElement>(1);
+				env->Add<KeepElement>(1);
 				break;
 			}
 		default:
 			{
 				DefaultHandle(child, env);
+				env->Add<KeepElement>(1);
 				break;
 			}
 		}
@@ -1196,6 +1197,10 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallArgList(std::shared_ptr<L
 						layout = std::make_shared<AlignToFirstElement>();
 					}
 				}
+				else
+				{
+					layout = std::make_shared<IndentOnLineBreakElement>();
+				}
 
 				env->AddChild(FormatExpressionList(child, layout));
 				env->Add<KeepElement>(0);
@@ -1803,7 +1808,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatNodeAndBlockOrEnd(LuaAstNode:
 		else
 		{
 			singleLineBlock = true;
-			env->Add<KeepBlankElement>(1);
+			env->Add<KeepElement>(1);
 
 			for (auto blockChild : block->GetChildren())
 			{
@@ -1812,7 +1817,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatNodeAndBlockOrEnd(LuaAstNode:
 					auto shortExpression = std::make_shared<ExpressionElement>();
 					shortExpression->AddChildren(blockChild->GetChildren());
 					env->AddChild(shortExpression);
-					env->Add<KeepBlankElement>(1);
+					env->Add<KeepElement>(1);
 				}
 			}
 		}

CodeService/src/NameStyle/NameStyleChecker.cpp

@@ -195,7 +195,7 @@ void NameStyleChecker::VisitParamList(const std::shared_ptr<LuaAstNode>& paramLi
 {
 	for (auto param : paramList->GetChildren())
 	{
-		if (param->GetType() == LuaAstNodeType::Identify)
+		if (param->GetType() == LuaAstNodeType::Param && param->GetText() != "...")
 		{
 			_nameStyleCheckVector.push_back(std::make_shared<CheckElement>(NameDefineType::ParamName, param));
 		}

Test/test_script/format_text/wait_format/expression.lua

@@ -36,3 +36,8 @@ function f()
     dd.e().e().aaa =1231
 end
 
+call(
+	call(aaa,
+		aaaa),
+	call(aaa,bbbb,ccc)
+)

Test/test_script/format_text/wait_format/if.lua

@@ -18,9 +18,12 @@ else
 end
 
 
+if a then return a --end
 
 
+end
 
-
-
+if a --
+then
+end
 

Test/test_script/format_text/wait_format_should_be/expression.lua

@@ -35,3 +35,9 @@ function f()
     local fff = function() end
     dd.e().e().aaa = 1231
 end
+
+call(
+    call(aaa,
+        aaaa),
+    call(aaa, bbbb, ccc)
+)

Test/test_script/format_text/wait_format_should_be/if.lua

@@ -16,3 +16,13 @@ elseif aa then
 elseif ccc then
 else
 end
+
+
+if a then return a --end
+
+
+end
+
+if a --
+then
+end