Revert "added friendly snippets"
caused problems with keybindings for autocomplete. This reverts commit c9aa2dca270ee1aee9931a545c39d8fdf348c097.
This commit is contained in:
		
							parent
							
								
									ab89a6e353
								
							
						
					
					
						commit
						ae1fcff4be
					
				
					 2 changed files with 19 additions and 30 deletions
				
			
		| 
						 | 
					@ -1,5 +1,6 @@
 | 
				
			||||||
--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)
 | 
				
			||||||
| 
						 | 
					@ -39,7 +40,6 @@ cmp.setup {
 | 
				
			||||||
			behavior = cmp.ConfirmBehavior.Replace,
 | 
								behavior = cmp.ConfirmBehavior.Replace,
 | 
				
			||||||
			select = true,
 | 
								select = true,
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
	},
 | 
					 | 
				
			||||||
		['<Tab>'] = function(fallback)
 | 
							['<Tab>'] = function(fallback)
 | 
				
			||||||
			if cmp.visible() then
 | 
								if cmp.visible() then
 | 
				
			||||||
				cmp.select_next_item()
 | 
									cmp.select_next_item()
 | 
				
			||||||
| 
						 | 
					@ -58,6 +58,7 @@ cmp.setup {
 | 
				
			||||||
				fallback()
 | 
									fallback()
 | 
				
			||||||
			end
 | 
								end
 | 
				
			||||||
		end,
 | 
							end,
 | 
				
			||||||
 | 
						},
 | 
				
			||||||
	sources = {
 | 
						sources = {
 | 
				
			||||||
		{ name = 'nvim_lsp' },
 | 
							{ name = 'nvim_lsp' },
 | 
				
			||||||
		{ name = 'luasnip' },
 | 
							{ 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',
 | 
						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