From fc76d8c0996b6c1c4b7d1444fdc7b1fe74f02061 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sat, 3 Sep 2022 00:55:10 +0300
Subject: [PATCH] Neovim: add mappings for snippet navigation

---
 home/.config/nvim/lua/plugins/cmp.lua | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua
index 45ffa55..04cc4dd 100644
--- a/home/.config/nvim/lua/plugins/cmp.lua
+++ b/home/.config/nvim/lua/plugins/cmp.lua
@@ -10,12 +10,10 @@ return function()
 
     -- nvim-cmp setup
     local cmp = require 'cmp'
+    if not cmp then return end
+
     cmp.setup {
-        snippet = {
-            expand = function(args)
-                require('luasnip').lsp_expand(args.body)
-            end
-        },
+        snippet = {expand = function(args) luasnip.lsp_expand(args.body) end},
         mapping = {
             ['<C-p>'] = cmp.mapping.select_prev_item(),
             ['<C-n>'] = cmp.mapping.select_next_item(),
@@ -59,4 +57,14 @@ return function()
 
     -- load friendly-snippets to luasnip
     require('luasnip/loaders/from_vscode').lazy_load()
+
+    -- Register snippet parameter navigation keybindings
+    local mappings = {
+        ['<c-j>'] = {luasnip.jump(1)},
+        ['<c-k>'] = {luasnip.jump(-1)}
+    }
+
+    local wk = require('which-key')
+    wk.register(mappings, {mode = "n"})
+    wk.register(mappings, {mode = "s"})
 end