diff options
Diffstat (limited to 'lua/config')
| -rw-r--r-- | lua/config/lsp.lua | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua index 0d316dc..2d77e0e 100644 --- a/lua/config/lsp.lua +++ b/lua/config/lsp.lua @@ -17,25 +17,21 @@ function M.show_line_diagnostics() end local custom_attach = function(client, bufnr) - local function buf_set_keymap(...) - api.nvim_buf_set_keymap(bufnr, ...) - end - -- Mappings. - local opts = { noremap = true, silent = true } - buf_set_keymap("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts) - buf_set_keymap("n", "<C-]>", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts) - buf_set_keymap("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts) - buf_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts) - buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts) - buf_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts) - buf_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts) - buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts) - buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts) - buf_set_keymap("n", "[d", "<cmd>lua vim.diagnostic.goto_prev()<CR>", opts) - buf_set_keymap("n", "]d", "<cmd>lua vim.diagnostic.goto_next()<CR>", opts) - buf_set_keymap("n", "<space>q", "<cmd>lua vim.diagnostic.setqflist({open = true})<CR>", opts) - buf_set_keymap("n", "<space>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts) + local opts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) + vim.keymap.set("n", "<C-]>", vim.lsp.buf.definition, opts) + vim.keymap.set("n", "K", vim.lsp.buf.hover, opts) + vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, opts) + vim.keymap.set("n", "<space>wa", vim.lsp.buf.add_workspace_folder, opts) + vim.keymap.set("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, opts) + vim.keymap.set("n", "<space>wl", function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, opts) + vim.keymap.set("n", "<space>rn", vim.lsp.buf.rename, opts) + vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) + vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) + vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) + vim.keymap.set("n", "<space>q", function() vim.diagnostic.setqflist({open = true}) end, opts) + vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, opts) vim.cmd([[ autocmd CursorHold <buffer> lua require('config.lsp').show_line_diagnostics() @@ -43,10 +39,10 @@ local custom_attach = function(client, bufnr) -- Set some key bindings conditional on server capabilities if client.resolved_capabilities.document_formatting then - buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting_sync()<CR>", opts) + vim.keymap.set("n", "<space>f", vim.lsp.buf.formatting_sync, opts) end if client.resolved_capabilities.document_range_formatting then - buf_set_keymap("x", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR><ESC>", opts) + vim.keymap.set("x", "<space>f", vim.lsp.buf.range_formatting, opts) end -- The blow command will highlight the current variable and its usages in the buffer. |