added friendly snippets
This commit is contained in:
		
							parent
							
								
									657913ee29
								
							
						
					
					
						commit
						08e050ed04
					
				
					 2 changed files with 30 additions and 19 deletions
				
			
		| 
						 | 
					@ -1,6 +1,5 @@
 | 
				
			||||||
--configure nvim-cmp for use with lsp and luasnip.
 | 
					--configure nvim-cmp for use with lsp and luasnip.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
-- Add additional capabilities supported by nvim-cmp
 | 
					-- Add additional capabilities supported by nvim-cmp
 | 
				
			||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
 | 
					local capabilities = vim.lsp.protocol.make_client_capabilities()
 | 
				
			||||||
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
 | 
					capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
 | 
				
			||||||
| 
						 | 
					@ -40,25 +39,25 @@ cmp.setup {
 | 
				
			||||||
			behavior = cmp.ConfirmBehavior.Replace,
 | 
								behavior = cmp.ConfirmBehavior.Replace,
 | 
				
			||||||
			select = true,
 | 
								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 = {
 | 
						sources = {
 | 
				
			||||||
		{ name = 'nvim_lsp' },
 | 
							{ name = 'nvim_lsp' },
 | 
				
			||||||
		{ name = 'luasnip' },
 | 
							{ name = 'luasnip' },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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',
 | 
						use {'nvim-telescope/telescope.nvim',
 | 
				
			||||||
		requires = {
 | 
							requires = {
 | 
				
			||||||
			{'nvim-lua/plenary.nvim'},
 | 
								{'nvim-lua/plenary.nvim'},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue