diff --git a/.config/nvim/lua/blake/lsp.lua b/.config/nvim/lua/blake/lsp.lua index bdfc8cb..19a036d 100644 --- a/.config/nvim/lua/blake/lsp.lua +++ b/.config/nvim/lua/blake/lsp.lua @@ -194,41 +194,52 @@ end -- <<< -- lspconfig >>> M.lspconfig = function() local nvim_lsp = require('lspconfig') + -- Keybinds >>> + -- commit before telescope keybinds: 5d63069 -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer local opts = { noremap=true, silent=true } - vim.api.nvim_set_keymap('n', 'e', 'lua vim.diagnostic.open_float()', opts) - vim.api.nvim_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', opts) - vim.api.nvim_set_keymap('n', ']d', 'lua vim.diagnostic.goto_next()', opts) - vim.api.nvim_set_keymap('n', 'q', 'lua vim.diagnostic.setloclist()', opts) + + local map = vim.api.nvim_set_keymap + local buffmap = vim.api.nvim_buf_set_keymap + local buffopt = vim.api.nvim_buf_set_option + + -- map('n', 'e', 'lua vim.diagnostic.open_float()', opts) + map('n', '[d', 'lua vim.diagnostic.goto_prev()', opts) + map('n', ']d', 'lua vim.diagnostic.goto_next()', opts) + map('n', 'q', 'lua require("telescope.builtin").diagnostics()', opts) -- Telescope -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer local on_attach = function(client, bufnr) -- Enable completion triggered by - vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + buffopt(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') -- Mappings. -- See `:help vim.lsp.*` for documentation on any of the below functions - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', 'lua vim.lsp.buf.definition()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', 'lua vim.lsp.buf.hover()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', '', 'lua vim.lsp.buf.signature_help()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'rn', 'lua vim.lsp.buf.rename()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'ca', 'lua vim.lsp.buf.code_action()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', 'lua vim.lsp.buf.references()', opts) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'f', 'lua vim.lsp.buf.formatting()', opts) + buffmap(bufnr, 'n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + buffmap(bufnr, 'n', 'gd', 'lua require("telescope.builtin").lsp_definitions()', opts) -- Telescope + buffmap(bufnr, 'n', 'K', 'lua vim.lsp.buf.hover()', opts) + buffmap(bufnr, 'n', 'gi', 'lua require("telescope.builtin").lsp_implementations()', opts) -- Telescope + buffmap(bufnr, 'n', '', 'lua vim.lsp.buf.signature_help()', opts) + buffmap(bufnr, 'n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) + buffmap(bufnr, 'n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) + buffmap(bufnr, 'n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) + buffmap(bufnr, 'n', 'D', 'lua vim.lsp.buf.type_definition()', opts) + buffmap(bufnr, 'n', 'rn', 'lua vim.lsp.buf.rename()', opts) + buffmap(bufnr, 'n', 'ca', 'lua require("telescope.builtin").lsp_code_actions()', opts) -- Telescope + buffmap(bufnr, 'n', 'gr', 'lua require("telescope.builtin").lsp_references()', opts) -- Telescope + buffmap(bufnr, 'n', 'f', 'lua vim.lsp.buf.formatting()', opts) + buffmap(bufnr, 'n', 'so', 'lua require("telescope.builtin").lsp_document_symbols()', opts) end -- <<< + + -- cmp things >>> local capabilities if cmp ~= nil then -- only load this if cmp is loaded capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) end + -- <<< -- Load servers >>> -- General servers >>> @@ -276,8 +287,7 @@ M.lspconfig = function() table.insert(runtime_path, 'lua/?.lua') table.insert(runtime_path, 'lua/?/init.lua') - require('lspconfig').sumneko_lua.setup { - cmd = { sumneko_binary, '-E', sumneko_root_path .. '/main.lua' }, + nvim_lsp.sumneko_lua.setup { on_attach = on_attach, capabilities = capabilities, settings = {