From f9569c4c426ec22336710688f8489b28296fca06 Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Thu, 13 Jul 2023 02:11:54 +0200
Subject: [PATCH] vim: clean up completion keymap

---
 config/nvim/lua/user/plugins/completion.lua | 74 +++++++++------------
 1 file changed, 33 insertions(+), 41 deletions(-)

diff --git a/config/nvim/lua/user/plugins/completion.lua b/config/nvim/lua/user/plugins/completion.lua
index d093b43..ad41de0 100644
--- a/config/nvim/lua/user/plugins/completion.lua
+++ b/config/nvim/lua/user/plugins/completion.lua
@@ -1,54 +1,46 @@
 local config = function()
   local cmp = require('cmp')
 
-  local map = setmetatable({
-    complete_or_select_next = function()
-      if cmp.visible() then
-        cmp.select_next_item { behavior = cmp.SelectBehavior.Select }
-      else
-        cmp.complete()
+  local when = function(condition)
+    local default = function(fallback) fallback() end
+    return function(opts)
+      local yes = opts.yes or default
+      local no  = opts.no  or default
+      return function(fallback)
+        if condition() then yes(fallback) else no(fallback) end
       end
-    end,
+    end
+  end
 
-    complete_or_select_previous = function()
-      if cmp.visible() then
-        cmp.select_prev_item { behavior = cmp.SelectBehavior.Select }
-      else
-        cmp.complete()
-      end
+  local keymap = setmetatable({}, {
+    __newindex = function(t, k, v)
+      rawset(t, k, { i = v, c = v})
     end,
-
-    tab_completion = function(fallback)
-      if cmp.visible() then
-        cmp.complete_common_string()
-      elseif vim.fn.mode() == 'c' then
-        cmp.complete()
-      else
-        fallback()
-      end
-    end,
-  }, {
-    -- Make `func` available in [i]nsert and [c]mdline modes.
-    __call = function(_, func) return { i = func, c = func } end
   })
 
-  local keymap = {
-    ['<c-n>']     = map(map.complete_or_select_next),
-    ['<c-p>']     = map(map.complete_or_select_previous),
-
-    ['<down>']    = map(cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Select }),
-    ['<up>']      = map(cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Select }),
-
-    ['<c-f>']     = map(cmp.mapping.scroll_docs(4)),
-    ['<s-down>']  = map(cmp.mapping.scroll_docs(4)),
-    ['<c-b>']     = map(cmp.mapping.scroll_docs(-4)),
-    ['<s-up>']    = map(cmp.mapping.scroll_docs(-4)),
-
-    ['<c-e>']     = map(cmp.mapping.abort()),
-    ['<c-y>']     = map(cmp.mapping.confirm { select = true }),
-    ['<tab>']     = map(map.tab_completion),
+  keymap['<c-n>'] = when(cmp.visible) {
+    yes = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Select },
+    no  = cmp.mapping.complete(),
   }
 
+  keymap['<c-p>'] = when(cmp.visible) {
+    yes = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Select },
+    no = cmp.mapping.complete(),
+  }
+
+  keymap['<down>'] = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Select }
+  keymap['<up>']   = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Select }
+
+  keymap['<c-f>']    = cmp.mapping.scroll_docs(4)
+  keymap['<s-down>'] = cmp.mapping.scroll_docs(4)
+  keymap['<c-b>']    = cmp.mapping.scroll_docs(-4)
+  keymap['<s-up>']   = cmp.mapping.scroll_docs(-4)
+
+  keymap['<c-e>'] = cmp.mapping.abort()
+  keymap['<c-y>'] = cmp.mapping.confirm { select = true }
+  keymap['<tab>'] = when(cmp.visible) { yes = cmp.mapping.confirm { select = true } }
+
+
   cmp.setup {
     mapping = keymap,