From 08e050ed0419bf770071c9a1fa084cecefab2f7f Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Fri, 4 Feb 2022 14:10:05 -0600 Subject: [PATCH] added friendly snippets --- neovim/.config/nvim/lua/cmp-lsp.lua | 37 ++++++++++++++-------------- neovim/.config/nvim/lua/packages.lua | 12 +++++++++ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/neovim/.config/nvim/lua/cmp-lsp.lua b/neovim/.config/nvim/lua/cmp-lsp.lua index 3bd78b7..a83ddee 100644 --- a/neovim/.config/nvim/lua/cmp-lsp.lua +++ b/neovim/.config/nvim/lua/cmp-lsp.lua @@ -1,6 +1,5 @@ --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) @@ -40,25 +39,25 @@ cmp.setup { behavior = cmp.ConfirmBehavior.Replace, select = true, }, - [''] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [''] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = 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' }, diff --git a/neovim/.config/nvim/lua/packages.lua b/neovim/.config/nvim/lua/packages.lua index e9c2d62..8d265c9 100644 --- a/neovim/.config/nvim/lua/packages.lua +++ b/neovim/.config/nvim/lua/packages.lua @@ -34,6 +34,18 @@ 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'},