From 2961162ebaef96e4ffbc1e6c97dba0dc32efbbb0 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 19 May 2024 22:46:09 +0200
Subject: [PATCH] fix(cmp): use better cmp.confirm

---
 lua/lazyvim/plugins/coding.lua | 15 ++-------------
 lua/lazyvim/util/cmp.lua       | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua
index 4acd5b3b..b754eaf6 100644
--- a/lua/lazyvim/plugins/coding.lua
+++ b/lua/lazyvim/plugins/coding.lua
@@ -36,19 +36,8 @@ return {
           ["<C-f>"] = cmp.mapping.scroll_docs(4),
           ["<C-Space>"] = cmp.mapping.complete(),
           ["<C-e>"] = cmp.mapping.abort(),
-          ["<CR>"] = function(fallback)
-            if cmp.core.view:visible() or vim.fn.pumvisible() == 1 then
-              LazyVim.create_undo()
-              if cmp.confirm({ select = true }) then
-                return
-              end
-            end
-            return fallback()
-          end,
-          ["<S-CR>"] = cmp.mapping.confirm({
-            behavior = cmp.ConfirmBehavior.Replace,
-            select = true,
-          }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+          ["<CR>"] = LazyVim.cmp.confirm(),
+          ["<S-CR>"] = LazyVim.cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
           ["<C-CR>"] = function(fallback)
             cmp.abort()
             fallback()
diff --git a/lua/lazyvim/util/cmp.lua b/lua/lazyvim/util/cmp.lua
index 037f48e6..3343245a 100644
--- a/lua/lazyvim/util/cmp.lua
+++ b/lua/lazyvim/util/cmp.lua
@@ -36,4 +36,25 @@ function M.add_missing_snippet_docs(window)
   end
 end
 
+-- This is a better implementation of `cmp.confirm`:
+--  * check if the completion menu is visible without waiting for running sources
+--  * create an undo point before confirming
+-- This function is both faster and more reliable.
+---@param opts? {select: boolean, behavior: cmp.ConfirmBehavior}
+function M.confirm(opts)
+  local cmp = require("cmp")
+  opts = vim.tbl_extend("force", {
+    select = true,
+    behavior = cmp.ConfirmBehavior.Insert,
+  }, opts or {})
+  return function(fallback)
+    if cmp.core.view:visible() or vim.fn.pumvisible() == 1 then
+      LazyVim.create_undo()
+      if cmp.confirm(opts) then
+        return
+      end
+    end
+    return fallback()
+  end
+end
 return M