From 8e663606ae85900cb6f90acebfc09bbf3cbad179 Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Sat, 2 Aug 2025 13:09:10 +0200
Subject: [PATCH] fix: only call notify_reply_callback once the request is
 actually resolved

---
 lua/crates/lsp.lua | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/lua/crates/lsp.lua b/lua/crates/lsp.lua
index 28f6fc7..0f593a9 100644
--- a/lua/crates/lsp.lua
+++ b/lua/crates/lsp.lua
@@ -40,25 +40,34 @@ function M.server(opts)
 
         ---@param method string
         ---@param params any
-        ---@param callback fun(method: string?, params: any)
-        ---@param notify_reply_callback? fun(request_id: integer)
+        ---@param callback fun(error: any?, data: any?)
+        ---@param notify_reply_callback fun(request_id: integer)?
         ---@return boolean
         ---@return integer
         function srv.request(method, params, callback, notify_reply_callback)
+            request_id = request_id + 1
             pcall(on_request, method, params)
+
+            ---@param error any
+            ---@param data any
+            local function callback_wrapper(error, data)
+                callback(error, data)
+                if notify_reply_callback then
+                    vim.schedule(function()
+                        notify_reply_callback(request_id)
+                    end)
+                end
+            end
+
             local handler = handlers[method]
             if handler then
-                handler(method, params, callback)
+                handler(method, params, callback_wrapper)
             elseif method == "initialize" then
-                callback(nil, {
+                callback_wrapper(nil, {
                     capabilities = capabilities,
                 })
             elseif method == "shutdown" then
-                callback(nil, nil)
-            end
-            request_id = request_id + 1
-            if notify_reply_callback then
-                notify_reply_callback(request_id)
+                callback_wrapper(nil, nil)
             end
             return true, request_id
         end