From 8a3fb3ad45ef1225ddf6976a0b7a0b25901be0e1 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 4 Oct 2023 13:17:43 +0300
Subject: [PATCH] Nvim: fix luasnip keymappings

---
 home/.config/nvim/lua/plugins/cmp.lua     |  8 ++++----
 home/.config/nvim/lua/plugins/luasnip.lua | 23 ++---------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua
index 12fb381..b3d1240 100644
--- a/home/.config/nvim/lua/plugins/cmp.lua
+++ b/home/.config/nvim/lua/plugins/cmp.lua
@@ -32,7 +32,7 @@ return function()
         behavior = cmp.ConfirmBehavior.Replace,
         select = true,
       }),
-      ["<Tab>"] = function(fallback)
+      ["<Tab>"] = cmp.mapping(function(fallback)
         if cmp.visible() then
           cmp.select_next_item()
         elseif luasnip.expand_or_jumpable() then
@@ -40,8 +40,8 @@ return function()
         else
           fallback()
         end
-      end,
-      ["<S-Tab>"] = function(fallback)
+      end, { "i", "s" }),
+      ["<S-Tab>"] = cmp.mapping(function(fallback)
         if cmp.visible() then
           cmp.select_prev_item()
         elseif luasnip.jumpable(-1) then
@@ -49,7 +49,7 @@ return function()
         else
           fallback()
         end
-      end,
+      end, { "i", "s" }),
     },
     sources = {
       { name = "copilot" },
diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua
index 4142273..e89b9ac 100644
--- a/home/.config/nvim/lua/plugins/luasnip.lua
+++ b/home/.config/nvim/lua/plugins/luasnip.lua
@@ -1,23 +1,4 @@
 return function()
-	local luasnip = require("luasnip")
-	local wk = require("which-key")
-
-	-- load friendly-snippets to luasnip
-	require("luasnip/loaders/from_vscode").lazy_load()
-
-	-- Register snippet navigation keybindings
-	local snippet_mappings = {
-		["<c-j>"] = {
-			function()
-				luasnip.jump(1)
-			end,
-		},
-		["<c-k>"] = {
-			function()
-				luasnip.jump(-1)
-			end,
-		},
-	}
-	--wk.register(snippet_mappings, {mode = "i"})
-	--wk.register(snippet_mappings, {mode = "s"})
+  -- load friendly-snippets to luasnip
+  require("luasnip/loaders/from_vscode").lazy_load()
 end