From f52d4df56d2b726316492226b160bf61e7357121 Mon Sep 17 00:00:00 2001
From: Daniil Tsivinsky <daniil@tsivinsky.com>
Date: Sat, 9 Mar 2024 13:53:09 +0300
Subject: [PATCH] neovim: fix luasnip jumps & cmp select remaps

---
 neovim/.config/nvim/after/plugin/comp.lua | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/neovim/.config/nvim/after/plugin/comp.lua b/neovim/.config/nvim/after/plugin/comp.lua
index 240e8b0..50cd8ae 100644
--- a/neovim/.config/nvim/after/plugin/comp.lua
+++ b/neovim/.config/nvim/after/plugin/comp.lua
@@ -38,18 +38,22 @@ cmp.setup({
     end,
   },
   mapping = {
-    ["<C-j>"] = cmp.mapping(function()
+    ["<C-j>"] = cmp.mapping(function(fallback)
       if ls.jumpable(1) then
         ls.jump(1)
-      else
+      elseif cmp.visible() then
         cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
+      else
+        fallback()
       end
     end),
-    ["<C-k>"] = cmp.mapping(function()
+    ["<C-k>"] = cmp.mapping(function(fallback)
       if ls.jumpable(-1) then
         ls.jump(-1)
-      else
+      elseif cmp.visible() then
         cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select })
+      else
+        fallback()
       end
     end),
     ["<C-space>"] = cmp.mapping(function()