优化语言服务

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

@@ -102,13 +102,13 @@ void LanguageClient::UpdateFile(std::string_view uri, vscode::Range range, std::
 	}
 }
 
-void LanguageClient::ReleaseFile(std::string_view uri)
+void LanguageClient::ParseFile(std::string_view uri)
 {
 	auto filename = url::UrlToFilePath(uri);
 	auto it = _fileMap.find(filename);
 	if (it != _fileMap.end())
 	{
-		_fileMap.erase(it);
+		it->second->MakeParser();
 	}
 }
 

CodeFormatServer/src/LanguageService.cpp

@@ -137,7 +137,6 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnDidChange(
 {
 	for (auto& content : param->contentChanges)
 	{
-		// LanguageClient::GetInstance().ReleaseFile(param->textDocument.uri);
 		if (content.range.has_value())
 		{
 			LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, content.range.value(),
@@ -149,15 +148,16 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnDidChange(
 		}
 	}
 
+	LanguageClient::GetInstance().ParseFile(param->textDocument.uri);
 	LanguageClient::GetInstance().DiagnosticFile(param->textDocument.uri);
 	return nullptr;
 }
 
 std::shared_ptr<vscode::Serializable> LanguageService::OnDidOpen(
 	std::shared_ptr<vscode::DidOpenTextDocumentParams> param)
 {
-	// LanguageClient::GetInstance().ReleaseFile(param->textDocument.uri);
 	LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, {}, std::move(param->textDocument.text));
+	LanguageClient::GetInstance().ParseFile(param->textDocument.uri);
 	LanguageClient::GetInstance().DiagnosticFile(param->textDocument.uri);
 	return nullptr;
 }
@@ -199,7 +199,7 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnFormatting(
 std::shared_ptr<vscode::Serializable> LanguageService::OnClose(
 	std::shared_ptr<vscode::DidCloseTextDocumentParams> param)
 {
-	LanguageClient::GetInstance().ReleaseFile(param->textDocument.uri);
+	LanguageClient::GetInstance().ParseFile(param->textDocument.uri);
 
 	return nullptr;
 }

CodeFormatServer/src/VirtualFile/VirtualFile.cpp

@@ -15,44 +15,42 @@ void VirtualFile::UpdateFile(vscode::Range range, std::string&& content)
 		return UpdateFile(std::move(content));
 	}
 
+	std::string text;
+	text.swap(_luaFile->GetSource());
 	auto startOffset = _luaFile->GetOffsetFromPosition(range.start.line, range.start.character);
 	auto endOffset = _luaFile->GetOffsetFromPosition(range.end.line, range.end.character);
-	auto oldSize = _text.size();
+	auto oldSize = text.size();
 	auto newSize = oldSize + (content.size() - (endOffset - startOffset));
-	if (newSize > _text.capacity())
+	if (newSize > text.capacity())
 	{
 		auto suitableCapacity = newSize + 4096;
-		_text.reserve(suitableCapacity);
+		text.reserve(suitableCapacity);
 	}
 
 	if(newSize > oldSize)
 	{
-		_text.resize(newSize);
-		std::copy_backward(_text.begin() + endOffset, _text.begin() + oldSize, _text.end());
-		std::copy(content.begin(), content.end(), _text.begin() + startOffset);
+		text.resize(newSize);
+		std::copy_backward(text.begin() + endOffset, text.begin() + oldSize, text.end());
+		std::copy(content.begin(), content.end(), text.begin() + startOffset);
 	}
 	else
 	{
-		std::copy(_text.begin() + endOffset, _text.end(), _text.begin() + startOffset + content.size());
+		std::copy(text.begin() + endOffset, text.end(), text.begin() + startOffset + content.size());
 		if(content.size() > 0)
 		{
-			std::copy(content.begin(), content.end(), _text.begin() + startOffset);
+			std::copy(content.begin(), content.end(), text.begin() + startOffset);
 		}
-		_text.resize(newSize);
+		text.resize(newSize);
 	}
 
-	std::string fileText = _text;
 	_luaFile = std::make_shared<LuaFile>(std::filesystem::path(url::UrlToFilePath(_fileUri)).filename().string(),
-	                                     std::move(fileText));
-	MakeParser();
+	                                     std::move(text));
 }
 
 void VirtualFile::UpdateFile(std::string&& text)
 {
-	_text = text;
 	_luaFile = std::make_shared<LuaFile>(std::filesystem::path(url::UrlToFilePath(_fileUri)).filename().string(),
 	                                     std::move(text));
-	MakeParser();
 }
 
 void VirtualFile::Reset()

include/CodeFormatServer/VirtualFile/VirtualFile.h

@@ -16,11 +16,11 @@ class VirtualFile
 	void Reset();
 
 	std::shared_ptr<LuaParser> GetLuaParser();
-private:
+
 	void MakeParser();
+private:
 
 	std::string _fileUri;
-	std::string _text;
 	std::shared_ptr<LuaFile> _luaFile;
 	std::shared_ptr<LuaParser> _luaParser;
 

include/LuaParser/LuaFile.h

@@ -21,7 +21,7 @@ class LuaFile
 
 	void PushLine(int offset);
 
-	std::string_view GetSource();
+	std::string& GetSource();
 
 	void SetTotalLine(int line);