diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2021-10-16 08:14:27 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2021-10-16 08:20:45 +0200 |
| commit | a5fded90be127060588613f082c22d67907c75be (patch) | |
| tree | 11dbaae0dd075271fa97d2a36166584b052926b2 | |
| parent | 6b1f718edea0e5dcf65a89a96c1d039d1b0f3893 (diff) | |
| download | dotfiles-a5fded90be127060588613f082c22d67907c75be.tar.gz dotfiles-a5fded90be127060588613f082c22d67907c75be.tar.xz dotfiles-a5fded90be127060588613f082c22d67907c75be.zip | |
nvim:cmp: Fix completion
| -rw-r--r-- | nvim/.config/nvim/lua/lsp/init.lua | 14 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/completion.lua | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/nvim/.config/nvim/lua/lsp/init.lua b/nvim/.config/nvim/lua/lsp/init.lua index d86d608..f0e6a82 100644 --- a/nvim/.config/nvim/lua/lsp/init.lua +++ b/nvim/.config/nvim/lua/lsp/init.lua @@ -49,19 +49,19 @@ local lsp_on_attach = function(client, bufnr) mapping = { ['<Tab>'] = function(fallback) - if vim.fn.pumvisible() == 1 then - vim.fn.feedkeys(t('<C-n>'), 'n') - elseif check_back_space() then - vim.fn.feedkeys(t('<Tab>'), 'n') + if cmp.visible() then + cmp.select_next_item() elseif ls.expand_or_jumpable() then vim.fn.feedkeys(t('<Plug>luasnip-expand-or-jump'), '') + elseif not check_back_space() then + cmp.complete() else - fallback() + vim.fn.feedkeys(t('<Tab>'), 'n') end end, ['<S-Tab>'] = function(fallback) - if vim.fn.pumvisible() == 1 then - vim.fn.feedkeys(t('<C-p>'), 'n') + if cmp.visible() then + cmp.select_prev_item() elseif ls.jumpable(-1) then vim.fn.feedkeys(t('<Plug>luasnip-jump-prev'), '') else diff --git a/nvim/.config/nvim/lua/plugins/completion.lua b/nvim/.config/nvim/lua/plugins/completion.lua index 77caa18..42e7548 100644 --- a/nvim/.config/nvim/lua/plugins/completion.lua +++ b/nvim/.config/nvim/lua/plugins/completion.lua @@ -21,12 +21,12 @@ cmp.setup { mapping = { ['<Tab>'] = function(fallback) - if vim.fn.pumvisible() == 1 then - vim.fn.feedkeys(t('<C-n>'), 'n') - elseif check_back_space() then - vim.fn.feedkeys(t('<Tab>'), 'n') + if cmp.visible() then + cmp.select_next_item() + elseif not check_back_space() then + cmp.complete() else - fallback() + vim.fn.feedkeys(t('<Tab>'), 'n') end end, ['<C-p>'] = cmp.mapping.select_prev_item(), |