修复代码补全未出现的问题

Author: CppCXY

CodeFormatServer/src/LanguageService.cpp

@@ -80,6 +80,7 @@ std::shared_ptr<vscode::InitializeResult> LanguageService::OnInitialize(std::sha
 
 	result->capabilities.completionProvider.resolveProvider = false;
 	result->capabilities.completionProvider.triggerCharacters = {};
+	result->capabilities.completionProvider.completionItem.labelDetailsSupport = true;
 
 	auto& editorConfigFiles = param->initializationOptions.editorConfigFiles;
 	for (auto& configFile : editorConfigFiles)

CodeFormatServer/src/Service/CompletionService.cpp

@@ -57,7 +57,7 @@ std::shared_ptr<LuaAstNode> CompletionService::FindAstFromPosition(vscode::Posit
 {
 	auto ast = parser->GetAst();
 	auto luaFile = parser->GetLuaFile();
-	auto offset = luaFile->GetOffsetFromPosition(position.line, position.character);
+	auto offset = luaFile->GetOffsetFromPosition(position.line, position.character > 0 ? position.character - 1 : 0);
 
 	auto textOffset = TextRange(offset, offset);
 	while (true)

CodeFormatServer/src/Service/ModuleService.cpp

@@ -254,7 +254,7 @@ std::vector<vscode::CompletionItem> ModuleService::GetModuleCompletions(std::sha
 		command.command = "emmylua.import.me";
 		command.arguments.push_back(uri);
 		command.arguments.push_back(insertRange.Serialize());
-
+		vscode::CompletionItemLabelDetails labelDetails;
 		if (pair.second.size() == 1)
 		{
 			auto& luaModule = pair.second.front();
@@ -265,6 +265,8 @@ std::vector<vscode::CompletionItem> ModuleService::GetModuleCompletions(std::sha
 			object["path"] = luaModule->FilePath;
 			object["name"] = name;
 			command.arguments.push_back(object);
+			labelDetails.detail = format("[{}]", luaModule->ModuleName);
+			labelDetails.description = format("[{}]", luaModule->ModuleName);
 		}
 		else
 		{
@@ -277,8 +279,11 @@ std::vector<vscode::CompletionItem> ModuleService::GetModuleCompletions(std::sha
 				object["name"] = name;
 				command.arguments.push_back(object);
 			}
+			labelDetails.detail = format("[{}]", completion.detail);
+			labelDetails.description = format("[{}]", completion.detail);
 		}
 		completion.command = command;
+		completion.labelDetails = labelDetails;
 	}
 
 	return result;

CodeFormatServer/src/Session/IOSession.cpp

@@ -43,14 +43,15 @@ std::string IOSession::Handle(std::shared_ptr<ProtocolParser> parser)
 		{
 			auto start = chrono::system_clock::now();
 			auto result = _service.Dispatch(parser->GetMethod(), params);
+			std::cerr << format("request {}, it cost: {}ms\n", parser->GetMethod(),
+				chrono::duration_cast<chrono::milliseconds>(
+					chrono::system_clock::now() - start
+					).count());
 			if (result)
 			{
 				return parser->SerializeProtocol(result);
 			}
-			// std::cerr << format("request {}, it cost: {}ms\n", parser->GetMethod(),
-			//                     chrono::duration_cast<chrono::milliseconds>(
-			// 	                    chrono::system_clock::now() - start
-			//                     ).count());
+
 		}
 	}
 	catch (std::exception& e)

CodeFormatServer/src/VSCode.cpp

@@ -343,12 +343,20 @@ nlohmann::json vscode::ExecuteCommandOptions::Serialize()
 	return object;
 }
 
+nlohmann::json vscode::CompletionItemOptions::Serialize()
+{
+	auto object = nlohmann::json::object();
+
+	object["labelDetailsSupport"] = labelDetailsSupport;
+	return object;
+}
+
 nlohmann::json vscode::CompletionOptions::Serialize()
 {
 	auto object = nlohmann::json::object();
 	object["triggerCharacters"] = SerializeArray(triggerCharacters);
 	object["resolveProvider"] = resolveProvider;
-
+	object["completionItem"] = completionItem.Serialize();
 	return object;
 }
 

include/CodeFormatServer/VSCode.h

@@ -206,11 +206,20 @@ class ExecuteCommandOptions : public Serializable
 	nlohmann::json Serialize() override;
 };
 
+class CompletionItemOptions : public Serializable
+{
+public:
+	bool labelDetailsSupport = true;
+
+	nlohmann::json Serialize() override;
+};
+
 class CompletionOptions : public Serializable
 {
 public:
 	std::vector<std::string> triggerCharacters;
 	bool resolveProvider;
+	CompletionItemOptions completionItem;
 
 	nlohmann::json Serialize() override;
 };