summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.vim2
-rw-r--r--lua/lsp.lua3
2 files changed, 3 insertions, 2 deletions
diff --git a/init.vim b/init.vim
index b6b306f..8806c6e 100644
--- a/init.vim
+++ b/init.vim
@@ -38,6 +38,8 @@ Plug 'vim-airline/vim-airline'
Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-telescope/telescope.nvim'
+Plug 'tpope/vim-surround'
+
Plug 'git://git.josher.dev/fieldmarshal.vim.git'
if has('rneovim')
Plug 'git://git.josher.dev/rneovim-userregs.git'
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 3e01073..c443788 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -60,7 +60,6 @@ cmp.setup({
["<C-u>"] = cmp.mapping.scroll_docs(4),
["<C-e>"] = cmp.mapping.close(),
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
- ["<C-m>"] = cmp.mapping.confirm({ select = true }),
["<C-n>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
@@ -78,7 +77,7 @@ cmp.setup({
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
- cmp.mapping.confirm({ select = true })
+ cmp.mapping.confirm({ select = true })()
elseif vim.fn["vsnip#available"](1) == 1 then
feedkey("<Plug>(vsnip-expand-or-jump)", "")
elseif has_words_before() then