From ed32743a88f6678bd493c676aa45bfe762cda99e Mon Sep 17 00:00:00 2001
From: Warren Hood <nullbyte001@gmail.com>
Date: Sun, 13 Nov 2022 06:11:33 +0200
Subject: [PATCH] Add luasnip

---
 neovim/.config/nvim/LuaSnip/all.lua              |  7 +++++++
 .../.config/nvim/lua/warrenhood/cmp-config.lua   |  4 ++--
 neovim/.config/nvim/lua/warrenhood/keybinds.lua  | 16 ++++++++++++++--
 .../nvim/lua/warrenhood/plugins-config.lua       | 10 ++++++++++
 neovim/.config/nvim/lua/warrenhood/plugins.lua   |  4 ++--
 5 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 neovim/.config/nvim/LuaSnip/all.lua

diff --git a/neovim/.config/nvim/LuaSnip/all.lua b/neovim/.config/nvim/LuaSnip/all.lua
new file mode 100644
index 0000000..566dd07
--- /dev/null
+++ b/neovim/.config/nvim/LuaSnip/all.lua
@@ -0,0 +1,7 @@
+local ls = require("luasnip")
+local s = ls.snippet
+
+return {
+    ls.parser.parse_snippet("test", "fn $1($2) {\n$0}"),
+}
+
diff --git a/neovim/.config/nvim/lua/warrenhood/cmp-config.lua b/neovim/.config/nvim/lua/warrenhood/cmp-config.lua
index 3989cfc..95095d8 100644
--- a/neovim/.config/nvim/lua/warrenhood/cmp-config.lua
+++ b/neovim/.config/nvim/lua/warrenhood/cmp-config.lua
@@ -5,7 +5,7 @@ cmp.setup({
 	snippet = {
 		-- REQUIRED - you must specify a snippet engine
 		expand = function(args)
-			vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+			require('luasnip').lsp_expand(args.body)
 		end,
 		vim.lsp.buf.format,
 	},
@@ -26,7 +26,7 @@ cmp.setup({
 	}),
 	sources = cmp.config.sources({
 		{ name = "nvim_lsp" },
-		{ name = "vsnip" }, -- For vsnip users.
+		{ name = "luasnip" },
 		{ name = "treesitter" },
 	}, {
 		{ name = "buffer" },
diff --git a/neovim/.config/nvim/lua/warrenhood/keybinds.lua b/neovim/.config/nvim/lua/warrenhood/keybinds.lua
index abdd00d..0715e79 100644
--- a/neovim/.config/nvim/lua/warrenhood/keybinds.lua
+++ b/neovim/.config/nvim/lua/warrenhood/keybinds.lua
@@ -29,7 +29,7 @@ map('n', '<C-B>', ':NvimTreeToggle<CR>')
 map('n', '<S-t>', ':ToggleTerm<CR>')
 map('t', '<S-t>', '<C-\\><C-n>:ToggleTerm<CR>')
 
--- Pane navigation
+--[[ -- Pane navigation
 map('n', '<C-h>', ':wincmd h<CR>')
 map('n', '<C-j>', ':wincmd j<CR>')
 map('n', '<C-k>', ':wincmd k<CR>')
@@ -38,8 +38,20 @@ map('n', '<C-l>', ':wincmd l<CR>')
 map('t', '<C-h>', '<C-\\><C-n>:wincmd h<CR>')
 map('t', '<C-j>', '<C-\\><C-n>:wincmd j<CR>')
 map('t', '<C-k>', '<C-\\><C-n>:wincmd k<CR>')
-map('t', '<C-l>', '<C-\\><C-n>:wincmd l<CR>')
+map('t', '<C-l>', '<C-\\><C-n>:wincmd l<CR>') ]]
 
 -- Pane management
 map('n', '<leader>sv', ':vsplit<CR>', { desc = 'Split Vertical' })
 map('n', '<leader>sh', ':split<CR>', { desc = 'Split Horizontal' })
+
+
+-- luasnip
+vim.cmd[[
+" Use Tab to expand and jump through snippets
+imap <silent><expr> <C-k> luasnip#expand_or_jumpable() ? '<Plug>luasnip-expand-or-jump' : '<Tab>' 
+smap <silent><expr> <C-k> luasnip#jumpable(1) ? '<Plug>luasnip-jump-next' : '<Tab>'
+
+" Use Shift-Tab to jump backwards through snippets
+imap <silent><expr> <C-j> luasnip#jumpable(-1) ? '<Plug>luasnip-jump-prev' : '<S-Tab>'
+smap <silent><expr> <C-j> luasnip#jumpable(-1) ? '<Plug>luasnip-jump-prev' : '<S-Tab>'
+]]
diff --git a/neovim/.config/nvim/lua/warrenhood/plugins-config.lua b/neovim/.config/nvim/lua/warrenhood/plugins-config.lua
index 11bc1a9..49eb397 100644
--- a/neovim/.config/nvim/lua/warrenhood/plugins-config.lua
+++ b/neovim/.config/nvim/lua/warrenhood/plugins-config.lua
@@ -24,4 +24,14 @@ require'nvim-treesitter.configs'.setup {
 }
 
 
+-- luasnip config
+require("luasnip").config.set_config({ -- Setting LuaSnip config
 
+  -- Enable autotriggered snippets
+  enable_autosnippets = true,
+
+  -- Use Tab (or some other key if you prefer) to trigger visual selection
+  store_selection_keys = "<Tab>",
+})
+
+require("luasnip.loaders.from_lua").load({paths = "~/.config/nvim/LuaSnip/"})
diff --git a/neovim/.config/nvim/lua/warrenhood/plugins.lua b/neovim/.config/nvim/lua/warrenhood/plugins.lua
index 139d963..713ee1b 100644
--- a/neovim/.config/nvim/lua/warrenhood/plugins.lua
+++ b/neovim/.config/nvim/lua/warrenhood/plugins.lua
@@ -36,8 +36,8 @@ require("packer").startup(function()
     use("hrsh7th/cmp-path")
     use("hrsh7th/cmp-cmdline")
     use("hrsh7th/nvim-cmp")
-    use("hrsh7th/cmp-vsnip")
-    use("hrsh7th/vim-vsnip")
+    use("saadparwaiz1/cmp_luasnip")
+    use("L3MON4D3/LuaSnip")
 
     -- Treesitter
     use("nvim-treesitter/nvim-treesitter")