兼容一些写法

Author: CppCXY

CodeFormatServer/src/LanguageService.cpp

@@ -426,7 +426,6 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnExecuteCommand(
 		std::string requireString = format("local {} = {}(\"{}\")\n", moduleDefineName, config->import_function,
 		                                   moduleName);
 		auto parser = LanguageClient::GetInstance().GetFileParser(uri);
-
 		auto applyParams = std::make_shared<vscode::ApplyWorkspaceEditParams>();
 		auto it = applyParams->edit.changes.emplace(uri, std::vector<vscode::TextEdit>());
 		auto& change = it.first->second;
@@ -435,7 +434,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnExecuteCommand(
 
 		edit.newText = requireString;
 
-		edit.range = LanguageClient::GetInstance().GetService<ModuleService>()->FindRequireRange(parser);
+		edit.range = LanguageClient::GetInstance().GetService<ModuleService>()->FindRequireRange(parser, config);
 
 		LanguageClient::GetInstance().SendRequest("workspace/applyEdit", applyParams);
 	}

CodeFormatServer/src/Service/CodeFormatService.cpp

@@ -8,8 +8,8 @@ CodeFormatService::CodeFormatService(std::shared_ptr<LanguageClient> owner)
 }
 
 std::vector<vscode::Diagnostic> CodeFormatService::Diagnose(std::string_view filePath,
-                                                             std::shared_ptr<LuaParser> parser,
-                                                             std::shared_ptr<LuaCodeStyleOptions> options)
+                                                            std::shared_ptr<LuaParser> parser,
+                                                            std::shared_ptr<LuaCodeStyleOptions> options)
 {
 	LuaFormatter formatter(parser, *options);
 	formatter.BuildFormattedElement();
@@ -62,11 +62,11 @@ bool CodeFormatService::IsDiagnosticRange(std::string_view filePath, vscode::Ran
 	}
 
 	auto& diagnosticSet = it->second;
-	if(range.start == range.end)
+	if (range.start == range.end)
 	{
-		for(auto& validRange: diagnosticSet)
+		for (auto& validRange : diagnosticSet)
 		{
-			if(validRange.start <= range.start && validRange.end >= range.end)
+			if (validRange.start <= range.start && validRange.end >= range.end)
 			{
 				return true;
 			}

CodeFormatServer/src/Service/Indexs/ModuleIndex.cpp

@@ -41,6 +41,7 @@ void ModuleIndex::SetDefaultModule(std::string workspaceUri)
 	moduleConfig->module_root = workspacePath;
 	moduleConfig->name = "root";
 	moduleConfig->separator = '.';
+	_moduleConfigMap[workspacePath] = moduleConfig;
 }
 
 void ModuleIndex::BuildIndex(const std::vector<std::string>& files)
@@ -65,13 +66,12 @@ void ModuleIndex::BuildIndex(const std::vector<std::string>& files)
 			}
 		}
 
+		// .init 特殊规则
 		if (modulePath.ends_with(".init"))
 		{
 			modulePath = modulePath.substr(0, modulePath.size() - 5);
 		}
 
-
-
 		std::string matchName;
 
 		auto dotPosition = modulePath.find_last_of(config->separator);
@@ -89,9 +89,18 @@ void ModuleIndex::BuildIndex(const std::vector<std::string>& files)
 			matchName = config->special_module.at(modulePath).Name;
 		}
 
+		// 一些代码喜欢路径带连字符
+		for (auto& c : matchName)
+		{
+			if(c == '-')
+			{
+				c = '_';
+			}
+		}
+
 		if (_moduleIndex.count(config->name) == 0)
 		{
-			_moduleIndex.insert({ config->name, std::vector<std::shared_ptr<Module>>() });
+			_moduleIndex.insert({config->name, std::vector<std::shared_ptr<Module>>()});
 		}
 
 		_moduleIndex.at(config->name).push_back(std::make_shared<Module>(modulePath, filePath, matchName));

CodeFormatServer/src/Service/ModuleService.cpp

@@ -117,7 +117,7 @@ std::vector<ModuleService::LuaModule> ModuleService::GetImportModules(std::strin
 	return result;
 }
 
-vscode::Range ModuleService::FindRequireRange(std::shared_ptr<LuaParser> parser)
+vscode::Range ModuleService::FindRequireRange(std::shared_ptr<LuaParser> parser, std::shared_ptr<ModuleConfig> config)
 {
 	vscode::Range range;
 	auto chunkAst = parser->GetAst();
@@ -156,7 +156,20 @@ vscode::Range ModuleService::FindRequireRange(std::shared_ptr<LuaParser> parser)
 							auto methodNameNode = callExpression->FindFirstOf(LuaAstNodeType::PrimaryExpression);
 							if (methodNameNode)
 							{
-								if (methodNameNode->GetText() == "require")
+								if (methodNameNode->GetText() == config->import_function)
+								{
+									break;
+								}
+							}
+						}
+							// 一些代码会有 local require = require的规则, 勉为其难支持一下
+						else
+						{
+							auto primary = expression->FindFirstOf(LuaAstNodeType::PrimaryExpression);
+							if (primary)
+							{
+								auto nameIdentify = primary->FindFirstOf(LuaAstNodeType::NameIdentify);
+								if (nameIdentify && nameIdentify->GetText() == config->import_function)
 								{
 									break;
 								}
@@ -200,17 +213,17 @@ std::vector<vscode::CompletionItem> ModuleService::GetModuleCompletions(std::sha
 	finder.Analysis(parser);
 
 	auto definedNames = finder.GetDefinedName(expression);
-
+	auto config = _moduleIndex.GetConfig(path);
 	auto luaModules = _moduleIndex.GetModules(path);
-	auto insertRange = FindRequireRange(parser);
+	auto insertRange = FindRequireRange(parser, config);
 
 
 	for (auto& luaModule : luaModules)
 	{
 		auto& completion = result.emplace_back();
 
 		std::string& name = luaModule->MatchName;
-		if(definedNames.count(name) > 0)
+		if (definedNames.count(name) > 0)
 		{
 			continue;
 		}

include/CodeFormatServer/Service/ModuleService.h

@@ -32,7 +32,7 @@ class ModuleService : public Service
 
 	std::vector<LuaModule> GetImportModules(std::string_view filePath, vscode::Range range);
 
-	vscode::Range FindRequireRange(std::shared_ptr<LuaParser> parser);
+	vscode::Range FindRequireRange(std::shared_ptr<LuaParser> parser, std::shared_ptr<ModuleConfig> config);
 
 	ModuleIndex& GetIndex();