IMPL #39

Author: CppCXY

CodeService/src/LuaEditorConfig.cpp

@@ -243,6 +243,12 @@ void LuaEditorConfig::ParseFromSection(std::shared_ptr<LuaCodeStyleOptions> opti
 		options->continuation_indent_size = std::stoi(configMap.at("continuation_indent_size"));
 	}
 
+	if(configMap.count("statement_inline_comment_space")
+		&& isNumber(configMap.at("statement_inline_comment_space")))
+	{
+		options->statement_inline_comment_space = std::stoi(configMap.at("statement_inline_comment_space"));
+	}
+
 	if (configMap.count("local_assign_continuation_align_to_first_expression"))
 	{
 		options->local_assign_continuation_align_to_first_expression =

CodeService/src/LuaFormatter.cpp

@@ -331,7 +331,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatBlock(std::shared_ptr<LuaAstN
 				{
 					if (!last->GetChildren().empty() && last->GetChildren().back()->HasValidTextRange())
 					{
-						last->Add<KeepBlankElement>(1);
+						last->Add<KeepBlankElement>(_options.statement_inline_comment_space);
 					}
 					last->AddChild(FormatComment(statement));
 				}
@@ -359,7 +359,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatBlock(std::shared_ptr<LuaAstN
 
 					if (currentLine == nextLine)
 					{
-						statEnv->Add<KeepBlankElement>(1);
+						statEnv->Add<KeepBlankElement>(_options.statement_inline_comment_space);
 						statEnv->Add<TextElement>(next);
 						++it;
 					}
@@ -1676,7 +1676,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatAlignStatement(LuaAstNode::Ch
 			auto lastStatementEnv = env->LastValidElement();
 			if (lastStatementEnv)
 			{
-				lastStatementEnv->Add<KeepBlankElement>(1);
+				lastStatementEnv->Add<KeepBlankElement>(_options.statement_inline_comment_space);
 				lastStatementEnv->AddChild(FormatNode(nextChild));
 			}
 			//else 应该不存在这种情况

include/CodeService/LuaCodeStyleOptions.h

@@ -40,6 +40,7 @@ class LuaCodeStyleOptions
 	 */
 	int continuation_indent_size = 4;
 
+	int statement_inline_comment_space = 1;
 
 	bool local_assign_continuation_align_to_first_expression = false;