feat(cmp): make <CR> safer

ayamir · Jun 30, 2024 · 5c793ef · 5c793ef
1 parent bab5a72
commit 5c793ef
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/lua/modules/configs/completion/cmp.lua b/lua/modules/configs/completion/cmp.lua
@@ -127,7 +127,6 @@ return function()
  },
  -- You can set mappings if you want
  mapping = cmp.mapping.preset.insert({
- ["<CR>"] = cmp.mapping.confirm({ select = false, behavior = cmp.ConfirmBehavior.Replace }),
  ["<C-p>"] = cmp.mapping.select_prev_item(),
  ["<C-n>"] = cmp.mapping.select_next_item(),
  ["<C-d>"] = cmp.mapping.scroll_docs(-4),
@@ -151,6 +150,17 @@ return function()
  fallback()
  end
  end, { "i", "s" }),
+ ["<CR>"] = cmp.mapping({
+ i = function(fallback)
+ if cmp.visible() and cmp.get_active_entry() then
+ cmp.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = false })
+ else
+ fallback()
+ end
+ end,
+ s = cmp.mapping.confirm({ select = true }),
+ c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true }),
+ }),
  }),
  snippet = {
  expand = function(args)