for #362

Author: jayli

autoload/easycomplete.vim

@@ -2805,8 +2805,8 @@ function! easycomplete#BackToOriginalBuffer()
   call easycomplete#action#reference#back()
 endfunction
 
-function! easycomplete#CmdlineEnter()
-  call easycomplete#cmdline#enter()
+function! easycomplete#CmdlineEnter(...)
+  return call('easycomplete#cmdline#enter', a:000)
 endfunction
 
 function! easycomplete#CmdlineLeave()

autoload/easycomplete/cmdline.vim

@@ -17,13 +17,11 @@ function! easycomplete#cmdline#LazyComplete()
 endfunction
 
 function! easycomplete#cmdline#enter()
-  " call s:console("cmdline enter")
-  let g:easycomplete_cmdline_typing = 1
+  return
 endfunction
 
 function! easycomplete#cmdline#leave()
-  let g:easycomplete_cmdline_typing = 0
-  call easycomplete#pum#close()
+  return
 endfunction
 
 function! easycomplete#cmdline#typing()

autoload/easycomplete/pum.vim

@@ -190,7 +190,7 @@ function! s:OpenPum(startcol, lines)
   call s:InitBuffer(a:lines)
   let buffer_size = s:GetBufSize(a:lines)
   let pum_pos = s:ComputePumPos(a:startcol, buffer_size)
-  if easycomplete#cmdline#typing()
+  if exists("g:easycomplete_cmdline_typing") && g:easycomplete_cmdline_typing == 1
     let pum_pos.row = &window
   endif
   let pum_opts = deepcopy(s:default_pum_pot)
@@ -373,10 +373,16 @@ endfunction
 
 function! easycomplete#pum#next()
   call s:SelectNext()
+  if exists("g:easycomplete_cmdline_typing") && g:easycomplete_cmdline_typing == 1
+    redraw
+  endif
 endfunction
 
 function! easycomplete#pum#prev()
   call s:SelectPrev()
+  if exists("g:easycomplete_cmdline_typing") && g:easycomplete_cmdline_typing == 1
+    redraw
+  endif
 endfunction
 
 function! easycomplete#pum#CompleteCursored()

lua/easycomplete/cmdline.lua

@@ -4,25 +4,10 @@ local console = Util.console
 local normal_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRST0123456789#$_"
 local M = {}
 
-function pum_complete()
-  print(get_typing_word())
-  local word = get_typing_word()
-  local t = {
-    {
-      word = "s",
-      abbr = word,
-      kind = "x",
-      menu = "x"
-    },
-    {
-      word = "abcd",
-      abbr = "abcd",
-      kind = "x",
-      menu = "x"
-    }
-  }
+function pum_complete(menu_items, typing_word)
+  local word = typing_word
   local start_col = vim.fn.getcmdpos() - calculate_sign_and_linenr_width() - #word
-  vim.fn["easycomplete#pum#complete"](start_col, t)
+  vim.fn["easycomplete#pum#complete"](start_col, menu_items)
 end
 
 function pum_close()
@@ -61,37 +46,102 @@ function calculate_sign_and_linenr_width()
   return width
 end
 
+function flush()
+  vim.g.easycomplete_cmdline_pattern = ""
+  vim.g.easycomplete_cmdline_typing = 0
+  pum_close()
+end
+
+function pum_next()
+  vim.fn['easycomplete#CleverTab']()
+  return ""
+end
+
+function pum_prev()
+  vim.fn['easycomplete#pum#prev']()
+  return ""
+end
+
 local function bind_cmdline_event()
+  local augroup = vim.api.nvim_create_augroup('CustomCmdlineComplete', { clear = true })
+
+  vim.api.nvim_create_autocmd("CmdlineEnter", {
+      group = augroup,
+      pattern = ":",
+      callback = function()
+        vim.g.easycomplete_cmdline_pattern = ":"
+      end,
+    })
+  vim.api.nvim_create_autocmd("CmdlineEnter", {
+      group = augroup,
+      pattern = "/",
+      callback = function()
+        vim.g.easycomplete_cmdline_pattern = "/"
+      end,
+    })
+  vim.cmd [[
+    cnoremap <expr> <Tab> easycomplete#CleverTab()
+    cnoremap <expr> <S-Tab> easycomplete#CleverShiftTab()
+  ]]
+  vim.api.nvim_create_autocmd("CmdlineLeave", {
+      group = augroup,
+      callback = function()
+        flush()
+      end
+    })
   vim.on_key(function(keys, _)
-    -- 这里不论是否是插入模式，都会触发，需要过滤掉
     if vim.api.nvim_get_mode().mode ~= "c" then
       return
     end
-    -- 将按键字节序列转换为字符串
     local key_str = vim.api.nvim_replace_termcodes(keys, true, false, true)
-
+    vim.g.easycomplete_cmdline_typing = 1
     vim.defer_fn(function()
-      pum_complete()
-      console(string.byte(key_str))
-      if string.byte(key_str) == 9 then
-        console("Tab 键被按下")
-      elseif string.byte(key_str) == 32 then
-        console("空格键被按下")
-        pum_close()
-      elseif string.byte(key_str) == 8 or string.byte(key_str) == 128 then
-        console("退格键被按下")
-      elseif string.byte(key_str) == 13 then
-        console("回车键被按下")
-      else
-        console("其他键被按下: " .. keys)
-      end
-      -- console(key_str)
-      vim.cmd("redraw")
-      -- vim.fn["easycomplete#CmdlineChanged"](key_str)
+      vim.schedule(function()
+        cmdline_handler(keys, key_str)
+      end)
     end, 10)
   end)
 end
 
+function normalize_list(arr)
+  if #arr == 0 then return arr end
+  local ret = {}
+  for index, value in ipairs(arr) do
+    table.insert(ret, {
+        word = arr[index],
+        abbr = arr[index],
+        kind = vim.g.easycomplete_kindflag_cmdline,
+        menu = vim.g.easycomplete_menuflag_cmdline
+      })
+  end
+  return ret
+end
+
+function cmdline_handler(keys, key_str)
+  if vim.g.easycomplete_cmdline_pattern == "" then
+    return
+  end
+  local cmdline = vim.fn.getcmdline()
+  local typing_word = get_typing_word()
+  local menu_items = vim.fn.getcompletion(typing_word, "cmdline")
+  if string.byte(key_str) == 9 then
+    console("Tab 键被按下")
+  elseif string.byte(key_str) == 32 then
+    console("空格键被按下")
+    pum_close()
+  elseif string.byte(key_str) == 8 or string.byte(key_str) == 128 then
+    console("退格键被按下")
+    pum_close()
+  elseif string.byte(key_str) == 13 then
+    console("回车键被按下")
+    pum_close()
+  else
+    console("其他键被按下: " .. keys)
+    pum_complete(normalize_list(menu_items), typing_word)
+  end
+  vim.cmd("redraw")
+end
+
 
 function M.init_once()
   -- TODO here -----------------------------
@@ -101,6 +151,9 @@ function M.init_once()
     return
   end
   vim.g.easycomplete_cmdline_loaded = 1
+
+  vim.g.easycomplete_cmdline_pattern = ""
+  vim.g.easycomplete_cmdline_typing = 0
   bind_cmdline_event()
 end
 

plugin/easycomplete.vim

@@ -46,6 +46,10 @@ if g:easycomplete_nerd_font == 1
         \   "tabnine": {
         \      "kind":get(kind_icons, "tabnine", "󰕃"),
         \      "menu": g:easycomplete_menu_abbr ? "𝘛𝘕" : "tabnine"
+        \    },
+        \   "cmdline": {
+        \      "kind":get(kind_icons, "cmdline", ""),
+        \      "menu": g:easycomplete_menu_abbr ? "CMD" : "cmdline"
         \    }
         \ }
   let g:easycomplete_sign_text = {
@@ -68,7 +72,7 @@ if g:easycomplete_nerd_font == 1
         \ 'const':     get(kind_icons, "const", ""),     'alias':         get(kind_icons, 'alias', ""),
         \ 'let':       get(kind_icons, "let", ""),       'parameter':     get(kind_icons, 'parameter', "󰏗"),
         \ 'operator':  get(kind_icons, 'operator', "󱧕"),  'property':      get(kind_icons, 'property', "󰙅"),
-        \ 'local':     get(kind_icons, 'local', ""),
+        \ 'local':     get(kind_icons, 'local', ""),     'cmdline':       get(kind_icons, 'cmdline', ""),
         \ 'r':'',     't':'',
         \ 'f':'f',     'c':'',
         \ 'u':'𝘶',     'e':'𝘦',
@@ -96,6 +100,8 @@ let g:easycomplete_kindflag_snip = empty(   easycomplete#util#get(g:easycomplete
                                   \ "s" :   easycomplete#util#get(g:easycomplete_menu_skin, "snip", "kind")
 let g:easycomplete_kindflag_tabnine = empty(easycomplete#util#get(g:easycomplete_menu_skin, "tabnine", "kind")) ?
                                   \ "t" :    easycomplete#util#get(g:easycomplete_menu_skin, "tabnine", "kind")
+let g:easycomplete_kindflag_cmdline = empty(easycomplete#util#get(g:easycomplete_menu_skin, "cmdline", "kind")) ?
+                                  \ "c" :    easycomplete#util#get(g:easycomplete_menu_skin, "cmdline", "kind")
 if g:easycomplete_menu_abbr
   let g:easycomplete_menuflag_buf = empty(    easycomplete#util#get(g:easycomplete_menu_skin, "buf", "menu")) ?
                                     \ "[B]" : easycomplete#util#get(g:easycomplete_menu_skin, "buf", "menu")
@@ -105,13 +111,16 @@ if g:easycomplete_menu_abbr
                                     \ "[S]" : easycomplete#util#get(g:easycomplete_menu_skin, "snip", "menu")
   let g:easycomplete_menuflag_tabnine = empty(easycomplete#util#get(g:easycomplete_menu_skin, "tabnine", "menu")) ?
                                     \ "[TN]": easycomplete#util#get(g:easycomplete_menu_skin, "tabnine", "menu")
+  let g:easycomplete_menuflag_cmdline = empty(easycomplete#util#get(g:easycomplete_menu_skin, "cmdline", "menu")) ?
+                                    \ "[CMD]": easycomplete#util#get(g:easycomplete_menu_skin, "cmdline", "menu")
   let g:easycomplete_kindflag_tabnine = empty(easycomplete#util#get(g:easycomplete_menu_skin, "tabnine", "kind")) ?
                                   \ "" :    easycomplete#util#get(g:easycomplete_menu_skin, "tabnine", "kind")
 else
   let g:easycomplete_menuflag_buf = "text"
   let g:easycomplete_menuflag_dict = "dict"
   let g:easycomplete_menuflag_snip = "snippet"
   let g:easycomplete_menuflag_tabnine = "tabnine"
+  let g:easycomplete_menuflag_cmdline = "cmdline"
 endif
 
 if !exists("g:easycomplete_fuzzymatch_hlgroup")
@@ -582,8 +591,8 @@ augroup easycomplete#NormalBinding
   autocmd CursorHold * call easycomplete#CursorHold()
   autocmd CursorHoldI * call easycomplete#CursorHoldI()
   autocmd CursorMovedI * call easycomplete#CursorMovedI()
-  autocmd CmdlineEnter * noa call easycomplete#CmdlineEnter()
-  autocmd CmdlineLeave * noa call easycomplete#CmdlineLeave()
+  " autocmd CmdlineEnter * noa call easycomplete#CmdlineEnter()
+  " autocmd CmdlineLeave * noa call easycomplete#CmdlineLeave()
   autocmd BufLeave * noa call easycomplete#BufLeave()
   if has("nvim")
     autocmd WinScrolled * noa call easycomplete#WinScrolled()