修改

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/src/LanguageClient.cpp

@@ -219,6 +219,7 @@ void LanguageClient::UpdateAllDiagnosis()
 	finder.AddIgnoreDirectory(".vscode");
 
 	finder.AddFindExtension(".lua");
+	finder.AddFindExtension(".lua.txt");
 
 	GetService<ModuleService>()->RebuildIndexs(finder.FindFiles());
 

CodeFormatServer/src/LanguageService.cpp

@@ -107,7 +107,6 @@ std::shared_ptr<vscode::InitializeResult> LanguageService::OnInitialize(std::sha
 	}
 
 	LanguageClient::GetInstance().SetRoot(param->rootPath);
-
 	return result;
 }
 
@@ -305,11 +304,12 @@ std::shared_ptr<vscode::CodeActionResult> LanguageService::OnCodeAction(std::sha
 			auto object = nlohmann::json::object();
 			object["moduleName"] = module.ModuleName;
 			object["path"] = module.FilePath;
+			object["name"] = module.Name;
 			action.command.arguments.push_back(object);
 		}
 
 		action.kind = vscode::CodeActionKind::QuickFix;
-	}
+	} 
 	return codeActionResult;
 }
 
@@ -360,7 +360,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnExecuteCommand(
 	}
 	else if (param->command == "emmylua.import.me")
 	{
-		if (param->arguments.size() < 3)
+		if (param->arguments.size() < 4)
 		{
 			return result;
 		}
@@ -372,16 +372,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnExecuteCommand(
 
 		std::string moduleName = param->arguments[2];
 		auto pos = moduleName.find_last_of('.');
-		std::string moduleDefineName;
-
-		if (pos == std::string_view::npos)
-		{
-			moduleDefineName = moduleName;
-		}
-		else
-		{
-			moduleDefineName = moduleName.substr(pos + 1);
-		}
+		std::string moduleDefineName = param->arguments[3];
 
 		std::string requireString = format("local {} = require(\"{}\")\n", moduleDefineName, moduleName);
 		auto parser = LanguageClient::GetInstance().GetFileParser(uri);
@@ -391,14 +382,10 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnExecuteCommand(
 		auto& change = it.first->second;
 
 		auto& edit = change.emplace_back();
-		LuaFormatRange formattedRange(static_cast<int>(range.start.line), static_cast<int>(range.end.line));
 
 		edit.newText = requireString;
 
-		edit.range = vscode::Range(
-			vscode::Position(formattedRange.StartLine, formattedRange.StartCharacter),
-			vscode::Position(formattedRange.EndLine + 1, formattedRange.EndCharacter)
-		);
+		edit.range = LanguageClient::GetInstance().GetService<ModuleService>()->FindRequireRange(parser);
 
 		LanguageClient::GetInstance().SendRequest("workspace/applyEdit", applyParams);
 	}

CodeFormatServer/src/Service/CodeFormatService.cpp

@@ -62,8 +62,21 @@ bool CodeFormatService::IsDiagnosticRange(std::string_view filePath, vscode::Ran
 	}
 
 	auto& diagnosticSet = it->second;
-
-	return diagnosticSet.count(range) > 0;
+	if(range.start == range.end)
+	{
+		for(auto& validRange: diagnosticSet)
+		{
+			if(validRange.start <= range.start && validRange.end >= range.end)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	else
+	{
+		return diagnosticSet.count(range) > 0;
+	}
 }
 
 std::string CodeFormatService::RangeFormat(LuaFormatRange& range,

CodeFormatServer/src/Service/ModuleService.cpp

@@ -1,5 +1,6 @@
-#include "CodeFormatServer/Service/ModuleService.h"
+#include "CodeFormatServer/Service/ModuleService.h"
 #include "LuaParser/LuaAstVisitor.h"
+#include "Util/StringUtil.h"
 
 class UnResolveModuleFinder : public LuaAstVisitor
 {
@@ -153,7 +154,7 @@ std::vector<vscode::Diagnostic> ModuleService::Diagnose(std::string_view filePat
 	auto& undefinedModules = finder.GetUndefinedModule(parser);
 	auto& luaModules = _moduleIndex.GetModules(options);
 
-	std::multimap<vscode::Range, ModuleIndex::Module> rangeModule;
+	std::multimap<vscode::Range, LuaModule> rangeModule;
 	for (auto& undefinedModule : undefinedModules)
 	{
 		auto undefinedModuleName = undefinedModule->GetText();
@@ -171,10 +172,10 @@ std::vector<vscode::Diagnostic> ModuleService::Diagnose(std::string_view filePat
 				name = luaModule.ModuleName.substr(dotPosition + 1);
 			}
 
-			if (undefinedModuleName == name)
+			if (StringUtil::IsStringEqualIgnoreCase(undefinedModuleName, name))
 			{
 				auto& diagnostic = result.emplace_back();
-				diagnostic.message = "not import module";
+				diagnostic.message = "need import module";
 				auto textRange = undefinedModule->GetTextRange();
 				auto range = vscode::Range(
 					vscode::Position(
@@ -186,9 +187,17 @@ std::vector<vscode::Diagnostic> ModuleService::Diagnose(std::string_view filePat
 						parser->GetColumn(textRange.EndOffset)
 					)
 				);
-				rangeModule.insert({range, luaModule});
+
+				rangeModule.insert({
+					range, LuaModule{
+						.ModuleName = luaModule.ModuleName,
+						.FilePath = luaModule.FilePath,
+						.Name = std::string(undefinedModuleName)
+					}
+				});
+
 				diagnostic.range = range;
-				diagnostic.severity = vscode::DiagnosticSeverity::Information;
+				diagnostic.severity = vscode::DiagnosticSeverity::Hint;
 			}
 		}
 	}
@@ -214,25 +223,53 @@ bool ModuleService::IsDiagnosticRange(std::string_view filePath, vscode::Range r
 		return false;
 	}
 
-	return it->second.count(range) > 0;
+	if (range.start == range.end)
+	{
+		for (auto& pair : it->second)
+		{
+			if (pair.first.start <= range.start && pair.first.end >= range.end)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	else
+	{
+		return it->second.count(range) > 0;
+	}
 }
 
-std::vector<ModuleIndex::Module> ModuleService::GetImportModules(std::string_view filePath, vscode::Range range)
+std::vector<ModuleService::LuaModule> ModuleService::GetImportModules(std::string_view filePath, vscode::Range range)
 {
 	auto fIt = _diagnosticCaches.find(filePath);
 	if (fIt == _diagnosticCaches.end())
 	{
 		return {};
 	}
 
+	std::vector<LuaModule> result;
 	auto& rangeModules = fIt->second;
-	auto equalRange = rangeModules.equal_range(range);
-	std::vector<ModuleIndex::Module> result;
-	for (auto it = equalRange.first; it != equalRange.second; ++it)
+
+	if (range.start == range.end)
 	{
-		result.emplace_back(it->second);
+		for (auto& pair : rangeModules)
+		{
+			if (pair.first.start <= range.start && pair.first.end >= range.end)
+			{
+				result.push_back(pair.second);
+			}
+		}
 	}
+	else
+	{
+		auto itPair = rangeModules.equal_range(range);
 
+		for (auto it = itPair.first; it != itPair.second; it++)
+		{
+			result.push_back(it->second);
+		}
+	}
 	return result;
 }
 
@@ -271,7 +308,7 @@ vscode::Range ModuleService::FindRequireRange(std::shared_ptr<LuaParser> parser)
 						auto callExpression = expression->FindFirstOf(LuaAstNodeType::CallExpression);
 						if (callExpression)
 						{
-							// ½«Ô¼¶¨×ö³É¹æ·¶
+							// 将约定做成规范
 							auto methodNameNode = callExpression->FindFirstOf(LuaAstNodeType::PrimaryExpression);
 							if (methodNameNode)
 							{
@@ -287,7 +324,7 @@ vscode::Range ModuleService::FindRequireRange(std::shared_ptr<LuaParser> parser)
 			}
 		default:
 			{
-				break;
+				goto endLoop;
 			}
 		}
 		lastNode = statement;

Util/src/StringUtil.cpp

@@ -1,4 +1,5 @@
 #include "Util/StringUtil.h"
+#include <cstdlib>
 
 std::vector<std::string_view> StringUtil::Split(std::string_view source, std::string_view separator)
 {
@@ -86,3 +87,19 @@ std::string StringUtil::Replace(std::string_view source, std::string_view oldStr
 
 	return result;
 }
+
+bool StringUtil::IsStringEqualIgnoreCase(std::string_view lhs, std::string_view rhs)
+{
+	if(lhs.size() != rhs.size())
+	{
+		return false;
+	}
+	for(std::size_t i = 0;i!=lhs.size();i++)
+	{
+		if(::tolower(lhs[i]) != ::tolower(rhs[i]))
+		{
+			return false;
+		}
+	}
+	return true;
+}

include/CodeFormatServer/Service/ModuleService.h

@@ -16,6 +16,14 @@ class ModuleService : public Service
 public:
 	LANGUAGE_SERVICE(ModuleService);
 
+	class LuaModule
+	{
+	public:
+		std::string ModuleName;
+		std::string FilePath;
+		std::string Name;
+	};
+
 	explicit ModuleService(std::shared_ptr<LanguageClient> owner);
 
 	std::vector<vscode::Diagnostic> Diagnose(std::string_view filePath, std::shared_ptr<LuaParser> parser,
@@ -24,11 +32,11 @@ class ModuleService : public Service
 
 	void RebuildIndexs(std::vector<std::string> files);
 	bool IsDiagnosticRange(std::string_view filePath, vscode::Range range);
-	std::vector<ModuleIndex::Module> GetImportModules(std::string_view filePath, vscode::Range range);
+	std::vector<LuaModule> GetImportModules(std::string_view filePath, vscode::Range range);
 
 	vscode::Range FindRequireRange(std::shared_ptr<LuaParser> parser);
 
 private:
 	ModuleIndex _moduleIndex;
-	std::map<std::string, std::multimap<vscode::Range, ModuleIndex::Module>, std::less<>> _diagnosticCaches;
+	std::map<std::string, std::multimap<vscode::Range, LuaModule>, std::less<>> _diagnosticCaches;
 };