From 9aeb095189b9686985b242990804e96003cd4943 Mon Sep 17 00:00:00 2001
From: Matthew Leong <mattleong91@gmail.com>
Date: Mon, 9 Jan 2023 18:59:25 -0800
Subject: [PATCH] refactor(mappings): update lsp mappings

---
 lua/cosmic/lsp/mappings.lua                   | 18 ++++++++---------
 lua/cosmic/plugins/cosmic-ui/init.lua         |  4 ++--
 lua/cosmic/plugins/nvim-lsp-ts-utils/init.lua |  6 +++---
 lua/cosmic/plugins/telescope/init.lua         | 20 ++++++++-----------
 lua/cosmic/plugins/which-key/init.lua         |  6 ++++++
 5 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/lua/cosmic/lsp/mappings.lua b/lua/cosmic/lsp/mappings.lua
index 8468d54..e470ce7 100644
--- a/lua/cosmic/lsp/mappings.lua
+++ b/lua/cosmic/lsp/mappings.lua
@@ -25,9 +25,9 @@ function M.init(client, bufnr)
   )
   buf_map(
     'n',
-    '<leader>ge',
+    '<leader>ldb',
     '<cmd>lua vim.diagnostic.open_float(nil, { scope = "buffer", })<cr>',
-    { desc = 'Show buffer diagnostic' }
+    { desc = 'Show buffer diagnostics' }
   )
 
   -- hover
@@ -35,21 +35,21 @@ function M.init(client, bufnr)
 
   -- code actions
   buf_map('n', 'gn', '<cmd>lua vim.lsp.buf.rename()<cr>', { desc = 'Rename' })
-  buf_map('n', '<leader>ga', '<cmd>lua vim.lsp.buf.code_actions()<cr>', { desc = 'Code Actions' })
-  buf_map('v', '<leader>ga', '<cmd>lua vim.lsp.buf.range_code_actions()<cr>', { desc = 'Range Code Actions' })
+  buf_map('n', '<leader>la', '<cmd>lua vim.lsp.buf.code_actions()<cr>', { desc = 'Code Actions' })
+  buf_map('v', '<leader>la', '<cmd>lua vim.lsp.buf.range_code_actions()<cr>', { desc = 'Range Code Actions' })
 
   -- formatting
-  buf_map('n', '<leader>gf', '', { desc = 'Format', callback = lsp_utils.format })
-  buf_map('v', '<leader>gf', '<cmd>lua vim.lsp.buf.range_formatting()<cr>', { desc = 'Range Format' })
+  buf_map('n', '<leader>lf', '', { desc = 'Format', callback = lsp_utils.format })
+  buf_map('v', '<leader>lf', '<cmd>lua vim.lsp.buf.range_formatting()<cr>', { desc = 'Range Format' })
 
   -- lsp workspace
-  buf_map('n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<cr>', { desc = 'Add workspace folder' })
-  buf_map('n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<cr>', {
+  buf_map('n', '<leader>lwa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<cr>', { desc = 'Add workspace folder' })
+  buf_map('n', '<leader>lwr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<cr>', {
     desc = 'Remove workspace folder',
   })
   buf_map(
     'n',
-    '<leader>wl',
+    '<leader>lwl',
     '<cmd>lua require("cosmic.utils.logger"):log(vim.inspect(vim.lsp.buf.list_workspace_folders()))<cr>',
     { desc = 'Show workspace folders' }
   )
diff --git a/lua/cosmic/plugins/cosmic-ui/init.lua b/lua/cosmic/plugins/cosmic-ui/init.lua
index f819bb5..4578779 100644
--- a/lua/cosmic/plugins/cosmic-ui/init.lua
+++ b/lua/cosmic/plugins/cosmic-ui/init.lua
@@ -15,10 +15,10 @@ return {
       local buf_map = utils.create_buf_map(bufnr)
 
       buf_map('n', 'gn', '<cmd>lua require("cosmic-ui").rename()<cr>', { desc = 'Rename' })
-      buf_map('n', '<leader>ga', '<cmd>lua require("cosmic-ui").code_actions()<cr>', { desc = 'Code Actions' })
+      buf_map('n', '<leader>la', '<cmd>lua require("cosmic-ui").code_actions()<cr>', { desc = 'Code Actions' })
       buf_map(
         'v',
-        '<leader>ga',
+        '<leader>la',
         '<cmd>lua require("cosmic-ui").range_code_actions()<cr>',
         { desc = 'Range Code Actions' }
       )
diff --git a/lua/cosmic/plugins/nvim-lsp-ts-utils/init.lua b/lua/cosmic/plugins/nvim-lsp-ts-utils/init.lua
index e2da76f..a1a8b6c 100644
--- a/lua/cosmic/plugins/nvim-lsp-ts-utils/init.lua
+++ b/lua/cosmic/plugins/nvim-lsp-ts-utils/init.lua
@@ -8,9 +8,9 @@ return {
       if client.name == 'tsserver' then
         local buf_map = utils.create_buf_map(bufnr)
         -- typescript helpers
-        buf_map('n', '<leader>gr', ':TSLspRenameFile<CR>')
-        buf_map('n', '<leader>go', ':TSLspOrganize<CR>')
-        buf_map('n', '<leader>gi', ':TSLspImportAll<CR>')
+        buf_map('n', '<leader>lr', ':TSLspRenameFile<CR>', { desc = 'Rename file' })
+        buf_map('n', '<leader>lo', ':TSLspOrganize<CR>', { desc = 'Organize imports' })
+        buf_map('n', '<leader>li', ':TSLspImportAll<CR>', { desc = 'Import All' })
       end
     end)
   end,
diff --git a/lua/cosmic/plugins/telescope/init.lua b/lua/cosmic/plugins/telescope/init.lua
index 8bcca30..b6ac283 100644
--- a/lua/cosmic/plugins/telescope/init.lua
+++ b/lua/cosmic/plugins/telescope/init.lua
@@ -17,19 +17,15 @@ return {
     require('cosmic.plugins.telescope.mappings').init()
 
     user_config.lsp.add_on_attach_mapping(function(client, bufnr)
-      local map = require('cosmic.utils').map
-      local function buf_map(mode, lhs, rhs)
-        map(mode, lhs, rhs, {
-          buffer = bufnr,
-        })
-      end
+      local buf_map = require('cosmic.utils').create_buf_map(bufnr)
 
-      buf_map('n', 'gd', '<cmd>Telescope lsp_definitions<cr>')
-      buf_map('n', 'gi', '<cmd>Telescope lsp_implementations<cr>')
-      buf_map('n', 'gt', '<cmd>Telescope lsp_type_definitions<cr>')
-      buf_map('n', 'gr', '<cmd>Telescope lsp_references<cr>')
-      buf_map('n', '<leader>ge', '<cmd>Telescope diagnostics bufnr=0<cr>')
-      buf_map('n', '<leader>wd', '<cmd>Telescope diagnostics<cr>')
+      buf_map('n', 'gd', '<cmd>Telescope lsp_definitions<cr>', { desc = 'Go to definition' })
+      buf_map('n', 'gi', '<cmd>Telescope lsp_implementations<cr>', { desc = 'Go to implementation' })
+      buf_map('n', 'gt', '<cmd>Telescope lsp_type_definitions<cr>', { desc = 'Go to type definition' })
+      buf_map('n', 'gr', '<cmd>Telescope lsp_references<cr>', { desc = 'Go to reference' })
+
+      buf_map('n', '<leader>ldb', '<cmd>Telescope diagnostics bufnr=0<cr>', { desc = 'Show buffer diagnostics' })
+      buf_map('n', '<leader>ldw', '<cmd>Telescope diagnostics<cr>', { desc = 'Workspace diagnostics' })
     end)
   end,
   cmd = { 'Telescope' },
diff --git a/lua/cosmic/plugins/which-key/init.lua b/lua/cosmic/plugins/which-key/init.lua
index 05570a3..bf1f0c3 100644
--- a/lua/cosmic/plugins/which-key/init.lua
+++ b/lua/cosmic/plugins/which-key/init.lua
@@ -29,9 +29,15 @@ return {
           },
           l = {
             name = '+lsp',
+            d = {
+              name = '+diagnostics',
+            },
             t = {
               name = '+toggle',
             },
+            w = {
+              name = '+workspace',
+            },
           },
           g = {
             name = '+goto (lsp)',