更新原则

Author: CppCXY

3rd/uriparser/src/config.h

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

CodeFormatServer/src/Service/Indexs/Config/ModuleConfig.cpp

@@ -79,6 +79,30 @@ std::shared_ptr<ModuleConfig> ModuleConfig::LoadFromFile(std::string_view filePa
 				}
 			}
 		}
+
+		if(json["export.rule"].is_array())
+		{
+			for (auto rule : json["export.rule"])
+			{
+				if (rule.is_string())
+				{
+					std::string strRule = rule;
+					if(strRule == "init_to_dir_module")
+					{
+						moduleConfig->_exportRules.push_back(ExportRule::init_to_dir_module);
+					}
+					else if(strRule == "only_filename")
+					{
+						moduleConfig->_exportRules.push_back(ExportRule::only_filename);
+					}
+				}
+			}
+		}
+		else
+		{
+			moduleConfig->_exportRules.push_back(ExportRule::init_to_dir_module);
+		}
+
 	}
 	catch (nlohmann::json::exception& e)
 	{
@@ -92,3 +116,50 @@ ModuleConfig::ModuleConfig()
 	  import_function("require")
 {
 }
+
+std::string ModuleConfig::GetModuleName(std::string_view path)
+{
+	std::string moduleName(path);
+	for (auto& c : moduleName)
+	{
+		if (c == '/' || c == '\\')
+		{
+			c = separator;
+		}
+	}
+
+	for (auto rule : _exportRules)
+	{
+		switch (rule)
+		{
+		case ExportRule::init_to_dir_module:
+			{
+				// .init 特殊规则
+				if (moduleName.ends_with(".init"))
+				{
+					return moduleName.substr(0, moduleName.size() - 5);
+				}
+				break;
+			}
+		case ExportRule::only_filename:
+			{
+				auto dotPosition = moduleName.find_last_of(separator);
+				if (dotPosition == std::string::npos)
+				{
+					return moduleName;
+				}
+				else
+				{
+					return moduleName.substr(dotPosition + 1);
+				}
+				break;
+			}
+		default:
+			{
+				break;
+			}
+		}
+	}
+
+	return moduleName;
+}

CodeFormatServer/src/Service/Indexs/Module.cpp

@@ -41,6 +41,7 @@ void ModuleIndex::SetDefaultModule(std::string workspaceUri)
 	moduleConfig->module_root = workspacePath;
 	moduleConfig->name = "root";
 	moduleConfig->separator = '.';
+	moduleConfig->_exportRules.push_back(ExportRule::init_to_dir_module);
 	_moduleConfigMap[workspacePath] = moduleConfig;
 }
 
@@ -58,19 +59,7 @@ void ModuleIndex::BuildIndex(const std::vector<std::string>& files)
 		auto relativePath = std::filesystem::relative(filePath, config->module_root);
 		std::string modulePath = relativePath.replace_extension("").string();
 
-		for (auto& c : modulePath)
-		{
-			if (c == '/' || c == '\\')
-			{
-				c = config->separator;
-			}
-		}
-
-		// .init 特殊规则
-		if (modulePath.ends_with(".init"))
-		{
-			modulePath = modulePath.substr(0, modulePath.size() - 5);
-		}
+		modulePath = config->GetModuleName(modulePath);
 
 		std::string matchName;
 
@@ -92,7 +81,7 @@ void ModuleIndex::BuildIndex(const std::vector<std::string>& files)
 		// 一些代码喜欢路径带连字符
 		for (auto& c : matchName)
 		{
-			if(c == '-')
+			if (c == '-')
 			{
 				c = '_';
 			}
@@ -135,7 +124,7 @@ void ModuleIndex::RebuildIndex(const std::vector<std::string>& files)
 	BuildIndex(files);
 }
 
-std::vector<std::shared_ptr<ModuleIndex::Module>> ModuleIndex::GetModules(std::string_view filePath)
+std::vector<std::shared_ptr<Module>> ModuleIndex::GetModules(std::string_view filePath)
 {
 	std::vector<std::shared_ptr<Module>> result;
 

CodeFormatServer/src/Service/Indexs/ModuleIndex.cpp

@@ -217,37 +217,60 @@ std::vector<vscode::CompletionItem> ModuleService::GetModuleCompletions(std::sha
 	auto luaModules = _moduleIndex.GetModules(path);
 	auto insertRange = FindRequireRange(parser, config);
 
+	std::map<std::string, std::vector<std::shared_ptr<Module>>> completionMap;
 
 	for (auto& luaModule : luaModules)
 	{
-		auto& completion = result.emplace_back();
+		if(completionMap.count(luaModule->MatchName) == 0)
+		{
+			completionMap.insert({ luaModule->MatchName, { luaModule} });
+		}
+		else
+		{
+			completionMap.at(luaModule->MatchName).push_back(luaModule);
+		}
+	}
 
-		std::string& name = luaModule->MatchName;
+	for (auto pair : completionMap)
+	{
+		auto& completion = result.emplace_back();
+		const std::string& name = pair.first;
 		if (definedNames.count(name) > 0)
 		{
 			continue;
 		}
 
 		completion.label = name;
-		completion.detail = format("({})", luaModule->ModuleName);
-		completion.documentation = format("import from {}", luaModule->FilePath);
 		completion.insertText = name;
 		completion.kind = vscode::CompletionItemKind::Module;
-		// vscode::CompletionItemLabelDetails labelDetail;
-		// labelDetail.detail = completion.detail;
-		// labelDetail.description = completion.detail;
-		// completion.labelDetails = labelDetail;
-
 		vscode::Command command;
 		command.title = completion.detail;
 		command.command = "emmylua.import.me";
 		command.arguments.push_back(uri);
 		command.arguments.push_back(insertRange.Serialize());
-		auto object = nlohmann::json::object();
-		object["moduleName"] = luaModule->ModuleName;
-		object["path"] = luaModule->FilePath;
-		object["name"] = name;
-		command.arguments.push_back(object);
+
+		if (pair.second.size() == 1) {
+			auto& luaModule = pair.second.front();
+			completion.detail = format("({})", name);
+			completion.documentation = format("import from {}", luaModule->FilePath);
+			auto object = nlohmann::json::object();
+			object["moduleName"] = luaModule->ModuleName;
+			object["path"] = luaModule->FilePath;
+			object["name"] = name;
+			command.arguments.push_back(object);
+
+		}
+		else
+		{
+			completion.detail = "import multi choice";
+			for (auto& luaModule : pair.second) {
+				auto object = nlohmann::json::object();
+				object["moduleName"] = luaModule->ModuleName;
+				object["path"] = luaModule->FilePath;
+				object["name"] = name;
+				command.arguments.push_back(object);
+			}
+		}
 		completion.command = command;
 	}
 

CodeFormatServer/src/Service/ModuleService.cpp

@@ -0,0 +1,8 @@
+#pragma once
+
+// 命名保持和lua.module.json一致
+enum class ExportRule
+{
+	init_to_dir_module,
+	only_filename,
+};

include/CodeFormatServer/Service/Indexs/Config/ExportRule.h

@@ -3,6 +3,7 @@
 #include <string>
 #include <vector>
 #include <memory>
+#include "ExportRule.h"
 
 class ModuleConfig
 {
@@ -22,6 +23,9 @@ class ModuleConfig
 	static std::shared_ptr<ModuleConfig> LoadFromFile(std::string_view filePath);
 
 	ModuleConfig();
+
+	std::string GetModuleName(std::string_view path);
+
 	// 配置项采用 snake_case 命名
 
 	std::string name;
@@ -30,4 +34,5 @@ class ModuleConfig
 	char separator;
 	std::string import_function;
 	std::map<std::string, SpecialModule> special_module;
+	std::vector<ExportRule> _exportRules;
 };

include/CodeFormatServer/Service/Indexs/Config/ModuleConfig.h

@@ -0,0 +1,16 @@
+#pragma once
+
+class Module
+{
+public:
+	Module(std::string_view moduleName = "", std::string_view filePath = "", std::string_view matchName = "")
+		: ModuleName(moduleName),
+		FilePath(filePath),
+		MatchName(matchName)
+	{
+	}
+
+	std::string ModuleName;
+	std::string FilePath;
+	std::string MatchName;
+};

include/CodeFormatServer/Service/Indexs/Module.h

@@ -6,25 +6,11 @@
 #include <set>
 #include <memory>
 #include "CodeFormatServer/Service/Indexs/Config/ModuleConfig.h"
+#include "Module.h"
 
 class ModuleIndex
 {
 public:
-	class Module
-	{
-	public:
-		Module(std::string_view moduleName = "", std::string_view filePath = "", std::string_view matchName = "")
-			: ModuleName(moduleName),
-			  FilePath(filePath),
-			  MatchName(matchName)
-		{
-		}
-
-		std::string ModuleName;
-		std::string FilePath;
-		std::string MatchName;
-	};
-
 	ModuleIndex();
 
 	void BuildModule(std::string workspaceUri, std::string_view moduleConfigPath);