语言服务支持代码风格诊断

Author: CppCXY

CodeFormatServer/src/LanguageClient.cpp

@@ -1,4 +1,5 @@
 #include "CodeFormatServer/LanguageClient.h"
+#include "Util/format.h"
 
 LanguageClient& LanguageClient::GetInstance()
 {
@@ -16,6 +17,23 @@ std::shared_ptr<IOSession> LanguageClient::GetSession()
 	return _session;
 }
 
+void LanguageClient::SendNotification(std::string_view method, std::shared_ptr<vscode::Serializable> param)
+{
+	auto json = nlohmann::json::object();
+	json["jsonrpc"] = "2.0";
+	json["method"] = method;
+	json["params"] = param->Serialize();
+
+	if(_session)
+	{
+		auto dumpResult = json.dump();
+		std::string message = format("Content-Length:{}\r\n\r\n", dumpResult.size());
+
+		message.append(dumpResult);
+		_session->Send(std::move(message));
+	}
+}
+
 void LanguageClient::Run()
 {
 	if (_session)

CodeFormatServer/src/LanguageService.cpp

@@ -2,6 +2,7 @@
 #include "CodeFormatServer/VSCode.h"
 #include "CodeService/LuaFormatOptions.h"
 #include "CodeService/LuaFormatter.h"
+#include "CodeFormatServer/LanguageClient.h"
 
 using namespace std::placeholders;
 
@@ -25,7 +26,7 @@ bool LanguageService::Initialize()
 }
 
 std::shared_ptr<vscode::Serializable> LanguageService::Dispatch(std::string_view method,
-	std::shared_ptr<vscode::Serializable> param)
+                                                                std::shared_ptr<vscode::Serializable> param)
 {
 	auto it = _handles.find(method);
 	if (it != _handles.end())
@@ -49,15 +50,35 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnDidChange(
 	std::shared_ptr<vscode::DidChangeTextDocumentParams> param)
 {
 	LuaFormatOptions options;
-	
+
 	std::shared_ptr<LuaParser> parser = LuaParser::LoadFromBuffer(std::move(param->contentChanges[0].text));
 	parser->BuildAstWithComment();
 
 	LuaFormatter formatter(parser, options);
 	formatter.BuildFormattedElement();
 
-	auto diagnosis = formatter.GetDiagnosisInfos();
+	auto diagnosisInfos = formatter.GetDiagnosisInfos();
 
+	auto vscodeDiagnosis = std::make_shared<vscode::PublishDiagnosticsParams>();
+	vscodeDiagnosis->uri = param->textDocument.uri;
 
+	for (auto diagnosisInfo : diagnosisInfos)
+	{
+		auto& diagnosis = vscodeDiagnosis->diagnostics.emplace_back();
+		diagnosis.message = diagnosisInfo.Message;
+		diagnosis.range = vscode::Range(
+			vscode::Position(
+				diagnosisInfo.Range.Start.Line,
+				diagnosisInfo.Range.Start.Character
+			),
+			vscode::Position(
+				diagnosisInfo.Range.End.Line,
+				diagnosisInfo.Range.End.Character
+			));
+		diagnosis.severity = vscode::DiagnosticSeverity::Warning;
+	}
 
+	LanguageClient::GetInstance().SendNotification("textDocument/publishDiagnostics", vscodeDiagnosis);
+
+	return nullptr;
 }

CodeFormatServer/src/Session/SocketIOSession.cpp

@@ -38,13 +38,20 @@ void SocketIOSession::Run()
 		}
 		while (true);
 
-		std::string result = Handle(protocolBuffer.ReadOneProtocol());
+		do {
+			std::string result = Handle(protocolBuffer.ReadOneProtocol());
 
-		protocolBuffer.Reset();
-		if (!result.empty()) {
-			asio::write(_socket, asio::buffer(result));
-		}
+			protocolBuffer.Reset();
+			if (!result.empty()) {
+				Send(result);
+			}
+		} while (protocolBuffer.CanReadOneProtocol());
 	}
 endLoop:
 	return;
 }
+
+void SocketIOSession::Send(std::string_view content)
+{
+	asio::write(_socket, asio::buffer(content));
+}

CodeFormatServer/src/VSCode.cpp

@@ -19,14 +19,20 @@ std::shared_ptr<vscode::Serializable> vscode::MakeFromRequest(std::string_view m
 	{
 		return MakeRequestObject<InitializeParams>(json);
 	}
-	else if(method == "textDocument/didChange")
+	else if (method == "textDocument/didChange")
 	{
 		return MakeRequestObject<DidChangeTextDocumentParams>(json);
 	}
 
 	return nullptr;
 }
 
+vscode::Position::Position(uint64_t _line, uint64_t _character)
+	: line(_line),
+	  character(_character)
+{
+}
+
 nlohmann::json vscode::Position::Serialize()
 {
 	auto object = nlohmann::json::object();
@@ -42,6 +48,12 @@ void vscode::Position::Deserialize(nlohmann::json json)
 	character = json["character"];
 }
 
+vscode::Range::Range(Position _start, Position _end)
+	: start(_start),
+	  end(_end)
+{
+}
+
 nlohmann::json vscode::Range::Serialize()
 {
 	auto object = nlohmann::json::object();
@@ -72,6 +84,10 @@ void vscode::Location::Deserialize(nlohmann::json json)
 	uri = json["uri"];
 }
 
+vscode::Diagnostic::Diagnostic()
+{
+}
+
 nlohmann::json vscode::Diagnostic::Serialize()
 {
 	auto object = nlohmann::json::object();
@@ -102,6 +118,23 @@ void vscode::TextDocument::Deserialize(nlohmann::json json)
 	uri = json["uri"];
 }
 
+nlohmann::json vscode::PublishDiagnosticsParams::Serialize()
+{
+	auto object = nlohmann::json::object();
+	object["uri"] = uri;
+
+	auto array = nlohmann::json::array();
+
+	for(auto& diagnositc: diagnostics)
+	{
+		array.push_back(diagnositc.Serialize());
+	}
+
+	object["diagnostics"] = array;
+
+	return object;
+}
+
 void vscode::PublishDiagnosticsParams::Deserialize(nlohmann::json json)
 {
 	uri = json["uri"];

include/CodeFormatServer/LanguageClient.h

@@ -12,6 +12,8 @@ class LanguageClient
 
 	std::shared_ptr<IOSession> GetSession();
 
+	void SendNotification(std::string_view method, std::shared_ptr<vscode::Serializable> param);
+
 	void Run();
 private:
 	std::shared_ptr<IOSession> _session;

include/CodeFormatServer/Session/IOSession.h

@@ -9,7 +9,7 @@ class IOSession
 	virtual ~IOSession();
 
 	virtual void Run() = 0;
-	// virtual void Write();
+	virtual void Send(std::string_view content) = 0;
 protected:
 	std::string Handle(std::string_view msg);
 private:

include/CodeFormatServer/Session/SocketIOSession.h

@@ -9,7 +9,7 @@ class SocketIOSession : public IOSession
 	explicit SocketIOSession(asio::ip::tcp::socket&& socket);
 
 	void Run() override;
-
+	void Send(std::string_view content) override;
 private:
 	asio::ip::tcp::socket _socket;
 };