bugfix for #356

Author: jayli

README-cn.md

@@ -23,7 +23,7 @@ https://github.com/user-attachments/assets/30c265f3-e65c-47d0-8762-e9e8250d7b4d
 
 ## 安装
 
-Vim 8.2 及以上版本，Neovim 0.6.0 及以上，支持 MacOS/Linux/FreeBSD。
+Vim 8.2 及以上版本，Neovim 0.7.0 及以上，支持 MacOS/Linux/FreeBSD。
 
 lua 配置（基于 Packer.nvim ）：
 
@@ -48,6 +48,16 @@ vim.keymap.set('n', 'gd', ':EasyCompleteGotoDefinition<CR>')
 vim.keymap.set('n', 'rn', ':EasyCompleteRename<CR>')
 vim.keymap.set('n', 'gb', ':BackToOriginalBuffer<CR>')
 
+-- 关闭 pum 菜单
+-- vim.keymap.set('i', '<C-M>', '<Plug>EasycompleteClosePum')
+
+-- 重新定义 Tab/s-tab 建（选择上一个和下一个）
+-- vim.g.easycomplete_tab_trigger = "<C-J>"
+-- vim.g.easycomplete_shift_tab_trigger = "<C-K>"
+
+-- 重新定义回车键
+-- vim.g.easycomplete_use_default_cr = 0
+-- vim.keymap.set('i', '<C-L>', '<Plug>EasycompleteCR')
 ```
 执行 `:PackerInstall`
 
@@ -74,6 +84,17 @@ noremap gr :EasyCompleteReference<CR>
 noremap gd :EasyCompleteGotoDefinition<CR>
 noremap rn :EasyCompleteRename<CR>
 noremap gb :BackToOriginalBuffer<CR>
+
+" 关闭 pum 菜单
+" inoremap <C-M> <Plug>EasycompleteClosePum
+
+" 选择上一个和下一个的快捷键
+" let g:easycomplete_tab_trigger = "<C-J>"
+" let g:easycomplete_shift_tab_trigger = "<C-K>"
+
+" 重新定义回车键
+" let g:easycomplete_use_default_cr = 0
+" inoremap <C-L> <Plug>EasycompleteCR
 ```
 执行 `:PlugInstall`.
 
@@ -144,6 +165,7 @@ noremap gb :BackToOriginalBuffer<CR>
 | `g:easycomplete_pum_format`          | `["abbr", "kind", "menu"]`| 匹配项格式                                      |
 | `g:easycomplete_menu_abbr`           | 1             | 匹配菜单里menu字段是否显示简写，否则显示全称                |
 | `g:easycomplete_custom_snippet`      | `""`          | 自定义 snippets 路径                                        |
+| `g:easycomplete_use_default_cr`      | 1             | 是否使用默认回车的事件绑定                                  |
 
 ## 语言支持
 

README.md

@@ -49,6 +49,16 @@ vim.keymap.set('n', 'gd', ':EasyCompleteGotoDefinition<CR>')
 vim.keymap.set('n', 'rn', ':EasyCompleteRename<CR>')
 vim.keymap.set('n', 'gb', ':BackToOriginalBuffer<CR>')
 
+-- close pum keymap
+-- vim.keymap.set('i', '<C-M>', '<Plug>EasycompleteClosePum')
+
+-- Select next/previous pum items Keymap
+-- vim.g.easycomplete_tab_trigger = "<C-J>"
+-- vim.g.easycomplete_shift_tab_trigger = "<C-K>"
+
+-- Redefine CR action
+-- vim.g.easycomplete_use_default_cr = 0
+-- vim.keymap.set('i', '<C-L>', '<Plug>EasycompleteCR')
 ```
 Run `:PackerInstall`
 
@@ -77,6 +87,17 @@ noremap gr :EasyCompleteReference<CR>
 noremap gd :EasyCompleteGotoDefinition<CR>
 noremap rn :EasyCompleteRename<CR>
 noremap gb :BackToOriginalBuffer<CR>
+
+" Close pum keymap
+" inoremap <C-M> <Plug>EasycompleteClosePum
+
+" Select Matched items Keymap
+" let g:easycomplete_tab_trigger = "<C-J>"
+" let g:easycomplete_shift_tab_trigger = "<C-K>"
+
+" Redefine CR action
+" let g:easycomplete_use_default_cr = 0
+" inoremap <C-L> <Plug>EasycompleteCR
 ```
 Run `:PlugInstall`.
 
@@ -149,6 +170,7 @@ Global configurations:
 | `g:easycomplete_pum_format`          | `["abbr", "kind", "menu"]`| Pmenu format                                      |
 | `g:easycomplete_menu_abbr`           | 1             | Show abbr(shortname) at pum `menu` position, or show fullname |
 | `g:easycomplete_custom_snippet`      | `""`          | Custom snippets path                                          |
+| `g:easycomplete_use_default_cr`      | 1             | enable or disable default cr action                           |
 
 Typing `:h easycomplete` for help.
 

autoload/easycomplete.vim

@@ -191,6 +191,10 @@ function! s:BindingTypingCommandOnce()
     call s:errlog("[ERR]", 'Diagnostic jumping map-key conflict', v:exception)
   endtry
 
+  if g:easycomplete_use_default_cr
+    inoremap <CR> <Plug>EasycompleteCR
+  endif
+
   " TODO 不生效
   " inoremap <Tab> <Plug>EasycompleteTabTrigger
   " 重定向 Tag 的跳转按键绑定，和默认<c-]>功能一致
@@ -1516,7 +1520,7 @@ function! easycomplete#CtlE()
 endfunction
 
 function! easycomplete#close()
-  call easycomplete#CtlE()
+  return easycomplete#CtlE()
 endfunction
 
 function! s:ExpandLuaSnipManually(body)

plugin/easycomplete.vim

@@ -123,6 +123,9 @@ endif
 if !exists("g:easycomplete_lsp_checking")
   let g:easycomplete_lsp_checking = 1
 endif
+if !exists("g:easycomplete_use_default_cr")
+  let g:easycomplete_use_default_cr = 1
+endif
 if !exists("g:easycomplete_lsp_type_font")
   let g:easycomplete_lsp_type_font = {}
 endif
@@ -613,19 +616,22 @@ command! EasyCompleteRename : call easycomplete#rename()
 command! EasyCompleteAiCoding : call easycomplete#AiCoding()
 command! BackToOriginalBuffer : call easycomplete#BackToOriginalBuffer()
 
-inoremap <expr> <CR> easycomplete#TypeEnterWithPUM()
 inoremap <expr> <Up> easycomplete#Up()
 inoremap <expr> <Down> easycomplete#Down()
+" CR 行为改为可定义
+" inoremap <CR> <Plug>EasycompleteCR
 if g:env_is_nvim
   inoremap <expr> <C-N> easycomplete#CtlN()
   inoremap <expr> <C-P> easycomplete#CtlP()
-  inoremap <expr> <C-E> easycomplete#CtlE()
   inoremap <expr> <Left> easycomplete#Left()
   inoremap <expr> <Right> easycomplete#Right()
+  inoremap <C-E> <Plug>EasycompleteClosePum
 endif
 inoremap <silent><expr> <BS> easycomplete#BackSpace()
 inoremap  <Plug>EasycompleteTabTrigger <c-r>=easycomplete#CleverTab()<cr>
 inoremap  <Plug>EasycompleteShiftTabTrigger <c-r>=easycomplete#CleverShiftTab()<cr>
 inoremap  <silent><Plug>EasycompleteRefresh <C-r>=easycomplete#refresh()<CR>
 inoremap  <Plug>EasycompleteNill <C-r>=easycomplete#nill()<CR>
+inoremap  <expr><Plug>EasycompleteClosePum  easycomplete#close()
+inoremap  <expr><Plug>EasycompleteCR easycomplete#TypeEnterWithPUM()
 inoremap  <Plug>EasycompleteExpandSnippet  <C-R>=UltiSnips#ExpandSnippet()<cr>