feat: only confirm autocomplete with enter if item selected

2022-05-18 10:22:09 +02:00 · 2022-05-18 10:22:09 +02:00 · 415fcc08ae
commit 415fcc08ae
parent fde2607ca2
1 changed files with 9 additions and 3 deletions
--- a/nvim/lua/plugins/nvim-cmp.lua
+++ b/nvim/lua/plugins/nvim-cmp.lua
@ -22,9 +22,15 @@ cmp.setup({
        { name = "calc" }
    }),
    mapping = {
-        ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(),
-            { 'i', 'c' }),
-        ['<CR>'] = cmp.mapping.confirm({ select = true }),
+        ["<C-Space>"] = cmp.mapping(cmp.mapping.complete(),
+            { "i", "c" }),
+        ["<CR>"] = cmp.mapping(function(fallback)
+            if cmp.visible() and cmp.get_selected_entry() then
+                cmp.confirm()
+            else
+                fallback()
+            end
+        end, { "i", "s" }),
        ["<Tab>"] = cmp.mapping(function(fallback)
            if cmp.visible() then
                cmp.select_next_item()