语言服务支持读取.editorconfig文件

Author: CppCXY

CodeFormat/src/CodeFormat.cpp

@@ -42,10 +42,10 @@ int main(int argc, char** argv)
 		parser = LuaParser::LoadFromBuffer(std::move(buffer));
 	}
 
-	LuaFormatOptions options;
+	LuaCodeStyleOptions options;
 	if (!cmd.Get<std::string>("config").empty())
 	{
-		options = LuaFormatOptions::ParseFromEditorConfig(cmd.Get<std::string>("config"));
+		options = LuaCodeStyleOptions::ParseFromEditorConfig(cmd.Get<std::string>("config"));
 	}
 
 	parser->BuildAstWithComment();

CodeFormatServer/src/LanguageClient.cpp

@@ -10,6 +10,11 @@ LanguageClient& LanguageClient::GetInstance()
 	return instance;
 }
 
+LanguageClient::LanguageClient()
+	: _defaultOptions(std::make_shared<LuaCodeStyleOptions>())
+{
+}
+
 void LanguageClient::SetSession(std::shared_ptr<IOSession> session)
 {
 	_session = session;
@@ -63,14 +68,16 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 
 	std::shared_ptr<LuaParser> parser = LuaParser::LoadFromBuffer(std::move(text));
 
-	if(parser->HasError())
+	if (parser->HasError())
 	{
 		return;
 	}
 
+	auto options = GetOptions(uri);
+
 	parser->BuildAstWithComment();
 
-	LuaFormatter formatter(parser, _options);
+	LuaFormatter formatter(parser, *options);
 	formatter.BuildFormattedElement();
 
 	auto diagnosisInfos = formatter.GetDiagnosisInfos();
@@ -100,7 +107,7 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 std::string LanguageClient::GetFile(std::string_view uri)
 {
 	auto it = _fileMap.find(uri);
-	if(it != _fileMap.end())
+	if (it != _fileMap.end())
 	{
 		return it->second;
 	}
@@ -116,7 +123,49 @@ void LanguageClient::Run()
 	}
 }
 
-LuaFormatOptions& LanguageClient::GetOptions()
+std::shared_ptr<LuaCodeStyleOptions> LanguageClient::GetOptions(std::string_view uri)
+{
+	std::size_t matchLength = 0;
+	std::shared_ptr<LuaCodeStyleOptions> options = _defaultOptions;
+	for (auto it = _optionsVector.begin(); it != _optionsVector.end(); it++)
+	{
+		if (uri.starts_with(it->first) && it->first.size() > matchLength)
+		{
+			matchLength = it->first.size();
+			options = it->second;
+		}
+	}
+
+	return options;
+}
+
+void LanguageClient::UpdateOptions(std::string_view workspaceUri, std::string_view configPath)
+{
+	for (auto& pair : _optionsVector)
+	{
+		if (pair.first == workspaceUri)
+		{
+			pair.second = LuaCodeStyleOptions::ParseFromEditorConfig(configPath);
+			return;
+		}
+	}
+
+	_optionsVector.push_back({std::string(workspaceUri), LuaCodeStyleOptions::ParseFromEditorConfig(configPath)});
+}
+
+void LanguageClient::RemoveOptions(std::string_view workspaceUri)
 {
-	return _options;
+	for (auto it = _optionsVector.begin(); it != _optionsVector.end(); it++)
+	{
+		if (it->first == workspaceUri)
+		{
+			_optionsVector.erase(it);
+			break;
+		}
+	}
 }
+
+// LuaCodeStyleOptions& LanguageClient::GetOptions()
+// {
+// 	return _optionsVector;
+// }

CodeFormatServer/src/LanguageService.cpp

@@ -1,6 +1,6 @@
 #include "CodeFormatServer/LanguageService.h"
 #include "CodeFormatServer/VSCode.h"
-#include "CodeService/LuaFormatOptions.h"
+#include "CodeService/LuaCodeStyleOptions.h"
 #include "CodeService/LuaFormatter.h"
 #include "CodeFormatServer/LanguageClient.h"
 
@@ -24,6 +24,7 @@ bool LanguageService::Initialize()
 	_handles["textDocument/didOpen"] = DynamicBind(OnDidOpen, vscode::DidOpenTextDocumentParams);
 	_handles["textDocument/formatting"] = DynamicBind(OnFormatting, vscode::DocumentFormattingParams);
 	_handles["textDocument/didClose"] = DynamicBind(OnClose, vscode::DidCloseTextDocumentParams);
+	_handles["updateEditorConfig"] = DynamicBind(OnEditorConfigUpdate, vscode::EditorConfigUpdateParams);
 	return true;
 }
 
@@ -45,6 +46,13 @@ std::shared_ptr<vscode::InitializeResult> LanguageService::OnInitialize(std::sha
 	result->capabilities.documentFormattingProvider = true;
 	result->capabilities.textDocumentSync.change = vscode::TextDocumentSyncKind::Full;
 	result->capabilities.textDocumentSync.openClose = true;
+
+	auto& configFiles = param->initializationOptions.configFiles;
+	for (auto& configFile : configFiles)
+	{
+		LanguageClient::GetInstance().UpdateOptions(configFile.workspace, configFile.path);
+	}
+
 	return result;
 }
 
@@ -84,18 +92,18 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnFormatting(
 		return result;
 	}
 
-	auto& options = LanguageClient::GetInstance().GetOptions();
+	auto options = LanguageClient::GetInstance().GetOptions(param->textDocument.uri);
 
 	std::shared_ptr<LuaParser> parser = LuaParser::LoadFromBuffer(std::move(text));
 	parser->BuildAstWithComment();
 
-	if(parser->HasError())
+	if (parser->HasError())
 	{
 		result->hasError = true;
 		return result;
 	}
 
-	LuaFormatter formatter(parser, options);
+	LuaFormatter formatter(parser, *options);
 	formatter.BuildFormattedElement();
 
 	auto& edit = result->edits.emplace_back();
@@ -113,4 +121,25 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnClose(
 	LanguageClient::GetInstance().ReleaseFile(param->textDocument.uri);
 
 	return nullptr;
-}
+}
+
+std::shared_ptr<vscode::Serializable> LanguageService::OnEditorConfigUpdate(
+	std::shared_ptr<vscode::EditorConfigUpdateParams> param)
+{
+	switch (param->type)
+	{
+	case vscode::EditorConfigUpdateType::Created:
+	case vscode::EditorConfigUpdateType::Changed:
+		{
+			LanguageClient::GetInstance().UpdateOptions(param->source.workspace, param->source.path);
+			break;
+		}
+	case vscode::EditorConfigUpdateType::Delete:
+		{
+			LanguageClient::GetInstance().RemoveOptions(param->source.workspace);
+			break;
+		}
+	}
+
+	return nullptr;
+}

CodeFormatServer/src/Session/SocketIOSession.cpp

@@ -41,7 +41,9 @@ void SocketIOSession::Run()
 		while (true);
 
 		do {
-			std::string result = Handle(protocolBuffer.ReadOneProtocol());
+			auto content = protocolBuffer.ReadOneProtocol();
+			// std::cout << content << std::endl;
+			std::string result = Handle(content);
 
 			protocolBuffer.Reset();
 			if (!result.empty()) {

CodeFormatServer/src/VSCode.cpp

@@ -35,6 +35,10 @@ std::shared_ptr<vscode::Serializable> vscode::MakeFromRequest(std::string_view m
 	{
 		return MakeRequestObject<DidCloseTextDocumentParams>(json);
 	}
+	else if (method  == "updateEditorConfig")
+	{
+		return MakeRequestObject<EditorConfigUpdateParams>(json);
+	}
 
 	return nullptr;
 }
@@ -199,15 +203,22 @@ void vscode::ServerCapabilities::Deserialize(nlohmann::json json)
 	textDocumentSync.Deserialize(json["textDocumentSync"]);
 }
 
-nlohmann::json vscode::InitializeParams::Serialize()
+void vscode::InitializationOptions::Deserialize(nlohmann::json json)
 {
-	auto object = nlohmann::json::object();
-	object["rootPath"] = rootPath;
-	object["rootUri"] = rootUri;
-	object["locale"] = locale;
-	object["initializationOptions"] = initializationOptions;
+	auto configFileArray = json["configFiles"];
 
-	return object;
+	for(auto& configSource: configFileArray)
+	{
+		auto& source = configFiles.emplace_back();
+		source.Deserialize(configSource);
+	}
+
+	auto workspaceFolderArray = json["workspaceFolders"];
+
+	for(auto& workspaceUri: workspaceFolderArray)
+	{
+		workspaceFolders.emplace_back(workspaceUri);
+	}
 }
 
 void vscode::InitializeParams::Deserialize(nlohmann::json json)
@@ -216,7 +227,7 @@ void vscode::InitializeParams::Deserialize(nlohmann::json json)
 	rootUri = json["rootUri"];
 	locale = json["locale"];
 
-	initializationOptions = json["initializationOptions"];
+	initializationOptions.Deserialize(json["initializationOptions"]);
 }
 
 nlohmann::json vscode::InitializeResult::Serialize()
@@ -299,3 +310,16 @@ void vscode::DidCloseTextDocumentParams::Deserialize(nlohmann::json json)
 {
 	textDocument.Deserialize(json["textDocument"]);
 }
+
+void vscode::EditorConfigSource::Deserialize(nlohmann::json json)
+{
+	uri = json["uri"];
+	path = json["path"];
+	workspace = json["workspace"];
+}
+
+void vscode::EditorConfigUpdateParams::Deserialize(nlohmann::json json)
+{
+	type = json["type"];
+	source.Deserialize(json["source"]);
+}

CodeService/CMakeLists.txt

@@ -52,7 +52,7 @@ target_sources(CodeService
 	${CodeService_SOURCE_DIR}/src/FormatElement/KeepElement.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/SubExpressionElement.cpp	
 	${CodeService_SOURCE_DIR}/src/FormatElement/DiagnosisContext.cpp	
-	${CodeService_SOURCE_DIR}/src/LuaFormatOptions.cpp
+	${CodeService_SOURCE_DIR}/src/LuaCodeStyleOptions.cpp
 )
 
 target_link_libraries(CodeService LuaParser)

CodeService/src/FormatElement/DiagnosisContext.cpp

@@ -2,7 +2,7 @@
 
 #include "Util/format.h"
 
-DiagnosisContext::DiagnosisContext(std::shared_ptr<LuaParser> parser, LuaFormatOptions& options)
+DiagnosisContext::DiagnosisContext(std::shared_ptr<LuaParser> parser, LuaCodeStyleOptions& options)
 	: _parser(parser),
 	  _options(options)
 {
@@ -118,7 +118,7 @@ std::vector<LuaDiagnosisInfo> DiagnosisContext::GetDiagnosisInfos()
 	return _diagnosisInfos;
 }
 
-const LuaFormatOptions& DiagnosisContext::GetOptions()
+const LuaCodeStyleOptions& DiagnosisContext::GetOptions()
 {
 	return _options;
 }

CodeService/src/FormatElement/FormatContext.cpp

@@ -1,6 +1,6 @@
 #include "CodeService/FormatElement/FormatContext.h"
 
-FormatContext::FormatContext(std::shared_ptr<LuaParser> parser, LuaFormatOptions& options)
+FormatContext::FormatContext(std::shared_ptr<LuaParser> parser, LuaCodeStyleOptions& options)
 	: _options(options),
 	  _characterCount(0),
 	  _parser(parser)