From d7595fbb6a1eeef1edb56589cc376ba17ce175b9 Mon Sep 17 00:00:00 2001
From: Chris <chris@macbook.local>
Date: Sat, 31 Jul 2021 15:22:15 -0400
Subject: tab complete is more consistent

---
 lua/core/compe.lua | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'lua/core/compe.lua')

diff --git a/lua/core/compe.lua b/lua/core/compe.lua
index 801e2dd8..82d27717 100644
--- a/lua/core/compe.lua
+++ b/lua/core/compe.lua
@@ -58,6 +58,12 @@ M.setup = function()
     end
   end
 
+  local remap = vim.api.nvim_set_keymap
+
+  remap("i", "<Tab>", 'pumvisible() ? "<C-n>" : "<Tab>"', { silent = true, noremap = true, expr = true })
+
+  remap("i", "<S-Tab>", 'pumvisible() ? "<C-p>" : "<S-Tab>"', { silent = true, noremap = true, expr = true })
+
   -- Use (s-)tab to:
   --- move to prev/next item in completion menuone
   --- jump to prev/next snippet's placeholder
@@ -101,11 +107,11 @@ end
 
 M.set_tab_keybindings = function()
   local file_type = vim.fn.expand "%:e"
-  if is_excluded(file_type) == false then
-    vim.api.nvim_buf_set_keymap(0, "i", "<Tab>", "v:lua.tab_complete()", { expr = true })
-    vim.api.nvim_buf_set_keymap(0, "s", "<Tab>", "v:lua.tab_complete()", { expr = true })
-    vim.api.nvim_buf_set_keymap(0, "i", "<S-Tab>", "v:lua.s_tab_complete()", { expr = true })
-    vim.api.nvim_buf_set_keymap(0, "s", "<S-Tab>", "v:lua.s_tab_complete()", { expr = true })
-  end
+  -- if is_excluded(file_type) == false then
+  --   vim.api.nvim_buf_set_keymap(0, "i", "<Tab>", "v:lua.tab_complete()", { expr = true })
+  --   vim.api.nvim_buf_set_keymap(0, "s", "<Tab>", "v:lua.tab_complete()", { expr = true })
+  --   vim.api.nvim_buf_set_keymap(0, "i", "<S-Tab>", "v:lua.s_tab_complete()", { expr = true })
+  --   vim.api.nvim_buf_set_keymap(0, "s", "<S-Tab>", "v:lua.s_tab_complete()", { expr = true })
+  -- end
 end
 return M
-- 
cgit v1.2.3