基本支持auto import

Author: CppCXY

3rd/uriparser/src/config.h

@@ -43,7 +43,7 @@
 
 #define PACKAGE_VERSION "0.9.5"
 
-#define HAVE_WPRINTF
+/* #undef HAVE_WPRINTF */
 /* #undef HAVE_REALLOCARRAY */
 
 

CodeFormatServer/CMakeLists.txt

@@ -32,7 +32,6 @@ target_sources(CodeFormatServer
 	${CodeFormatServer_SOURCE_DIR}/src/LanguageClient.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/LanguageService.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/VirtualFile/VirtualFile.cpp
-	${CodeFormatServer_SOURCE_DIR}/src/Service/Indexs/ModuleIndex.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/Session/IOSession.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/Session/SocketIOSession.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/Session/StandardIOSession.cpp
@@ -42,11 +41,22 @@ target_sources(CodeFormatServer
 	${CodeFormatServer_SOURCE_DIR}/src/Protocol/ProtocolBuffer.cpp
 
 	${CodeFormatServer_SOURCE_DIR}/src/VSCode.cpp
+	
+	#Service/indexs
+	${CodeFormatServer_SOURCE_DIR}/src/Service/Indexs/ModuleIndex.cpp
+
+	#Service/indexs/Config
+	${CodeFormatServer_SOURCE_DIR}/src/Service/Indexs/Config/ModuleConfig.cpp
+
+	#Service/AstUtil
+	${CodeFormatServer_SOURCE_DIR}/src/Service/AstUtil/ModuleFinder.cpp
 
 	#service
 	${CodeFormatServer_SOURCE_DIR}/src/Service/Service.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/Service/ModuleService.cpp
 	${CodeFormatServer_SOURCE_DIR}/src/Service/CodeFormatService.cpp
+	${CodeFormatServer_SOURCE_DIR}/src/Service/CompletionService.cpp
+
 	# mimalloc
 	${LuaCodeStyle_SOURCE_DIR}/3rd/mimalloc-2.0.3/src/static.c
 )

CodeFormatServer/src/LanguageClient.cpp

@@ -9,6 +9,7 @@
 
 #include "CodeFormatServer/Service/ModuleService.h"
 #include "CodeFormatServer/Service/CodeFormatService.h"
+#include "CodeFormatServer/Service/CompletionService.h"
 
 
 LanguageClient& LanguageClient::GetInstance()
@@ -27,6 +28,17 @@ void LanguageClient::InitializeService()
 {
 	AddService<CodeFormatService>();
 	AddService<ModuleService>();
+	AddService<CompletionService>();
+
+	for(auto service : _services)
+	{
+		service->Initialize();
+	}
+
+	for(auto service : _services)
+	{
+		service->Start();
+	}
 }
 
 void LanguageClient::SetSession(std::shared_ptr<IOSession> session)
@@ -118,7 +130,7 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 	}
 
 	auto formatDiagnostic = GetService<CodeFormatService>()->Diagnose(filename, parser, options);
-	auto moduleDiagnosis = GetService<ModuleService>()->Diagnose(filename, parser, options);
+	auto moduleDiagnosis = GetService<ModuleService>()->Diagnose(filename, parser);
 
 	std::copy(formatDiagnostic.begin(), formatDiagnostic.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
 	std::copy(moduleDiagnosis.begin(), moduleDiagnosis.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
@@ -172,7 +184,7 @@ std::shared_ptr<LuaCodeStyleOptions> LanguageClient::GetOptions(std::string_view
 	return options;
 }
 
-void LanguageClient::UpdateOptions(std::string_view workspaceUri, std::string_view configPath)
+void LanguageClient::UpdateCodeStyleOptions(std::string_view workspaceUri, std::string_view configPath)
 {
 	auto workspace = url::UrlToFilePath(workspaceUri);
 	for (auto& pair : _editorConfigVector)
@@ -194,7 +206,7 @@ void LanguageClient::UpdateOptions(std::string_view workspaceUri, std::string_vi
 	_editorConfigVector.back().second->SetRootWorkspace(_root);
 }
 
-void LanguageClient::RemoveOptions(std::string_view workspaceUri)
+void LanguageClient::RemoveCodeStyleOptions(std::string_view workspaceUri)
 {
 	auto workspace = url::UrlToFilePath(workspaceUri);
 	for (auto it = _editorConfigVector.begin(); it != _editorConfigVector.end(); it++)
@@ -208,6 +220,15 @@ void LanguageClient::RemoveOptions(std::string_view workspaceUri)
 }
 
 void LanguageClient::UpdateAllDiagnosis()
+{
+	for (auto it : _fileMap)
+	{
+		auto uri = url::FilePathToUrl(it.first);
+		DiagnosticFile(uri);
+	}
+}
+
+void LanguageClient::UpdateModuleInfo()
 {
 	FileFinder finder(_root);
 
@@ -222,19 +243,11 @@ void LanguageClient::UpdateAllDiagnosis()
 	finder.AddFindExtension(".lua.txt");
 
 	GetService<ModuleService>()->GetIndex().RebuildIndex(finder.FindFiles());
-
-	for (auto it : _fileMap)
-	{
-		auto uri = url::FilePathToUrl(it.first);
-		DiagnosticFile(uri);
-	}
 }
 
 void LanguageClient::SetRoot(std::string_view root)
 {
 	_root = root;
-	_defaultOptions->export_root = root;
-	_defaultOptions->import_from.emplace_back(root);
 }
 
 uint64_t LanguageClient::GetRequestId()

CodeFormatServer/src/LanguageService.cpp

@@ -9,6 +9,7 @@
 #include "CodeFormatServer/LanguageClient.h"
 #include "CodeFormatServer/Service/CodeFormatService.h"
 #include "CodeFormatServer/Service/ModuleService.h"
+#include "CodeFormatServer/Service/CompletionService.h"
 #include "Util/Url.h"
 #include "Util/format.h"
 
@@ -29,7 +30,8 @@ bool LanguageService::Initialize()
 	JsonProtocol("textDocument/didChange", &LanguageService::OnDidChange);
 	JsonProtocol("textDocument/didOpen", &LanguageService::OnDidOpen);
 	JsonProtocol("textDocument/didClose", &LanguageService::OnClose);
-	JsonProtocol("updateEditorConfig", &LanguageService::OnEditorConfigUpdate);
+	JsonProtocol("config/editorconfig/update", &LanguageService::OnEditorConfigUpdate);
+	JsonProtocol("config/moduleconfig/update", &LanguageService::OnModuleConfigUpdate);
 	JsonProtocol("textDocument/formatting", &LanguageService::OnFormatting);
 	JsonProtocol("textDocument/rangeFormatting", &LanguageService::OnRangeFormatting);
 	JsonProtocol("textDocument/onTypeFormatting", &LanguageService::OnTypeFormatting);
@@ -78,12 +80,21 @@ std::shared_ptr<vscode::InitializeResult> LanguageService::OnInitialize(std::sha
 	result->capabilities.completionProvider.resolveProvider = false;
 	result->capabilities.completionProvider.triggerCharacters = {};
 
-	auto& configFiles = param->initializationOptions.configFiles;
-	for (auto& configFile : configFiles)
+	auto& editorConfigFiles = param->initializationOptions.editorConfigFiles;
+	for (auto& configFile : editorConfigFiles)
 	{
-		LanguageClient::GetInstance().UpdateOptions(configFile.workspace, configFile.path);
+		LanguageClient::GetInstance().UpdateCodeStyleOptions(configFile.workspace, configFile.path);
 	}
 
+	auto& moduleConfigFiles = param->initializationOptions.moduleConfigFiles;
+	for (auto& configFile : moduleConfigFiles)
+	{
+		LanguageClient::GetInstance().GetService<ModuleService>()->GetIndex().BuildModule(
+			configFile.workspace, configFile.path);
+	}
+
+	LanguageClient::GetInstance().GetService<ModuleService>()->GetIndex().SetDefaultModule(param->rootPath);
+
 	std::filesystem::path localePath = param->initializationOptions.localeRoot;
 	localePath /= param->locale + ".json";
 
@@ -117,7 +128,7 @@ std::shared_ptr<vscode::InitializeResult> LanguageService::OnInitialize(std::sha
 
 std::shared_ptr<vscode::Serializable> LanguageService::OnInitialized(std::shared_ptr<vscode::Serializable> param)
 {
-	LanguageClient::GetInstance().UpdateAllDiagnosis();
+	LanguageClient::GetInstance().UpdateModuleInfo();
 	return nullptr;
 }
 
@@ -189,19 +200,19 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnClose(
 }
 
 std::shared_ptr<vscode::Serializable> LanguageService::OnEditorConfigUpdate(
-	std::shared_ptr<vscode::EditorConfigUpdateParams> param)
+	std::shared_ptr<vscode::ConfigUpdateParams> param)
 {
 	switch (param->type)
 	{
 	case vscode::FileChangeType::Created:
 	case vscode::FileChangeType::Changed:
 		{
-			LanguageClient::GetInstance().UpdateOptions(param->source.workspace, param->source.path);
+			LanguageClient::GetInstance().UpdateCodeStyleOptions(param->source.workspace, param->source.path);
 			break;
 		}
 	case vscode::FileChangeType::Delete:
 		{
-			LanguageClient::GetInstance().RemoveOptions(param->source.workspace);
+			LanguageClient::GetInstance().RemoveCodeStyleOptions(param->source.workspace);
 			break;
 		}
 	}
@@ -211,6 +222,33 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnEditorConfigUpdate(
 	return nullptr;
 }
 
+
+std::shared_ptr<vscode::Serializable> LanguageService::OnModuleConfigUpdate(
+	std::shared_ptr<vscode::ConfigUpdateParams> param)
+{
+	switch (param->type)
+	{
+	case vscode::FileChangeType::Created:
+	case vscode::FileChangeType::Changed:
+		{
+			LanguageClient::GetInstance().GetService<ModuleService>()
+			                             ->GetIndex().BuildModule(param->source.workspace, param->source.path);
+			break;
+		}
+	case vscode::FileChangeType::Delete:
+		{
+			LanguageClient::GetInstance().GetService<ModuleService>()
+			                             ->GetIndex().RemoveModule(param->source.workspace);
+			break;
+		}
+	}
+
+	LanguageClient::GetInstance().UpdateModuleInfo();
+
+	return nullptr;
+}
+
+
 std::shared_ptr<vscode::Serializable> LanguageService::OnRangeFormatting(
 	std::shared_ptr<vscode::DocumentRangeFormattingParams> param)
 {
@@ -371,15 +409,22 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnExecuteCommand(
 		}
 
 		std::string uri = param->arguments[0];
+		std::string filePath = url::UrlToFilePath(uri);
+		auto config = LanguageClient::GetInstance().GetService<ModuleService>()->GetIndex().GetConfig(filePath);
+		if(!config)
+		{
+			return nullptr;
+		}
 		vscode::Range range;
 
 		range.Deserialize(param->arguments[1]);
 
 		std::string moduleName = param->arguments[2];
-		auto pos = moduleName.find_last_of('.');
+
 		std::string moduleDefineName = param->arguments[3];
 
-		std::string requireString = format("local {} = require(\"{}\")\n", moduleDefineName, moduleName);
+		std::string requireString = format("local {} = {}(\"{}\")\n", moduleDefineName, config->import_function,
+		                                   moduleName);
 		auto parser = LanguageClient::GetInstance().GetFileParser(uri);
 
 		auto applyParams = std::make_shared<vscode::ApplyWorkspaceEditParams>();
@@ -426,7 +471,18 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnDidChangeWatchedFiles(
 	return nullptr;
 }
 
-std::shared_ptr<vscode::Serializable> LanguageService::OnCompletion(std::shared_ptr<vscode::CompletionParams> param)
+std::shared_ptr<vscode::CompletionList> LanguageService::OnCompletion(std::shared_ptr<vscode::CompletionParams> param)
 {
-	return nullptr;
+	auto uri = param->textDocument.uri;
+
+	auto parser = LanguageClient::GetInstance().GetFileParser(uri);
+
+	auto options = LanguageClient::GetInstance().GetOptions(uri);
+
+	auto list = std::make_shared<vscode::CompletionList>();
+	list->isIncomplete = true;
+	list->items = LanguageClient::GetInstance().GetService<CompletionService>()->GetCompletions(
+		param->textDocument.uri, param->position, parser, options);
+
+	return list;
 }