实现增量更新，但是性能低一半，有待优化

CppCXY · CppCXY · commit e566f95966d1 · 2022-01-13T14:27:01.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -29,5 +29,4 @@
 
 .vs
 out
-CMakeSettings.json
 3rd/uriparser/src/config.h
diff --git a/3rd/uriparser/src/config.h b/3rd/uriparser/src/config.h
@@ -43,7 +43,7 @@
 
 #define PACKAGE_VERSION "0.9.5"
 
-#define HAVE_WPRINTF
+/* #undef HAVE_WPRINTF */
 /* #undef HAVE_REALLOCARRAY */
 
 
diff --git a/CodeFormatServer/src/LanguageClient.cpp b/CodeFormatServer/src/LanguageClient.cpp
@@ -96,12 +96,26 @@ void LanguageClient::UpdateFile(std::string_view uri, vscode::Range range, std::
 		virtualFile->UpdateFile(std::move(text));
 		_fileMap[filename] = virtualFile;
 	}
+	else if(range.start.line == -1)
+	{
+		it->second->UpdateFile(std::move(text));
+	}
 	else
 	{
 		it->second->UpdateFile(range, std::move(text));
 	}
 }
 
+void LanguageClient::UpdateFile(std::string_view uri, std::vector<vscode::TextDocumentContentChangeEvent>& changeEvent)
+{
+	auto filename = url::UrlToFilePath(uri);
+	auto it = _fileMap.find(filename);
+	if (it != _fileMap.end())
+	{
+		it->second->UpdateFile(changeEvent);
+	}
+}
+
 void LanguageClient::ParseFile(std::string_view uri)
 {
 	auto filename = url::UrlToFilePath(uri);
diff --git a/CodeFormatServer/src/LanguageService.cpp b/CodeFormatServer/src/LanguageService.cpp
@@ -135,18 +135,25 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnInitialized(std::shared
 std::shared_ptr<vscode::Serializable> LanguageService::OnDidChange(
 	std::shared_ptr<vscode::DidChangeTextDocumentParams> param)
 {
-	for (auto& content : param->contentChanges)
+	if (param->contentChanges.size() == 1)
 	{
+		auto& content = param->contentChanges.front();
 		if (content.range.has_value())
 		{
 			LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, content.range.value(),
 			                                         std::move(content.text));
 		}
 		else
 		{
-			LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, {}, std::move(content.text));
+			LanguageClient::GetInstance().UpdateFile(param->textDocument.uri,
+			                                         {vscode::Position(-1, 0), vscode::Position(-1, 0)},
+			                                         std::move(content.text));
 		}
 	}
+	else
+	{
+		LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, param->contentChanges);
+	}
 
 	LanguageClient::GetInstance().ParseFile(param->textDocument.uri);
 	LanguageClient::GetInstance().DiagnosticFile(param->textDocument.uri);
diff --git a/CodeFormatServer/src/Session/IOSession.cpp b/CodeFormatServer/src/Session/IOSession.cpp
@@ -2,6 +2,10 @@
 #include <iostream>
 #include <nlohmann/json.hpp>
 #include "CodeFormatServer/Protocol/ProtocolParser.h"
+#include <chrono>
+#include "Util/format.h"
+
+namespace chrono = std::chrono;
 
 IOSession::IOSession()
 	: _protocolBuffer(65535)
@@ -29,11 +33,15 @@ std::string IOSession::Handle(std::string_view msg)
 
 		if (!params.is_null())
 		{
+			auto start = chrono::system_clock::now();
 			auto result = _service.Dispatch(parser.GetMethod(), params);
 			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)
diff --git a/CodeFormatServer/src/Session/SocketIOSession.cpp b/CodeFormatServer/src/Session/SocketIOSession.cpp
@@ -39,7 +39,6 @@ void SocketIOSession::Run()
 
 		do {
 			auto content = _protocolBuffer.ReadOneProtocol();
-			// std::cout << content << std::endl;
 			std::string result = Handle(content);
 
 			_protocolBuffer.Reset();
diff --git a/CodeFormatServer/src/VirtualFile/VirtualFile.cpp b/CodeFormatServer/src/VirtualFile/VirtualFile.cpp
@@ -15,10 +15,11 @@ void VirtualFile::UpdateFile(vscode::Range range, std::string&& content)
 		return UpdateFile(std::move(content));
 	}
 
-	std::string text;
-	text.swap(_luaFile->GetSource());
+	std::string& text = _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 newSize = oldSize + (content.size() - (endOffset - startOffset));
 	if (newSize > text.capacity())
@@ -27,7 +28,7 @@ void VirtualFile::UpdateFile(vscode::Range range, std::string&& content)
 		text.reserve(suitableCapacity);
 	}
 
-	if(newSize > oldSize)
+	if (newSize > oldSize)
 	{
 		text.resize(newSize);
 		std::copy_backward(text.begin() + endOffset, text.begin() + oldSize, text.end());
@@ -36,7 +37,7 @@ void VirtualFile::UpdateFile(vscode::Range range, std::string&& content)
 	else
 	{
 		std::copy(text.begin() + endOffset, text.end(), text.begin() + startOffset + content.size());
-		if(content.size() > 0)
+		if (content.size() > 0)
 		{
 			std::copy(content.begin(), content.end(), text.begin() + startOffset);
 		}
@@ -47,6 +48,65 @@ void VirtualFile::UpdateFile(vscode::Range range, std::string&& content)
 	                                     std::move(text));
 }
 
+void VirtualFile::UpdateFile(std::vector<vscode::TextDocumentContentChangeEvent>& changeEvent)
+{
+	if (_luaFile == nullptr)
+	{
+		return;
+	}
+
+	std::string text;
+	int64_t totalSize = static_cast<int64_t>(_luaFile->GetSource().size());
+	std::vector<std::pair<TextRange, std::string>> textChanges;
+	for (auto& change : changeEvent)
+	{
+		if (!change.range.has_value())
+		{
+			return;
+		}
+		auto range = change.range.value();
+		auto& content = change.text;
+		auto startOffset = _luaFile->GetOffsetFromPosition(range.start.line, range.start.character);
+		auto endOffset = _luaFile->GetOffsetFromPosition(range.end.line, range.end.character);
+		textChanges.emplace_back(TextRange{startOffset, endOffset}, std::move(content));
+		totalSize += content.size() - (endOffset - startOffset);
+	}
+
+	std::stable_sort(textChanges.begin(), textChanges.end(), [](auto& x, auto& y)->bool
+		{
+			return x.first.StartOffset < y.first.StartOffset;
+		});
+
+	if (totalSize > 0)
+	{
+		auto& source = _luaFile->GetSource();
+		text.reserve(totalSize);
+		std::size_t start = 0;
+		for (std::size_t index = 0; index != textChanges.size(); index++)
+		{
+			auto textRange = textChanges[index].first;
+			if (start < textRange.StartOffset)
+			{
+				text.append(source.begin() + start, source.begin() + textRange.StartOffset);
+			}
+
+			auto& content = textChanges[index].second;
+
+			text.append(content);
+
+			start = textChanges[index].first.EndOffset;
+		}
+
+		if (start < source.size())
+		{
+			text.append(source.begin() + start, source.end());
+		}
+	}
+
+	_luaFile = std::make_shared<LuaFile>(std::filesystem::path(url::UrlToFilePath(_fileUri)).filename().string(),
+	                                     std::move(text));
+}
+
 void VirtualFile::UpdateFile(std::string&& text)
 {
 	_luaFile = std::make_shared<LuaFile>(std::filesystem::path(url::UrlToFilePath(_fileUri)).filename().string(),
diff --git a/LuaParser/src/LuaFile.cpp b/LuaParser/src/LuaFile.cpp
@@ -126,7 +126,7 @@ void LuaFile::PushLine(int offset)
 	_lineOffsetVec.push_back(offset);
 }
 
-std::string_view LuaFile::GetSource()
+std::string& LuaFile::GetSource()
 {
 	return _source;
 }
diff --git a/include/CodeFormatServer/LanguageClient.h b/include/CodeFormatServer/LanguageClient.h
@@ -37,7 +37,9 @@ class LanguageClient: public std::enable_shared_from_this<LanguageClient>
 
 	void UpdateFile(std::string_view uri, vscode::Range range, std::string&& text);
 
-	void ReleaseFile(std::string_view uri);
+	void UpdateFile(std::string_view uri, std::vector<vscode::TextDocumentContentChangeEvent>& changeEvent);
+
+	void ParseFile(std::string_view uri);
 
 	void DiagnosticFile(std::string_view uri);
 
diff --git a/include/CodeFormatServer/VirtualFile/VirtualFile.h b/include/CodeFormatServer/VirtualFile/VirtualFile.h
@@ -11,6 +11,8 @@ class VirtualFile
 
 	void UpdateFile(vscode::Range range, std::string&& content);
 
+	void UpdateFile(std::vector<vscode::TextDocumentContentChangeEvent>& changeEvent);
+
 	void UpdateFile(std::string&& text);
 
 	void Reset();
@@ -20,6 +22,7 @@ class VirtualFile
 	void MakeParser();
 private:
 
+
 	std::string _fileUri;
 	std::shared_ptr<LuaFile> _luaFile;
 	std::shared_ptr<LuaParser> _luaParser;

Original file line number	Diff line number	Diff line change
`@@ -96,12 +96,26 @@ void LanguageClient::UpdateFile(std::string_view uri, vscode::Range range, std::`
`96`	`96`	`virtualFile->UpdateFile(std::move(text));`
`97`	`97`	`_fileMap[filename] = virtualFile;`
`98`	`98`	`}`
	`99`	`+ else if(range.start.line == -1)`
	`100`	`+ {`
	`101`	`+ it->second->UpdateFile(std::move(text));`
	`102`	`+ }`
`99`	`103`	`else`
`100`	`104`	`{`
`101`	`105`	`it->second->UpdateFile(range, std::move(text));`
`102`	`106`	`}`
`103`	`107`	`}`
`104`	`108`
	`109`	`+void LanguageClient::UpdateFile(std::string_view uri, std::vector<vscode::TextDocumentContentChangeEvent>& changeEvent)`
	`110`	`+{`
	`111`	`+ auto filename = url::UrlToFilePath(uri);`
	`112`	`+ auto it = _fileMap.find(filename);`
	`113`	`+ if (it != _fileMap.end())`
	`114`	`+ {`
	`115`	`+ it->second->UpdateFile(changeEvent);`
	`116`	`+ }`
	`117`	`+}`
	`118`	`+`
`105`	`119`	`void LanguageClient::ParseFile(std::string_view uri)`
`106`	`120`	`{`
`107`	`121`	`auto filename = url::UrlToFilePath(uri);`
Original file line number	Diff line number	Diff line change
`@@ -135,18 +135,25 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnInitialized(std::shared`
`135`	`135`	`std::shared_ptr<vscode::Serializable> LanguageService::OnDidChange(`
`136`	`136`	`std::shared_ptr<vscode::DidChangeTextDocumentParams> param)`
`137`	`137`	`{`
`138`		`- for (auto& content : param->contentChanges)`
	`138`	`+ if (param->contentChanges.size() == 1)`
`139`	`139`	`{`
	`140`	`+ auto& content = param->contentChanges.front();`
`140`	`141`	`if (content.range.has_value())`
`141`	`142`	`{`
`142`	`143`	`LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, content.range.value(),`
`143`	`144`	`std::move(content.text));`
`144`	`145`	`}`
`145`	`146`	`else`
`146`	`147`	`{`
`147`		`- LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, {}, std::move(content.text));`
	`148`	`+ LanguageClient::GetInstance().UpdateFile(param->textDocument.uri,`
	`149`	`+ {vscode::Position(-1, 0), vscode::Position(-1, 0)},`
	`150`	`+ std::move(content.text));`
`148`	`151`	`}`
`149`	`152`	`}`
	`153`	`+ else`
	`154`	`+ {`
	`155`	`+ LanguageClient::GetInstance().UpdateFile(param->textDocument.uri, param->contentChanges);`
	`156`	`+ }`
`150`	`157`
`151`	`158`	`LanguageClient::GetInstance().ParseFile(param->textDocument.uri);`
`152`	`159`	`LanguageClient::GetInstance().DiagnosticFile(param->textDocument.uri);`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@`
`2`	`2`	`#include <iostream>`
`3`	`3`	`#include <nlohmann/json.hpp>`
`4`	`4`	`#include "CodeFormatServer/Protocol/ProtocolParser.h"`
	`5`	`+#include <chrono>`
	`6`	`+#include "Util/format.h"`
	`7`	`+`
	`8`	`+namespace chrono = std::chrono;`
`5`	`9`
`6`	`10`	`IOSession::IOSession()`
`7`	`11`	`: _protocolBuffer(65535)`
`@@ -29,11 +33,15 @@ std::string IOSession::Handle(std::string_view msg)`
`29`	`33`
`30`	`34`	`if (!params.is_null())`
`31`	`35`	`{`
	`36`	`+ auto start = chrono::system_clock::now();`
`32`	`37`	`auto result = _service.Dispatch(parser.GetMethod(), params);`
`33`	`38`	`if (result)`
`34`	`39`	`{`
`35`	`40`	`return parser.SerializeProtocol(result);`
`36`	`41`	`}`
	`42`	`+ std::cerr << format("request {}, it cost: {}ms\n", parser.GetMethod(), chrono::duration_cast<chrono::milliseconds>(`
	`43`	`+ chrono::system_clock::now() - start`
	`44`	`+ ).count());`
`37`	`45`	`}`
`38`	`46`	`}`
`39`	`47`	`catch (std::exception& e)`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ void LuaFile::PushLine(int offset)`
`126`	`126`	`_lineOffsetVec.push_back(offset);`
`127`	`127`	`}`
`128`	`128`
`129`		`-std::string_view LuaFile::GetSource()`
	`129`	`+std::string& LuaFile::GetSource()`
`130`	`130`	`{`
`131`	`131`	`return _source;`
`132`	`132`	`}`