From 362a77e60da41e7418b146fc74f9463c81fc3c01 Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Wed, 3 Nov 2021 10:57:08 -0700
Subject: [PATCH] feat: update cmp mappings, fix: auto session save issues when
 notification is present

---
 lua/cosmic/lsp/autocomplete.lua | 25 +++++++++++++++++++++----
 lua/cosmic/pluginsInit.lua      |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lua/cosmic/lsp/autocomplete.lua b/lua/cosmic/lsp/autocomplete.lua
index 24dcc94..a3bc82e 100644
--- a/lua/cosmic/lsp/autocomplete.lua
+++ b/lua/cosmic/lsp/autocomplete.lua
@@ -20,10 +20,13 @@ M.init = function()
       end,
     },
     mapping = {
-      ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-      ['<C-u>'] = cmp.mapping.scroll_docs(4),
-      ['<C-Space>'] = cmp.mapping.complete(),
-      ['<C-e>'] = cmp.mapping.close(),
+      ['<C-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+      ['<C-u>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
+      ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
+      ['<C-e>'] = cmp.mapping({
+        i = cmp.mapping.abort(),
+        c = cmp.mapping.close(),
+      }),
       -- disabled for autopairs mapping
       ['<CR>'] = cmp.mapping.confirm({
         behavior = cmp.ConfirmBehavior.Replace,
@@ -83,6 +86,20 @@ M.init = function()
       }),
     },
   })
+
+  cmp.setup.cmdline('/', {
+    sources = {
+      { name = 'buffer' },
+    },
+  })
+
+  cmp.setup.cmdline(':', {
+    sources = cmp.config.sources({
+      { name = 'path' },
+    }, {
+      { name = 'cmdline' },
+    }),
+  })
 end
 
 M.autopairs = function()
diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/pluginsInit.lua
index 25663a0..5d6d155 100644
--- a/lua/cosmic/pluginsInit.lua
+++ b/lua/cosmic/pluginsInit.lua
@@ -203,7 +203,7 @@ return packer.startup(function()
     event = 'VimEnter',
     config = function()
       require('auto-session').setup({
-        pre_save_cmds = { 'NvimTreeClose', 'cclose' },
+        pre_save_cmds = { 'NvimTreeClose', 'cclose', 'lua vim.notify.dismiss()' },
       })
     end,
     disable = vim.tbl_contains(user_plugins.disable, 'auto-session'),