Mercurial > dotfiles

changeset 594:e8615fbcf11b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix mappings for cmp
author zegervdv <zegervdv@me.com>
date Sun, 15 May 2022 11:34:13 +0200
parents ece4809c1313
children daa64dbb12f9
files .chezmoitemplates/init.lua
diffstat 1 files changed, 12 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/.chezmoitemplates/init.lua	Mon May 02 16:16:51 2022 +0200
+++ b/.chezmoitemplates/init.lua	Sun May 15 11:34:13 2022 +0200
@@ -302,41 +302,13 @@
           end,
         },
         mapping = {
-          ['<C-p>'] = cmp.mapping.select_prev_item(),
-          ['<C-n>'] = cmp.mapping.select_next_item(),
-          ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-          ['<C-y>'] = cmp.mapping.complete(),
-          ['<C-e>'] = cmp.mapping.close(),
-          ['<CR>'] = cmp.mapping.confirm {
-            behavior = cmp.ConfirmBehavior.Replace,
-          },
-          ['<Tab>'] = cmp.mapping(function(fallback)
-            if cmp.visible() then
-              cmp.select_next_item()
-            elseif luasnip.expand_or_jumpable() then
-              luasnip.expand_or_jump()
-            elseif has_words_before() then
-              cmp.complete()
-            else
-              fallback()
-            end
-          end, {
-            'i',
-            's',
-          }),
-
-          ['<S-Tab>'] = cmp.mapping(function(fallback)
-            if cmp.visible() then
-              cmp.select_prev_item()
-            elseif luasnip.jumpable(-1) then
-              luasnip.jump(-1)
-            else
-              fallback()
-            end
-          end, {
-            'i',
-            's',
-          }),
+          ['<C-p>'] = { i = cmp.mapping.select_prev_item() },
+          ['<C-n>'] = { i = cmp.mapping.select_next_item() },
+          ['<C-d>'] = { i = cmp.mapping.scroll_docs(-4) },
+          ['<C-y>'] = { i = cmp.mapping.complete() },
+          ['<C-e>'] = { i = cmp.mapping.close() },
+          ['<CR>'] = { i = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace } },
+          ['<C-k>'] = { i = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace } },
         },
         sources = {
           { name = 'nvim_lsp' },
@@ -352,7 +324,11 @@
       }
 
       cmp.setup.cmdline(':', {
-        mapping = cmp.mapping.preset.cmdline(),
+        mapping = cmp.mapping.preset.cmdline {
+          ['<C-p>'] = { c = cmp.mapping.select_prev_item() },
+          ['<C-n>'] = { c = cmp.mapping.select_next_item() },
+          ['<C-y>'] = { c = cmp.mapping.complete() },
+        },
         sources = cmp.config.sources({
           { name = 'path' },
         }, {