From a981682603480e34b23615433e4ebefe07276dc2 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 2 Jul 2023 17:33:44 +0200
Subject: [PATCH] fix(lsp): update keymaps *after* registering capabilities

---
 lua/lazyvim/plugins/lsp/init.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 570ec354..e7b7801d 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -99,12 +99,13 @@ return {
       local register_capability = vim.lsp.handlers["client/registerCapability"]
 
       vim.lsp.handlers["client/registerCapability"] = function(err, res, ctx)
+        local ret = register_capability(err, res, ctx)
         local client_id = ctx.client_id
         ---@type lsp.Client
         local client = vim.lsp.get_client_by_id(client_id)
         local buffer = vim.api.nvim_get_current_buf()
         require("lazyvim.plugins.lsp.keymaps").on_attach(client, buffer)
-        return register_capability(err, res, ctx)
+        return ret
       end
 
       -- diagnostics