From c9c6bc56f03605b349ffa6ceb95ab2aba34db661 Mon Sep 17 00:00:00 2001
From: Amaan Q <amaanq12@gmail.com>
Date: Tue, 10 Jan 2023 14:08:55 -0500
Subject: [PATCH] refactor(rust-tools): check for client name and use different
 keymaps to not interfere with cmp for <C-space>

---
 lua/lazyvim/plugins/extras/lang/rust.lua | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua
index d643e4d3..5b35419b 100644
--- a/lua/lazyvim/plugins/extras/lang/rust.lua
+++ b/lua/lazyvim/plugins/extras/lang/rust.lua
@@ -11,16 +11,7 @@ return {
   -- correctly setup lspconfig for Rust 🚀
   {
     "neovim/nvim-lspconfig",
-    dependencies = {
-      "simrat39/rust-tools.nvim",
-      init = function()
-        require("lazyvim.util").on_attach(function(_, buffer)
-		  -- stylua: ignore
-		  vim.keymap.set("n", "<C-space>", "RustHoverActions", { buffer = buffer, desc = "Hover Actions (Rust)" })
-          vim.keymap.set("n", "<Leader>a", "RustCodeActionGroup", { buffer = buffer, desc = "Code Action (Rust)" })
-        end)
-      end,
-    },
+    dependencies = { "simrat39/rust-tools.nvim" },
     opts = {
       servers = {
         rust_analyzer = {
@@ -47,6 +38,13 @@ return {
       },
       setup = {
         rust_analyzer = function(_, opts)
+          require("lazyvim.util").on_attach(function(client, buffer)
+            if client.name == "rust_analyzer" then
+			  -- stylua: ignore
+			  vim.keymap.set("n", "<leader>co", "RustHoverActions", { buffer = buffer, desc = "Hover Actions (Rust)" })
+              vim.keymap.set("n", "<leader>cR", "RustCodeActionGroup", { buffer = buffer, desc = "Code Action (Rust)" })
+            end
+          end)
           local rust_opts = {
             server = vim.tbl_deep_extend("force", {}, opts, opts.server or {}),
             tools = { -- rust-tools options