From aef826f76b4a2126bda8258fd9725d15f17920f0 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Wed, 12 Jan 2022 10:06:21 -0800
Subject: [PATCH] Undo swapped_map grouping

---
 neovim/lua/plugins/lsp.lua | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/neovim/lua/plugins/lsp.lua b/neovim/lua/plugins/lsp.lua
index 2d93309..cc83cfe 100644
--- a/neovim/lua/plugins/lsp.lua
+++ b/neovim/lua/plugins/lsp.lua
@@ -74,22 +74,21 @@ local function get_default_attach(override_capabilities)
 
         -- Mappings
         local opts = { noremap = true, silent = true }
-        local lsp_keymap = utils.swapped_map(utils.keymap_group("n", "<leader>l", opts, bufnr), function(lsp_keymap)
-            lsp_keymap("h", "<cmd>lua vim.lsp.buf.hover()<CR>")
-            lsp_keymap("rn", "<cmd>lua vim.lsp.buf.rename()<CR>")
-            lsp_keymap("e", "<cmd>lua vim.lsp.diagnostics.show_line_diagnostics()<CR>")
-            lsp_keymap("D", "<cmd>lua vim.lsp.buf.declaration()<CR>")
-            lsp_keymap("d", "<cmd>lua vim.lsp.buf.definition()<CR>")
-            lsp_keymap("t", "<cmd>lua vim.lsp.buf.type_definition()<CR>")
-            lsp_keymap("i", "<cmd>lua vim.lsp.buf.implementation()<CR>")
-            lsp_keymap("s", "<cmd>lua vim.lsp.buf.signature_help()<CR>")
-            lsp_keymap("wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
-            lsp_keymap("wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
-            lsp_keymap("wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
-            lsp_keymap("r", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
-            lsp_keymap("p", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
-            lsp_keymap("n", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
-        end)
+        local lsp_keymap = utils.keymap_group("n", "<leader>l", opts, bufnr)
+        lsp_keymap("h", "<cmd>lua vim.lsp.buf.hover()<CR>")
+        lsp_keymap("rn", "<cmd>lua vim.lsp.buf.rename()<CR>")
+        lsp_keymap("e", "<cmd>lua vim.lsp.diagnostics.show_line_diagnostics()<CR>")
+        lsp_keymap("D", "<cmd>lua vim.lsp.buf.declaration()<CR>")
+        lsp_keymap("d", "<cmd>lua vim.lsp.buf.definition()<CR>")
+        lsp_keymap("t", "<cmd>lua vim.lsp.buf.type_definition()<CR>")
+        lsp_keymap("i", "<cmd>lua vim.lsp.buf.implementation()<CR>")
+        lsp_keymap("s", "<cmd>lua vim.lsp.buf.signature_help()<CR>")
+        lsp_keymap("wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
+        lsp_keymap("wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
+        lsp_keymap("wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
+        lsp_keymap("r", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
+        lsp_keymap("p", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
+        lsp_keymap("n", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
 
         -- Older keymaps
         buf_set_keymap("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)