oli/nvim
1
1
Fork 0
Code Issues Pull Requests 1 Releases 1 Wiki Activity

master #1

Open
oli wants to merge 912 commits from master into lua
pull from: master
merge into: oli:lua
Conversation 0 Commits 912 Files Changed 102 +6 -2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9150964742 - Show all commits

8
lua/plugins/cmp.lua
View File

@@ -51,7 +51,9 @@ return {
s = cmp.mapping.confirm({ select = false }), s = cmp.mapping.confirm({ select = false }),
}), }),
['<Tab>'] = cmp.mapping(function(fallback) ['<Tab>'] = cmp.mapping(function(fallback)
if luasnip.expand_or_jumpable() then if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
vim.api.nvim_feedkeys(t('<Plug>luasnip-expand-or-jump'), '', true) vim.api.nvim_feedkeys(t('<Plug>luasnip-expand-or-jump'), '', true)
else else
fallback() fallback()
@@ -61,7 +63,9 @@ return {
's', 's',
}), }),
['<S-Tab>'] = cmp.mapping(function(fallback) ['<S-Tab>'] = cmp.mapping(function(fallback)
if luasnip.jumpable(-1) then if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
vim.api.nvim_feedkeys(t('<Plug>luasnip-jump-prev'), '', true) vim.api.nvim_feedkeys(t('<Plug>luasnip-jump-prev'), '', true)
else else
fallback() fallback()