diff --git a/init.lua b/init.lua index 73d9f46..a992e19 100644 --- a/init.lua +++ b/init.lua @@ -102,30 +102,30 @@ local on_attach = function(_, bufnr) -- In this case, we create a function that lets us more easily define mappings specific -- for LSP related items. It sets the mode, buffer and description for us each time. local nmap = function(keys, func, desc) - if desc then - desc = 'LSP: ' .. desc - end + -- if desc then + -- desc = 'LSP: ' .. desc + -- end vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc }) end - nmap('lr', vim.lsp.buf.rename, '[R]e[n]ame') - nmap('lc', vim.lsp.buf.code_action, '[C]ode [A]ction') + nmap('lr', vim.lsp.buf.rename, 'Rename') + nmap('lc', vim.lsp.buf.code_action, 'Code Action') - nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition') - nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation') - nmap('D', vim.lsp.buf.type_definition, 'Type [D]efinition') + nmap('gd', vim.lsp.buf.definition, 'Goto Definition') + nmap('gr', require('telescope.builtin').lsp_references, 'Goto References') + nmap('gI', vim.lsp.buf.implementation, 'Goto Implementation') + nmap('D', vim.lsp.buf.type_definition, 'Type Definition') nmap('gl', vim.diagnostic.open_float, 'Current line diagnostics') - nmap('ls', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - nmap('lw', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') + nmap('ls', require('telescope.builtin').lsp_document_symbols, 'Document Symbols') + nmap('lw', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Workspace Symbols') -- See `:help K` for why this keymap nmap('K', vim.lsp.buf.hover, 'Hover Documentation') nmap('', vim.lsp.buf.signature_help, 'Signature Documentation') -- Lesser used LSP functionality - nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + nmap('gD', vim.lsp.buf.declaration, 'Goto Declaration') -- nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') -- nmap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') -- nmap('wl', function() diff --git a/lua/keymap.lua b/lua/keymap.lua index fa5b7f0..9b0296a 100644 --- a/lua/keymap.lua +++ b/lua/keymap.lua @@ -37,11 +37,11 @@ vim.keymap.set('n', '', require('telescope.builtin').buffers, { d -- }) -- end, { desc = '[/] Fuzzily search in current buffer]' }) -vim.keymap.set('n', 'sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) -vim.keymap.set('n', 'sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' }) -vim.keymap.set('n', 'sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' }) -vim.keymap.set('n', 'sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' }) -vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' }) +vim.keymap.set('n', 'sf', require('telescope.builtin').find_files, { desc = 'Search Files' }) +vim.keymap.set('n', 'sh', require('telescope.builtin').help_tags, { desc = 'Search Help' }) +vim.keymap.set('n', 'sw', require('telescope.builtin').grep_string, { desc = 'Search current Word' }) +vim.keymap.set('n', 'sg', require('telescope.builtin').live_grep, { desc = 'Search by Grep' }) +vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { desc = 'Search Diagnostics' }) -- Diagnostic keymaps