fix: Unknown requests were dropped without a proper response

eclipse-che4z · Mar 19, 2024 · 9366130 · 9366130
1 parent ea812ce
commit 9366130
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/clients/vscode-hlasmplugin/CHANGELOG.md b/clients/vscode-hlasmplugin/CHANGELOG.md
@@ -6,6 +6,9 @@
 - New document outline implementation
 - Fallback to WebAssembly language server automatically
 
+#### Fixed
+- Unknown requests were dropped without a proper response
+
 ## [1.12.0](https://github.com/eclipse-che4z/che-che4z-lsp-for-hlasm/compare/1.11.1...1.12.0) (2024-03-05)
 
 #### Added

diff --git a/language_server/src/lsp/lsp_server.cpp b/language_server/src/lsp/lsp_server.cpp
@@ -151,6 +151,15 @@ void server::message_received(const nlohmann::json& message)
         {
             LOG_ERROR(e.what());
             send_telemetry_error("lsp_server/method_unknown_error");
+            if (id)
+                respond_error(id.value(),
+                    "",
+                    -32803,
+                    "RequestFailed",
+                    {
+                        { "method", method_found.value().get<std::string>() },
+                        { "exception", e.what() },
+                    });
         }
     }
 }

diff --git a/language_server/src/server.cpp b/language_server/src/server.cpp
@@ -78,16 +78,7 @@ void server::call_method(const std::string& method, std::optional<request_id> id
         // - notification can be ignored
         // - requests should be responded to with MethodNotFound
         if (id)
-            send_message_->reply(nlohmann::json {
-                { "id", nlohmann ::json(*id) },
-                {
-                    "error",
-                    {
-                        { "code", -32601 },
-                        { "message", "MethodNotFound" },
-                    },
-                },
-            });
+            respond_error(id.value(), method, -32601, "MethodNotFound", {});
     }
     else
     {
@@ -96,6 +87,9 @@ void server::call_method(const std::string& method, std::optional<request_id> id
         LOG_WARNING(ss.str());
 
         send_telemetry_error("method_not_implemented", method);
+
+        if (id)
+            respond_error(id.value(), method, -32601, "MethodNotFound", {});
     }
 }
 

diff --git a/language_server/test/lsp/lsp_server_test.cpp b/language_server/test/lsp/lsp_server_test.cpp
@@ -104,8 +104,14 @@ TEST(lsp_server, not_implemented_method)
             "method_name":"server_error/method_not_implemented",
             "properties":{"error_details":"unknown_method"}
            }})"_json;
+    auto expected_not_implemented =
+        R"({"jsonrpc":"2.0","id":47,"error":{
+            "code":-32601,
+            "message":"MethodNotFound",
+            "data":null
+           }})"_json;
 
-    // Only telemetry expected
+    EXPECT_CALL(smpm, reply(expected_not_implemented));
     EXPECT_CALL(smpm, reply(expected_telemetry));
 
     s.message_received(j);