diff --git a/nvim/lua/config/cmp.lua b/nvim/lua/config/cmp.lua index 3b0c62b..dee0ad5 100644 --- a/nvim/lua/config/cmp.lua +++ b/nvim/lua/config/cmp.lua @@ -1,6 +1,7 @@ -- Setup nvim-cmp. local cmp = require "cmp" local lspkind = require("lspkind") +local capabilities = require('cmp_nvim_lsp').default_capabilities() local has_words_before = function() local line, col = unpack(vim.api.nvim_win_get_cursor(0)) @@ -14,9 +15,10 @@ local feedkey = function(key, mode) mode, true) end -local capabilities = require('cmp_nvim_lsp').default_capabilities() -require'lspconfig'.sourcekit.setup {} +require'lspconfig'.sourcekit.setup { + capabilities = capabilities +} lspkind.init({ symbol_map = { diff --git a/nvim/lua/config/lsp.lua b/nvim/lua/config/lsp.lua index d6386fb..7af2a62 100644 --- a/nvim/lua/config/lsp.lua +++ b/nvim/lua/config/lsp.lua @@ -30,17 +30,12 @@ local on_attach = function(bufnr) buf_set_keymap("n", "ca", "lua vim.lsp.buf.code_action()", opts) buf_set_keymap("n", "gr", "lua vim.lsp.buf.references()", opts) - buf_set_keymap("n", "e", - "lua vim.lsp.diagnostic.show_line_diagnostics()", - opts) - buf_set_keymap("n", "[d", "lua vim.lsp.diagnostic.goto_prev()", + buf_set_keymap("n", "e", "lua vim.lsp.diagnostic.show_line_diagnostics()", opts) + buf_set_keymap("n", "[d", "lua vim.lsp.diagnostic.goto_prev()", opts) - buf_set_keymap("n", "]d", "lua vim.lsp.diagnostic.goto_next()", - opts) - buf_set_keymap("n", "q", - "lua vim.lsp.diagnostic.set_loclist()", opts) - buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", - opts) + buf_set_keymap("n", "]d", "lua vim.lsp.diagnostic.goto_next()", opts) + buf_set_keymap("n", "q", "lua vim.lsp.diagnostic.set_loclist()", opts) + buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) end