Merge remote-tracking branch 'origin/main'

This commit is contained in:
Barak Michener 2024-08-21 11:21:04 -07:00
commit f79772f85f
2 changed files with 71 additions and 63 deletions

View file

@ -75,10 +75,17 @@ cmp.setup({
['<C-d>'] = cmp.mapping.scroll_docs(-4), ['<C-d>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4), ['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete {}, ['<C-Space>'] = cmp.mapping.complete {},
['<CR>'] = cmp.mapping.confirm { ["<CR>"] = cmp.mapping({
behavior = cmp.ConfirmBehavior.Replace, i = function(fallback)
select = true, if cmp.visible() and cmp.get_active_entry() then
}, cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false })
else
fallback()
end
end,
s = cmp.mapping.confirm({ select = true }),
c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
}),
['<Tab>'] = cmp.mapping(function(fallback) ['<Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()

View file

@ -275,6 +275,7 @@ Plug 'Shougo/echodoc.vim'
"Plug 'python-rope/ropevim' "Plug 'python-rope/ropevim'
Plug 'windwp/nvim-autopairs' Plug 'windwp/nvim-autopairs'
Plug 'danymat/neogen' Plug 'danymat/neogen'
Plug 'stevearc/dressing.nvim'
" Unclear " Unclear
"Plug 'ncm2/float-preview.nvim' "Plug 'ncm2/float-preview.nvim'