更为正确的支持editorconfig配置

Author: CppCXY

CodeFormat/src/CodeFormat.cpp

@@ -64,7 +64,8 @@ int main(int argc, char** argv)
 
 	if (!cmd.Get<std::string>("config").empty())
 	{
-		options = LuaCodeStyleOptions::ParseFromEditorConfig(cmd.Get<std::string>("config"));
+		auto editorConfig = LuaEditorConfig::LoadFromFile(cmd.Get<std::string>("config"));
+		options = LuaCodeStyleOptions::ParseFromEditorConfig(editorConfig);
 	}
 	else
 	{

CodeFormatServer/src/LanguageClient.cpp

@@ -65,7 +65,7 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 	}
 
 	auto options = GetOptions(uri);
-	if(!options->enable_check_codestyle)
+	if (!options->enable_check_codestyle)
 	{
 		auto vscodeDiagnosis = std::make_shared<vscode::PublishDiagnosticsParams>();
 		vscodeDiagnosis->uri = uri;
@@ -148,12 +148,16 @@ void LanguageClient::UpdateOptions(std::string_view workspaceUri, std::string_vi
 	{
 		if (pair.first == workspaceUri)
 		{
-			pair.second = LuaCodeStyleOptions::ParseFromEditorConfig(configPath);
+			pair.second = LuaCodeStyleOptions::ParseFromEditorConfig(
+				LuaEditorConfig::LoadFromFile(std::string(configPath)));
 			return;
 		}
 	}
 
-	_optionsVector.push_back({std::string(workspaceUri), LuaCodeStyleOptions::ParseFromEditorConfig(configPath)});
+	_optionsVector.push_back({
+		std::string(workspaceUri),
+		LuaCodeStyleOptions::ParseFromEditorConfig(LuaEditorConfig::LoadFromFile(std::string(configPath)))
+	});
 }
 
 void LanguageClient::RemoveOptions(std::string_view workspaceUri)

CodeService/CMakeLists.txt

@@ -4,7 +4,7 @@ project(CodeService)
 
 add_library(CodeService STATIC)
 
-add_dependencies(CodeService LuaParser)
+add_dependencies(CodeService LuaParser Util)
 
 target_include_directories(CodeService PUBLIC
 	${LuaCodeStyle_SOURCE_DIR}/include
@@ -61,4 +61,4 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	target_compile_options(CodeService PUBLIC /utf-8)
 endif ()
 
-target_link_libraries(CodeService LuaParser)
+target_link_libraries(CodeService LuaParser Util)

CodeService/src/FormatElement/DiagnosisContext.cpp

@@ -10,7 +10,7 @@ DiagnosisContext::DiagnosisContext(std::shared_ptr<LuaParser> parser, LuaCodeSty
 
 void DiagnosisContext::AddIndent(int specialIndent)
 {
-	if (!_options.use_tab)
+	if (_options.indent_style == IndentStyle::Space)
 	{
 		int newIndent = 0;
 		if (specialIndent == -1)
@@ -22,7 +22,7 @@ void DiagnosisContext::AddIndent(int specialIndent)
 			}
 
 			auto& topIndent = _indentStack.top();
-			newIndent = _options.indent + topIndent;
+			newIndent = _options.indent_size + topIndent;
 		}
 		else
 		{

CodeService/src/FormatElement/FormatContext.cpp

@@ -5,7 +5,6 @@ FormatContext::FormatContext(std::shared_ptr<LuaParser> parser, LuaCodeStyleOpti
 	: _options(options),
 	  _characterCount(0),
 	  _parser(parser)
-
 {
 }
 
@@ -28,7 +27,7 @@ void FormatContext::PrintLine(int line)
 {
 	for (int i = 0; i < line; i++)
 	{
-		_os << _options.line_separator;
+		_os << _options.end_of_line;
 		_characterCount = 0;
 	}
 }
@@ -54,7 +53,7 @@ void FormatContext::PrintIndent(int indent, const std::string& indentString)
 
 void FormatContext::AddIndent(int specialIndent)
 {
-	if (!_options.use_tab)
+	if (_options.indent_style == IndentStyle::Space)
 	{
 		int newIndent = 0;
 		if (specialIndent == -1)
@@ -66,7 +65,7 @@ void FormatContext::AddIndent(int specialIndent)
 			}
 
 			auto& topIndent = _indentStack.top();
-			newIndent = _options.indent + topIndent.Indent;
+			newIndent = _options.indent_size + topIndent.Indent;
 		}
 		else
 		{
@@ -93,7 +92,7 @@ void FormatContext::AddIndent(int specialIndent)
 		{
 			// 我会认为存在一个换算
 			// 当你制定了一个缩进，则我会认为保底有一个缩进
-			newIndent = std::max(1, specialIndent / 8);
+			newIndent = std::max(1, specialIndent / _options.tab_width);
 		}
 		std::string indentString = "\t";
 		_indentStack.push({newIndent, "\t"});

CodeService/src/FormatElement/IndentElement.cpp

@@ -30,7 +30,7 @@ void IndentElement::Diagnosis(DiagnosisContext& ctx, int position, FormatElement
 	{
 		auto child = _children[i];
 
-		if (child->HasValidTextRange() && !ctx.GetOptions().use_tab && child->GetType() != FormatElementType::IndentElement)
+		if (child->HasValidTextRange() && ctx.GetOptions().indent_style == IndentStyle::Space && child->GetType() != FormatElementType::IndentElement)
 		{
 			auto range = child->GetTextRange();
 			auto character = ctx.GetColumn(range.StartOffset);

CodeService/src/FormatElement/RangeFormatContext.cpp

@@ -67,7 +67,7 @@ void RangeFormatContext::PrintLine(int line)
 	{
 		for (int i = 0; i < line; i++)
 		{
-			_os << _options.line_separator;
+			_os << _options.end_of_line;
 		}
 	}
 }
@@ -82,7 +82,7 @@ std::string RangeFormatContext::GetText()
 
 		if (ch != '\n' && ch != '\r')
 		{
-			formattedText = formattedText.substr(0, i + 1).append(_options.line_separator);
+			formattedText = formattedText.substr(0, i + 1).append(_options.end_of_line);
 			break;
 		}
 	}

CodeService/src/LuaCodeStyleOptions.cpp

@@ -1,169 +1,96 @@
 #include "CodeService/LuaCodeStyleOptions.h"
-#include <fstream>
 #include <filesystem>
 #include <regex>
 #include "CodeService/FormatElement/MinLineElement.h"
 #include "CodeService/FormatElement/KeepLineElement.h"
 
-static std::vector<std::string> Split(std::string_view source, std::string_view separator)
+std::shared_ptr<LuaCodeStyleOptions> LuaCodeStyleOptions::ParseFromEditorConfig(
+	std::shared_ptr<LuaEditorConfig> editorConfig)
 {
-	if (source.empty() || separator.empty())
-	{
-		return {};
-	}
-
-	std::size_t sepLen = separator.size();
-	std::vector<std::string> result;
-
-	while (true)
+	auto options = std::make_shared<LuaCodeStyleOptions>();
+	if (editorConfig->Exist("indent_style"))
 	{
-		const std::size_t sepIndex = source.find_first_of(separator, 0);
-		if (sepIndex == std::string_view::npos)
+		if (editorConfig->Get("indent_style") == "space")
 		{
-			result.push_back(std::string(source));
-			break;
+			options->indent_style = IndentStyle::Space;
 		}
-		else
+		else if (editorConfig->Get("indent_style") == "tab")
 		{
-			result.push_back(std::string(source.substr(0, sepIndex)));
-			source = source.substr(sepIndex + sepLen);
+			options->indent_style = IndentStyle::Tab;
 		}
 	}
-	return result;
-}
-
-std::shared_ptr<LuaCodeStyleOptions> LuaCodeStyleOptions::ParseFromEditorConfig(std::string_view filename)
-{
-	std::filesystem::path filePath(filename);
-	std::string realPath = filePath.string();
-	std::fstream fin(realPath, std::ios::in | std::ios::binary);
-
-	if (!fin.is_open())
-	{
-		return {};
-	}
-	std::stringstream s;
-	s << fin.rdbuf();
-	fin.close();
-	std::string text = s.str();
-
-	auto lines = Split(text, "\n");
 
-	bool luaSectionFounded = false;
-	std::regex comment = std::regex(R"(^\s*(;|#))");
-	std::regex luaSection = std::regex(R"(^\s*\[\s*([\w\.\*]+)\s*\]\s*$)");
-	std::regex valueRegex = std::regex(R"(^\s*([\w\d_]+)\s*=\s*([\w\:\._]+)\s*$)");
-	std::map<std::string, std::string> optionMap;
-
-	for (auto& line : lines)
+	if (editorConfig->Exist("indent_size"))
 	{
-		if (std::regex_search(line, comment))
-		{
-			continue;
-		}
-
-		std::smatch m;
-
-		if (std::regex_search(line, m, luaSection))
-		{
-			if (m.str(1) == "*.lua")
-			{
-				luaSectionFounded = true;
-			}
-			else
-			{
-				luaSectionFounded = false;
-			}
-
-			continue;
-		}
-
-		if (luaSectionFounded)
-		{
-			if (std::regex_search(line, m, valueRegex))
-			{
-				optionMap.insert({m.str(1), m.str(2)});
-			}
-		}
+		options->indent_size = std::stoi(editorConfig->Get("indent_size"));
 	}
 
-
-	return ParseOptionsFromMap(optionMap);
-}
-
-std::shared_ptr<LuaCodeStyleOptions> LuaCodeStyleOptions::ParseOptionsFromMap(std::map<std::string, std::string>& optionMap)
-{
-	auto options = std::make_shared<LuaCodeStyleOptions>();
-	if (optionMap.count("use_tab"))
+	if (editorConfig->Exist("tab_width"))
 	{
-		options->use_tab = optionMap["use_tab"] == "true";
+		options->tab_width = std::stoi(editorConfig->Get("tab_width"));
 	}
 
-	if (optionMap.count("indent"))
-	{
-		options->indent = std::stoi(optionMap["indent"]);
-	}
 
-	if (optionMap.count("continuation_indent"))
+	if (editorConfig->Exist("continuation_indent_size"))
 	{
-		options->continuation_indent = std::stoi(optionMap["indent"]);
+		options->continuation_indent_size = std::stoi(editorConfig->Get("continuation_indent_size"));
 	}
 
-	if (optionMap.count("align_call_args"))
+	if (editorConfig->Exist("align_call_args"))
 	{
-		options->align_call_args = optionMap["align_call_args"] == "true";
+		options->align_call_args = editorConfig->Get("align_call_args") == "true";
 	}
 
-	if (optionMap.count("keep_one_space_between_call_args_and_bracket"))
+	if (editorConfig->Exist("keep_one_space_between_call_args_and_bracket"))
 	{
 		options->keep_one_space_between_call_args_and_bracket =
-			optionMap["keep_one_space_between_call_args_and_bracket"] == "true";
+			editorConfig->Get("keep_one_space_between_call_args_and_bracket") == "true";
 	}
 
-	if (optionMap.count("keep_one_space_between_table_and_bracket"))
+	if (editorConfig->Exist("keep_one_space_between_table_and_bracket"))
 	{
 		options->keep_one_space_between_table_and_bracket =
-			optionMap["keep_one_space_between_table_and_bracket"] == "true";
+			editorConfig->Get("keep_one_space_between_table_and_bracket") == "true";
 	}
 
-	if (optionMap.count("align_table_field_to_first_field"))
+	if (editorConfig->Exist("align_table_field_to_first_field"))
 	{
-		options->align_table_field_to_first_field = optionMap["align_table_field_to_first_field"] == "true";
+		options->align_table_field_to_first_field = editorConfig->Get("align_table_field_to_first_field") == "true";
 	}
 
-	if (optionMap.count("continuous_assign_statement_align_to_equal_sign"))
+	if (editorConfig->Exist("continuous_assign_statement_align_to_equal_sign"))
 	{
 		options->continuous_assign_statement_align_to_equal_sign =
-			optionMap["continuous_assign_statement_align_to_equal_sign"] == "true";
+			editorConfig->Get("continuous_assign_statement_align_to_equal_sign") == "true";
 	}
 
-	if (optionMap.count("continuous_assign_table_field_align_to_equal_sign"))
+	if (editorConfig->Exist("continuous_assign_table_field_align_to_equal_sign"))
 	{
 		options->continuous_assign_table_field_align_to_equal_sign =
-			optionMap["continuous_assign_table_field_align_to_equal_sign"] == "true";
+			editorConfig->Get("continuous_assign_table_field_align_to_equal_sign") == "true";
 	}
 
-	if (optionMap.count("line_separator"))
+	if (editorConfig->Exist("end_of_line"))
 	{
-		auto lineSeparatorSymbol = optionMap["line_separator"];
-		if (lineSeparatorSymbol == "CRLF")
+		auto lineSeparatorSymbol = editorConfig->Get("end_of_line");
+		if (lineSeparatorSymbol == "crlf")
 		{
-			options->line_separator = "\r\n";
+			options->end_of_line = "\r\n";
 		}
-		else if (lineSeparatorSymbol == "LF")
+		else if (lineSeparatorSymbol == "lf")
 		{
-			options->line_separator = "\n";
+			options->end_of_line = "\n";
 		}
 	}
 
-	if (optionMap.count("max_line_length"))
+	if (editorConfig->Exist("max_line_length"))
 	{
-		options->max_line_length = std::stoi(optionMap["max_line_length"]);
+		options->max_line_length = std::stoi(editorConfig->Get("max_line_length"));
 	}
 
-	if (optionMap.count("enable_check_codestyle"))
+	if (editorConfig->Exist("enable_check_codestyle"))
 	{
-		options->enable_check_codestyle = optionMap["enable_check_codestyle"] == "true";
+		options->enable_check_codestyle = editorConfig->Get("enable_check_codestyle") == "true";
 	}
 
 	std::vector<std::pair<std::string, std::shared_ptr<FormatElement>&>> fieldList = {
@@ -179,23 +106,23 @@ std::shared_ptr<LuaCodeStyleOptions> LuaCodeStyleOptions::ParseOptionsFromMap(st
 	std::regex keepLineRegex = std::regex(R"(keepLine:\s*(\d+))");
 	for (auto& keepLineOption : fieldList)
 	{
-		auto it = optionMap.find(keepLineOption.first);
-		if (it != optionMap.end())
+		if (editorConfig->Exist(keepLineOption.first))
 		{
-			if (it->second == "keepLine")
+			std::string value = editorConfig->Get(keepLineOption.first);
+			if (value == "keepLine")
 			{
 				keepLineOption.second = std::make_shared<KeepLineElement>();
 				continue;
 			}
 			std::smatch m;
 
-			if (std::regex_search(it->second, m, minLineRegex))
+			if (std::regex_search(value, m, minLineRegex))
 			{
 				keepLineOption.second = std::make_shared<MinLineElement>(std::stoi(m.str(1)));
 				continue;
 			}
 
-			if (std::regex_search(it->second, m, keepLineRegex))
+			if (std::regex_search(value, m, keepLineRegex))
 			{
 				keepLineOption.second = std::make_shared<KeepLineElement>(std::stoi(m.str(1)));
 			}