implement #30

Author: CppCXY

CodeService/src/LuaEditorConfig.cpp

@@ -319,6 +319,12 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 			configMap.at("if_condition_align_with_each_other") == "true";
 	}
 
+	if(configMap.count("if_branch_comments_after_block_no_indent"))
+	{
+		options->if_branch_comments_after_block_no_indent =
+			configMap.at("if_branch_comments_after_block_no_indent") == "true";
+	}
+
 	if(configMap.count("long_chain_expression_allow_one_space_after_colon"))
 	{
 		options->long_chain_expression_allow_one_space_after_colon =

CodeService/src/LuaFormatter.cpp

@@ -1852,12 +1852,23 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatBlockFromParent(LuaAstNode::C
 {
 	std::shared_ptr<LuaAstNode> block = nullptr;
 	std::vector<std::shared_ptr<LuaAstNode>> comments;
-
+	std::vector<std::shared_ptr<LuaAstNode>> afterBlockComments;
 	for (; it != children.end(); ++it)
 	{
 		if (nextMatch(it, LuaAstNodeType::Comment, children))
 		{
-			comments.push_back(nextNode(it, children));
+			auto next = nextNode(it, children);
+			if (block)
+			{
+				if (_parser->GetLine(block->GetTextRange().EndOffset) != _parser->GetLine(
+					next->GetTextRange().StartOffset))
+				{
+					afterBlockComments.push_back(next);
+					continue;
+				}
+			}
+
+			comments.push_back(next);
 		}
 		else if (nextMatch(it, LuaAstNodeType::Block, children))
 		{
@@ -1878,7 +1889,32 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatBlockFromParent(LuaAstNode::C
 			copyBlock->AddComment(comment);
 		}
 
-		return FormatBlock(copyBlock);
+		auto nextKey = nextNode(it, children);
+		if (_options.if_branch_comments_after_block_no_indent
+			&& nextKey && nextKey->GetType() == LuaAstNodeType::KeyWord
+			&& (nextKey->GetText() == "elseif" || nextKey->GetText() == "else"))
+		{
+			auto blockEnv = FormatBlock(copyBlock);
+			auto noIndentEnv = std::make_shared<NoIndentElement>();
+			for (auto comment : afterBlockComments)
+			{
+				auto commentStatement = std::make_shared<StatementElement>();
+				commentStatement->AddChild(FormatComment(comment));
+				noIndentEnv->AddChild(commentStatement);
+				noIndentEnv->Add<KeepLineElement>();
+			}
+			blockEnv->AddChild(noIndentEnv);
+
+			return blockEnv;
+		}
+		else
+		{
+			for (auto comment : afterBlockComments)
+			{
+				copyBlock->AddComment(comment);
+			}
+			return FormatBlock(copyBlock);
+		}
 	}
 	else
 	{

Test/test_script/format_text/wait_format_by_option/.editorconfig

@@ -155,6 +155,8 @@ call_arg_parentheses = remove_table_only
 call_arg_parentheses = remove_string_only
 [{call_arg_parentheses-eq-unambiguous_remove_string_only.lua}]
 call_arg_parentheses = unambiguous_remove_string_only
+[{if_branch_comments_after_block_no_indent-eq-true.lua}]
+if_branch_comments_after_block_no_indent = true
 [{minLine-eq-1.lua}]
 keep_line_after_if_statement = minLine:1
 keep_line_after_do_statement = minLine:1

Test/test_script/format_text/wait_format_by_option/if_branch_comments_after_block_no_indent-eq-true.lua

@@ -0,0 +1,37 @@
+if a then
+    --aaa
+    local c =123
+    --bbb
+else --cccc
+    --dddddd
+end
+
+if cccc then
+
+    ---ddddd
+elseif aaa then
+    ---hhhhh
+end
+
+if dddd then
+    
+    local cc =123
+    ---kwgfowkjgow
+    local t =123
+    --afafafa
+elseif ccccc then
+    local t = 123
+    --fnwojfoiw
+end
+
+if eeee then ddd() --[[aaaa]] else end
+
+if hhhh then dddd() ---jfoiwjfiwjifw
+elseif hhhhh then
+end
+
+if hhhh then
+    dddd()
+    --hhhh
+else 
+end

Test/test_script/format_text/wait_format_by_option_should_be/.editorconfig

@@ -153,6 +153,8 @@ call_arg_parentheses = remove_table_only
 call_arg_parentheses = remove_string_only
 [{call_arg_parentheses-eq-unambiguous_remove_string_only.lua}]
 call_arg_parentheses = unambiguous_remove_string_only
+[{if_branch_comments_after_block_no_indent-eq-true.lua}]
+if_branch_comments_after_block_no_indent = true
 [{minLine-eq-1.lua}]
 keep_line_after_if_statement = minLine:1
 keep_line_after_do_statement = minLine:1

Test/test_script/format_text/wait_format_by_option_should_be/if_branch_comments_after_block_no_indent-eq-true.lua

@@ -0,0 +1,37 @@
+if a then
+    --aaa
+    local c = 123
+--bbb
+else --cccc
+    --dddddd
+end
+
+if cccc then
+
+    ---ddddd
+elseif aaa then
+    ---hhhhh
+end
+
+if dddd then
+
+    local cc = 123
+    ---kwgfowkjgow
+    local t = 123
+--afafafa
+elseif ccccc then
+    local t = 123
+    --fnwojfoiw
+end
+
+if eeee then ddd() --[[aaaa]] else end
+
+if hhhh then dddd() ---jfoiwjfiwjifw
+elseif hhhhh then
+end
+
+if hhhh then
+    dddd()
+--hhhh
+else
+end

include/CodeService/LuaCodeStyleOptions.h

@@ -84,6 +84,7 @@ class LuaCodeStyleOptions
 	 */
 	bool if_condition_no_continuation_indent = false;
 
+	bool if_branch_comments_after_block_no_indent = false;
 	/*
 	 * 表内每一个表项对齐到第一个表项
 	 */
@@ -103,6 +104,7 @@ class LuaCodeStyleOptions
 	bool table_append_expression_no_space = false;
 
 	bool long_chain_expression_allow_one_space_after_colon = false;
+
 #ifndef _WINDOWS
 	std::string end_of_line = "\n";
 #else

lua.template.editorconfig

@@ -40,6 +40,8 @@ label_no_indent = false
 do_statement_no_indent = false
 # if true, the conditional expression of the if statement will not be a continuation line indent
 if_condition_no_continuation_indent = false
+# 
+if_branch_comments_after_block_no_indent = false
 # if true, t[#t+1] will not space wrapper '+'
 table_append_expression_no_space = false
 # if statement will align like switch case