wip

lua/plugins/completions.lua

@@ -3,51 +3,79 @@ return {
 	"hrsh7th/cmp-nvim-lsp",
     },
     {
-	'L3MON4AD3/LuaSnip',
-	dependencies ={
-	    'saadpawaiz1/cmp_luasnip',
-	    'rafamadriz/friendly-snippets'
-	},
+	"L3MON4AD3/LuaSnip",
+	version="V2.*"
     },
     {
-	'hrsh7th/nvim-cmp',
+	"saadpawaiz1/cmp_luasnip",
+    },
+    {
+	"rafamadriz/friendly-snippets"
+    },
+    {
+	"hrsh7th/nvim-cmp",
+	event = { "InsertEnter", "CmdlineEnter" },
 	config = function()
-	    -- Set up nvim-cmp.
-	    local cmp = require'cmp'
+	    local luasnip = require("luasnip")
+	    local cmp = require("cmp")
 	    require("luasnip.loaders.from_vscode").lazy_load()
 
 	    cmp.setup({
 		snippet = {
 		    expand = function(args)
-			require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+			require("luasnip").lsp_expand(args.body) 
 		    end,
 		},
 		window = {
 		    completion = cmp.config.window.bordered(),
 		    documentation = cmp.config.window.bordered(),
 		},
-		mapping = cmp.mapping.preset.insert({
-		    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-		    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-		    ['<C-Space>'] = cmp.mapping.complete(),
-		    ['<C-e>'] = cmp.mapping.abort(),
-		    ['<CR>'] = cmp.mapping.confirm({ select = true }), 
-		}),
+		mapping = {
+
+		    -- ... Your other mappings ...
+		    ['<CR>'] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+			    if luasnip.expandable() then
+				luasnip.expand()
+			    else
+				cmp.confirm({
+				    select = true,
+				})
+			    end
+			else
+			    fallback()
+			end
+		    end),
+
+		    ["<Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+			    cmp.select_next_item()
+			elseif luasnip.locally_jumpable(1) then
+			    luasnip.jump(1)
+			else
+			    fallback()
+			end
+		    end, { "i", "s" }),
+
+		    ["<S-Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+			    cmp.select_prev_item()
+			elseif luasnip.locally_jumpable(-1) then
+			    luasnip.jump(-1)
+			else
+			    fallback()
+			end
+		    end, { "i", "s" }),
+		},
+
 		sources = cmp.config.sources({
-		    { name = 'nvim_lsp' },
-		    { name = 'luasnip' }, -- For luasnip users.
+		    { name = "nvim_lsp" },
+		    { name = "luasnip" },
 		}, {
-		    { name = 'buffer' },
+		    { name = "buffer" },
 		})
 	    })
 
-	    -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
-	    cmp.setup.cmdline({ '/', '?' }, {
-		mapping = cmp.mapping.preset.cmdline(),
-		sources = {
-		    { name = 'buffer' }
-		}
-	    })
 	end
     }
 }