FIX #26

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")

CodeService/src/LuaFormatter.cpp

@@ -1791,7 +1791,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatNodeAndBlockOrEnd(LuaAstNode:
 		else
 		{
 			singleLineBlock = true;
-			env->Add<KeepBlankElement>(1);
+			env->Add<KeepElement>(1);
 
 			for (auto blockChild : block->GetChildren())
 			{
@@ -1800,7 +1800,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);
 				}
 			}
 		}

Test/test_script/format_text/wait_format/if.lua

@@ -18,6 +18,11 @@ else
 end
 
 
+if a then return a --end
+
+
+end
+
 
 
 

Test/test_script/format_text/wait_format_should_be/if.lua

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