更新一点格式化选项

Author: CppCXY

CodeService/src/FormatElement/FormatContext.cpp

@@ -11,9 +11,9 @@ FormatContext::FormatContext(std::shared_ptr<LuaParser> parser, LuaFormatOptions
 void FormatContext::Print(std::string_view text)
 {
 	auto& indentState = _indentStack.top();
-	if (_characterCount < indentState.Indent)
+	if (static_cast<int>(_characterCount) < indentState.Indent)
 	{
-		PrintBlank(indentState.Indent - static_cast<int>(_characterCount));
+		PrintIndent(indentState.Indent - static_cast<int>(_characterCount), indentState.IndentString);
 	}
 	_os << text;
 	_characterCount += text.size();
@@ -26,36 +26,37 @@ void FormatContext::PrintLine(int line)
 		_os << _options.LineSeperater;
 		_characterCount = 0;
 	}
-
-	if(_indentStack.top().Type == IndentStateType::ActiveIfLineBreak)
-	{
-		// ¸´ÖÆ
-		auto topIndent = _indentStack.top();
-		_indentStack.pop();
-
-		AddIndent(topIndent.WaitActiveIndent);
-	}
 }
 
 void FormatContext::PrintBlank(int blank)
 {
 	for (int i = 0; i < blank; i ++)
 	{
-		_os << " ";
+		_os << ' ';
 		_characterCount++;
 	}
 }
 
+void FormatContext::PrintIndent(int indent, const std::string& indentString)
+{
+	// 我始终认为使\t来排版就是垃圾
+	for (int i = 0; i < indent; i++)
+	{
+		_os << indentString;
+		_characterCount += indentString.size();
+	}
+}
+
 void FormatContext::AddIndent(int specialIndent, IndentStateType type)
 {
-	if (type == IndentStateType::Normal)
+	if (!_options.UseTabIndent)
 	{
 		int newIndent = 0;
 		if (specialIndent == -1)
 		{
 			if (_indentStack.empty())
 			{
-				_indentStack.push({0, 0, "", type});
+				_indentStack.push({0, "", type});
 				return;
 			}
 
@@ -66,21 +67,31 @@ void FormatContext::AddIndent(int specialIndent, IndentStateType type)
 		{
 			newIndent = specialIndent;
 		}
-		std::string indentString;
-		indentString.reserve(_options.IndentString.size() * newIndent);
-		for (int i = 0; i != newIndent; i++)
-		{
-			indentString.append(_options.IndentString);
-		}
-		_indentStack.push({newIndent, 0, std::move(indentString), type});
+		_indentStack.push({newIndent, " ", type});
 	}
-	else if(type == IndentStateType::ActiveIfLineBreak)
+	else //这个算法可能会有问题
 	{
-		// ¸´ÖÆ
-		auto topIndent = _indentStack.top();
-		topIndent.WaitActiveIndent = specialIndent;
-		topIndent.Type = type;
-		_indentStack.push(topIndent);
+		int newIndent = 0;
+		if (specialIndent == -1)
+		{
+			if (_indentStack.empty())
+			{
+				_indentStack.push({0, "", type});
+				return;
+			}
+
+			auto& topIndent = _indentStack.top();
+			// 一次只增一个\t
+			newIndent = 1 + topIndent.Indent;
+		}
+		else
+		{
+			// 我会认为存在一个换算
+			// 当你制定了一个缩进，则我会认为保底有一个缩进
+			newIndent = std::max(1, specialIndent / 8);
+		}
+		std::string indentString = "\t";
+		_indentStack.push({newIndent, "\t", type});
 	}
 }
 

include/CodeService/FormatElement/FormatContext.h

@@ -13,13 +13,13 @@ class FormatContext
 	enum class IndentStateType
 	{
 		Normal,
-		ActiveIfLineBreak,
+		// ActiveIfLineBreak,
 	};
 
 	struct IndentState
 	{
 		int Indent = 0;
-		int WaitActiveIndent = 0;
+		// int WaitActiveIndent = 0;
 		std::string IndentString = "";
 		IndentStateType Type = IndentStateType::Normal;
 	};
@@ -32,6 +32,8 @@ class FormatContext
 
 	void PrintBlank(int blank);
 
+	void PrintIndent(int indent, const std::string& indentString);
+
 	void AddIndent(int specialIndent = -1, IndentStateType type = IndentStateType::Normal);
 
 	void RecoverIndent();
@@ -46,9 +48,6 @@ class FormatContext
 
 	std::string GetText();
 
-	void SetIndentIfLineBreak(int indent);
-
-	void ClearIndentIfLineBreak();
 
 private:
 	std::stack<IndentState, std::vector<IndentState>> _indentStack;

include/CodeService/LuaFormatOptions.h

@@ -3,9 +3,15 @@
 class LuaFormatOptions
 {
 public:
-	int Indent = 4;
-
-	std::string IndentString = " ";
+	// 我反对这种风格
+	// 但我依然实现他
+	bool UseTabIndent = false;
 
+	int Indent = 4;
+	// 这只是初始化时的默认选项，在linux上依然可以保持 \r\n
+#ifdef _WINDOWS
 	std::string LineSeperater = "\r\n";
-};
+#else
+	std::string LineSeperater = "\r";
+#endif
+};