Revert "added friendly snippets"
caused problems with keybindings for autocomplete. This reverts commit c9aa2dca270ee1aee9931a545c39d8fdf348c097.
This commit is contained in:
parent
ab89a6e353
commit
ae1fcff4be
|
@ -1,5 +1,6 @@
|
|||
--configure nvim-cmp for use with lsp and luasnip.
|
||||
|
||||
|
||||
-- Add additional capabilities supported by nvim-cmp
|
||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
|
||||
|
@ -39,25 +40,25 @@ cmp.setup {
|
|||
behavior = cmp.ConfirmBehavior.Replace,
|
||||
select = true,
|
||||
},
|
||||
['<Tab>'] = function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
elseif luasnip.expand_or_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end,
|
||||
['<S-Tab>'] = function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
elseif luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end,
|
||||
},
|
||||
['<Tab>'] = function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
elseif luasnip.expand_or_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end,
|
||||
['<S-Tab>'] = function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
elseif luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end,
|
||||
sources = {
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'luasnip' },
|
||||
|
|
|
@ -34,18 +34,6 @@ return require('packer').startup(function(use)
|
|||
}
|
||||
}
|
||||
|
||||
-- 'honza/vim-snippets',
|
||||
use {'L3MON4D3/LuaSnip',
|
||||
requires={
|
||||
'rafamadriz/friendly-snippets'
|
||||
},
|
||||
config=function()
|
||||
require("luasnip.loaders.from_snipmate").load()
|
||||
require("luasnip.loaders.from_vscode").load()
|
||||
end
|
||||
|
||||
}
|
||||
|
||||
use {'nvim-telescope/telescope.nvim',
|
||||
requires = {
|
||||
{'nvim-lua/plenary.nvim'},
|
||||
|
|
Loading…
Reference in a new issue