From 3bfbb680fb94c4c522a98fc45b3ce07d668c3f4c Mon Sep 17 00:00:00 2001
From: newbieQQ <qyh1510@gmail.com>
Date: Thu, 11 Jun 2026 15:21:18 +0800
Subject: [PATCH] fix: cmdline <CR> fallthrough when no selection

---
 lua/plugs/nvim-cmp.lua | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/lua/plugs/nvim-cmp.lua b/lua/plugs/nvim-cmp.lua
index 4e05e13..49076ad 100644
--- a/lua/plugs/nvim-cmp.lua
+++ b/lua/plugs/nvim-cmp.lua
@@ -105,7 +105,19 @@ return {
 
       -- 命令栏补全（Tab 导航，回车无选择时直接执行）
       require('cmp').setup.cmdline(':', {
-        mapping = cmp.mapping.preset.cmdline(),
+        mapping = {
+          ['<Tab>'] = cmp.mapping(cmp.mapping.select_next_item(), { 'c' }),
+          ['<S-Tab>'] = cmp.mapping(cmp.mapping.select_prev_item(), { 'c' }),
+          ['<CR>'] = cmp.mapping({
+            c = function(fallback)
+              if cmp.visible() and cmp.get_active_entry() then
+                cmp.confirm({ select = false })
+              else
+                fallback()
+              end
+            end,
+          }),
+        },
         sources = {
           { name = 'cmdline' },
           { name = 'path' },
@@ -114,7 +126,19 @@ return {
 
       -- 搜索栏补全
       require('cmp').setup.cmdline('/', {
-        mapping = cmp.mapping.preset.cmdline(),
+        mapping = {
+          ['<Tab>'] = cmp.mapping(cmp.mapping.select_next_item(), { 'c' }),
+          ['<S-Tab>'] = cmp.mapping(cmp.mapping.select_prev_item(), { 'c' }),
+          ['<CR>'] = cmp.mapping({
+            c = function(fallback)
+              if cmp.visible() and cmp.get_active_entry() then
+                cmp.confirm({ select = false })
+              else
+                fallback()
+              end
+            end,
+          }),
+        },
         sources = {
           { name = 'buffer' },
         }