refactor

lsp-server/src/provider/initialize/initialize_provider.cpp

@@ -1,55 +1,44 @@
 #include <spdlog/spdlog.h>
 #include "./initialize_provider.hpp"
+#include "../../protocol/transform/facade.hpp"
 
 namespace lsp::providers::initialize
 {
-
-    nlohmann::json InitializeProvider::ProvideResponse(const LspRequest& request)
+    std::string InitializeProvider::ProvideResponse(const protocol::RequestMessage& request)
     {
         spdlog::debug("InitializeProvider: Providing response for method {}", request.method);
-        nlohmann::json response;
-        response["jsonrpc"] = "2.0";
-        response["id"] = request.id;
-        response["result"] = BuildInitializeResult();
-        return response;
+        protocol::ResponseMessage response;
+        response.id = request.id;
+        response.result = transform::LSPAny(BuildInitializeResult());
+        std::string json;
+        auto ec = glz::write_json(response, json);
+        return ec ? BuildErrorMessageResponse(protocol::ErrorCode::kInternalError, "Internal error") : json;
     }
 
-    inline std::string InitializeProvider::GetMethod() const
+    std::string InitializeProvider::GetMethod() const
     {
         return "initialize";
     }
 
-    inline std::string InitializeProvider::GetProviderName() const
+    std::string InitializeProvider::GetProviderName() const
     {
         return "InitializeProvider";
     }
 
-    nlohmann::json InitializeProvider::BuildInitializeResult()
+    protocol::InitializeResult InitializeProvider::BuildInitializeResult()
     {
-        nlohmann::json result;
-        result["capabilities"] = BuildServerCapabilities();
-        result["serverInfo"] = BuildServerInfo();
+        protocol::InitializeResult result;
+        result.serverInfo.name = "TSL Language Server";
+        result.serverInfo.version = "1.0.0";
+        protocol::TextDocumentSyncOptions opts;
+        opts.openClose = true;
+        opts.change = protocol::TextDocumentSyncKind::kIncremental;
+        protocol::CompletionOptions completion_provider;
+        completion_provider.resolveProvider = false;
+
+        result.capabilities.textDocumentSync = opts;
+        result.capabilities.completionProvider = completion_provider;
         return result;
     }
 
-    nlohmann::json InitializeProvider::BuildServerCapabilities()
-    {
-        nlohmann::json capabilities;
-        capabilities["textDocumentSync"] = nlohmann::json();
-        capabilities["textDocumentSync"]["change"] = 2;
-        capabilities["textDocumentSync"]["openClose"] = true;
-        capabilities["textDocumentSync"]["save"] = true;
-        capabilities["completionProvider"] = nlohmann::json();
-        capabilities["completionProvider"]["resolveProvider"] = false;
-        return capabilities;
-    }
-
-    nlohmann::json InitializeProvider::BuildServerInfo()
-    {
-        nlohmann::json serverInfo;
-        serverInfo["name"] = "TSL Language Server";
-        serverInfo["version"] = "1.0.0";
-        return serverInfo;
-    }
-
 }

lsp-server/src/provider/initialize/initialize_provider.hpp

@@ -1,20 +1,18 @@
 #pragma once
 #include "../base/provider_interface.hpp"
-#include <nlohmann/json.hpp>
 
 namespace lsp::providers::initialize
 {
+    using namespace lsp;
     class InitializeProvider : public ILspProvider
     {
     public:
         InitializeProvider() = default;
-        nlohmann::json ProvideResponse(const LspRequest& request) override;
+        std::string ProvideResponse(const protocol::RequestMessage& request) override;
         std::string GetMethod() const override;
         std::string GetProviderName() const override;
 
     private:
-        nlohmann::json BuildServerCapabilities();
-        nlohmann::json BuildServerInfo();
-        nlohmann::json BuildInitializeResult();
+        protocol::InitializeResult BuildInitializeResult();
     };
 }