typeformat支持自动填补表的逗号

Author: CppCXY

CodeService/src/FormatElement/SepElement.cpp

@@ -1,5 +1,13 @@
 #include "CodeService/FormatElement/SepElement.h"
 
+
+std::shared_ptr<SepElement> SepElement::After(std::shared_ptr<FormatElement> node)
+{
+	auto sep = std::make_shared<SepElement>();
+	sep->_textRange = TextRange(node->GetTextRange().EndOffset, node->GetTextRange().EndOffset);
+	return sep;
+}
+
 SepElement::SepElement()
 	: TextElement(""),
 	  _empty(false)

CodeService/src/LuaFormatter.cpp

@@ -2058,8 +2058,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatAlignTableField(LuaAstNode::C
 				{
 					if (!sep)
 					{
-						sep = std::make_shared<SepElement>();
-						layoutChildren.insert(rIt.base(), sep);
+						layoutChildren.insert(rIt.base(), SepElement::After((*rIt)));
 					}
 
 					break;
@@ -2077,8 +2076,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatAlignTableField(LuaAstNode::C
 					}
 					else if (!sep)
 					{
-						sep = std::make_shared<SepElement>();
-						layoutChildren.insert(rIt.base(), sep);
+						layoutChildren.insert(rIt.base(), SepElement::After((*rIt)));
 					}
 
 					break;

CodeService/src/TypeFormat/LuaTypeFormat.cpp

@@ -81,12 +81,17 @@ void LuaTypeFormat::AnalysisReturn(int line, int character)
 		return;
 	}
 
-	FormatLine(line);
+	if (_typeOptions.format_line)
+	{
+		FormatLine(line);
+	}
+
+
 }
 
 void LuaTypeFormat::CompleteMissToken(int line, int character, LuaError& luaError)
 {
-	if(!_typeOptions.auto_complete_end)
+	if (!_typeOptions.auto_complete_end)
 	{
 		return;
 	}
@@ -197,15 +202,18 @@ void LuaTypeFormat::CompleteMissToken(int line, int character, LuaError& luaErro
 
 void LuaTypeFormat::FormatLine(int line)
 {
-	if(!_typeOptions.format_line)
-	{
-		return;
-	}
-
 	LuaCodeStyleOptions temp = _options;
 	temp.insert_final_newline = true;
 	temp.remove_expression_list_finish_comma = false;
-	temp.trailing_table_separator = TrailingTableSeparator::Keep;
+	if (_typeOptions.auto_complete_table_sep)
+	{
+		temp.trailing_table_separator = TrailingTableSeparator::Smart;
+	}
+	else
+	{
+		temp.trailing_table_separator = TrailingTableSeparator::Keep;
+	}
+
 	LuaFormatter formatter(_parser, temp);
 	formatter.BuildFormattedElement();
 

CodeService/src/TypeFormat/LuaTypeFormatOptions.cpp

@@ -14,5 +14,10 @@ LuaTypeFormatOptions LuaTypeFormatOptions::ParseFrom(std::map<std::string, std::
 		options.format_line = stringOptions["format_line"] == "true";
 	}
 
+	if(stringOptions.count("auto_complete_table_sep"))
+	{
+		options.auto_complete_table_sep = stringOptions["auto_complete_table_sep"] == "true";
+	}
+
 	return options;
 }

include/CodeService/FormatElement/SepElement.h

@@ -5,6 +5,8 @@
 class SepElement : public TextElement
 {
 public:
+	static std::shared_ptr<SepElement> After(std::shared_ptr<FormatElement> node);
+
 	SepElement();
 
 	explicit SepElement(std::shared_ptr<LuaAstNode> node);

include/CodeService/TypeFormat/LuaTypeFormatOptions.h

@@ -10,4 +10,5 @@ class LuaTypeFormatOptions
 
 	bool format_line = true;
 	bool auto_complete_end = true;
+	bool auto_complete_table_sep = true;
 };