FIX #35

Author: CppCXY

CodeService/src/FormatElement/KeepElement.cpp

@@ -1,9 +1,10 @@
 #include "CodeService/FormatElement/KeepElement.h"
 #include "Util/format.h"
 
-KeepElement::KeepElement(int keepBlank, bool hasLinebreak)
+KeepElement::KeepElement(int keepBlank, bool hasLinebreak, bool allowContinueIndent)
 	: _keepBlank(keepBlank),
-	  _hasLinebreak(hasLinebreak)
+	  _hasLinebreak(hasLinebreak),
+	  _allowContinueIndent(allowContinueIndent)
 {
 }
 
@@ -15,7 +16,6 @@ FormatElementType KeepElement::GetType()
 void KeepElement::Serialize(SerializeContext& ctx, ChildIterator selfIt,
                             FormatElement& parent)
 {
-
 	const int lastElementLine = GetLastValidLine(ctx, selfIt, parent);
 	const int nextElementLine = GetNextValidLine(ctx, selfIt, parent);
 
@@ -43,8 +43,7 @@ void KeepElement::Serialize(SerializeContext& ctx, ChildIterator selfIt,
 void KeepElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
                             FormatElement& parent)
 {
-
-	if(selfIt == parent.GetChildren().begin())
+	if (selfIt == parent.GetChildren().begin())
 	{
 		return;
 	}

CodeService/src/FormatElement/LongExpressionLayoutElement.cpp

@@ -47,7 +47,8 @@ void LongExpressionLayoutElement::SerializeSubExpression(SerializeContext& ctx,
 		}
 		if (child->Is(FormatElementType::KeepElement))
 		{
-			if (ctx.GetCharacterCount() == 0 && !_hasContinuation)
+			auto keepElement = std::dynamic_pointer_cast<KeepElement>(child);
+			if (keepElement->AllowContinueIndent() && ctx.GetCharacterCount() == 0 && !_hasContinuation)
 			{
 				IndentSubExpression(ctx);
 			}

CodeService/src/LuaFormatter.cpp

@@ -2219,16 +2219,17 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallExpression(std::shared_pt
 				{
 					if (!ast_util::WillCallArgHaveParentheses(next, _options.call_arg_parentheses))
 					{
-						env->Add<KeepElement>(1);
+						//TODO workaround
+						env->Add<KeepElement>(1, false, false);
 					}
 					else
 					{
-						env->Add<KeepElement>(0);
+						env->Add<KeepElement>(0, false, false);
 					}
 				}
 				else
 				{
-					env->Add<KeepElement>(1);
+					env->Add<KeepElement>(1, false, false);
 				}
 
 				break;
@@ -2256,7 +2257,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatCallExpression(std::shared_pt
 					needSpace = false;
 				}
 
-				env->Add<KeepElement>(needSpace ? 1 : 0);
+				env->Add<KeepElement>(needSpace ? 1 : 0, false, !nextCallArgList);
 
 				break;
 			}

Test/test_script/format_text/wait_format/expression.lua

@@ -41,3 +41,17 @@ call(
 		aaaa),
 	call(aaa,bbbb,ccc)
 )
+TEST
+[[
+
+]]
+[[
+
+]]
+local t = TEST 
+[[
+
+]]
+[[
+
+]]

Test/test_script/format_text/wait_format_should_be/expression.lua

@@ -31,7 +31,7 @@ function f()
     local c = { aaa, 13131, 2424242 }
     local ddd = call { aaaa, bbb, ccc }
     local eee = calll
-        { 12313, 35353, fff }
+    { 12313, 35353, fff }
     local fff = function() end
     dd.e().e().aaa = 1231
 end
@@ -41,3 +41,17 @@ call(
         aaaa),
     call(aaa, bbbb, ccc)
 )
+TEST
+[[
+
+]]
+[[
+
+]]
+local t = TEST
+[[
+
+]]
+[[
+
+]]

include/CodeService/FormatElement/KeepElement.h

@@ -5,17 +5,21 @@
 class KeepElement : public FormatElement
 {
 public:
+
 	/*
 	 * @param keepBlank 表示如果下一个元素和当前元素在同一行则保持几个空格
 	 * @remark 如果下一个元素和当前元素在不同行则换行
 	 */
-	explicit KeepElement(int keepBlank, bool hasLinebreak = false);
+	explicit KeepElement(int keepBlank, bool hasLinebreak = false, bool allowContinueIndent = true);
 
 	FormatElementType GetType() override;
 
+	bool AllowContinueIndent() const { return _allowContinueIndent; }
+
 	void Serialize(SerializeContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 	void Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, FormatElement& parent) override;
 private:
 	int _keepBlank;
 	bool _hasLinebreak;
+	bool _allowContinueIndent;
 };

include/CodeService/LuaFormatter.h

@@ -4,7 +4,6 @@
 #include "LuaParser/LuaParser.h"
 #include "LuaCodeStyleOptions.h"
 #include "FormatElement/FormatElement.h"
-#include "FormatElement/PlaceholderElement.h"
 #include "LuaDiagnosisInfo.h"
 #include "LuaFormatRange.h"