completeMenuFilter → lua

Author: jayli

autoload/easycomplete/util.vim

@@ -1157,62 +1157,17 @@ function! easycomplete#util#CompleteMenuFilter(all_menu, word, maxlength)
     let word = substitute(word, "\\.", "\\\\\\\\.", "g")
   endif
   if exists('*matchfuzzy')
-    let fullmatch_result = [] " 完全匹配
-    let firstchar_result = [] " 首字母匹配
-    let fuzzymatching = []
     let all_items = a:all_menu
     " TODO here vim 里针对 g: 的匹配有 hack，word 前面减了两个字符，导致abbr
     " 和 word 不是一一对应的，通过word fuzzy 匹配的位置无法正确应用在 abbr 上
     " 这里只 hack 了 vim，其他类型的文件未测试
     let key_name = (&filetype == "vim") ? "abbr" : "word"
     let matching_res = all_items->matchfuzzypos(word, {'key': key_name})
-    let fuzzymatching = matching_res[0]
-    let fuzzy_position = matching_res[1]
-    let fuzzy_scores = matching_res[2]
-    let fuzzymatch_result = []
-    if g:env_is_nvim && has("nvim-0.6.1")
-      let count_i = 0
-      while count_i < len(fuzzymatching)
-        let abbr = get(fuzzymatching[count_i], "abbr", "")
-        if empty(abbr)
-          let fuzzymatching[count_i]["abbr"] = fuzzymatching[count_i]["word"]
-          let abbr = fuzzymatching[count_i]["word"]
-        endif
-        let abbr = easycomplete#util#parseAbbr(abbr)
-        let fuzzymatching[count_i]["abbr"] = abbr
-        let p = fuzzy_position[count_i]
-        let fuzzymatching[count_i]["abbr_marked"] = s:ReplaceMent(abbr, p, "§")
-        let fuzzymatching[count_i]["marked_position"] = p
-        let fuzzymatching[count_i]["score"] = fuzzy_scores[count_i]
-
-        " 进行初步分检
-        if stridx(toupper(fuzzymatching[count_i]["word"]), toupper(word)) == 0
-          " 完全匹配，放在fullmatch_result
-          call add(fullmatch_result, fuzzymatching[count_i])
-        elseif fuzzymatching[count_i]["word"][0] == word[0]
-          " 首字母匹配，放在firstchar_result
-          call add(firstchar_result, fuzzymatching[count_i])
-        else
-          " 否则就是fuzzymatch的结果，放在 fuzzymatch_result 中
-          call add(fuzzymatch_result, fuzzymatching[count_i])
-        endif
-        let count_i += 1
-      endwhile
-      if has('nvim-0.7')
-        " 对 fuzzymatch_result 进行排序，TODO 似乎没有必要
-        " call sort(fuzzymatch_result, {a, b -> b['score'] - a['score'] })
-      endif
-    endif
-    if len(easycomplete#GetStuntMenuItems()) == 0 && g:easycomplete_first_complete_hit == 1
-      " 对fuzzymatch_result 进行长度排序
-      call sort(fuzzymatch_result, "easycomplete#util#SortTextComparatorByLength")
-    endif
     if g:env_is_nvim
-      let filtered_menu = fullmatch_result + firstchar_result + fuzzymatch_result
+      return s:util_toolkit.complete_menu_filter(matching_res, word)
     else
-      let filtered_menu = fuzzymatching
+      return s:CompleteMenuFilterVim(matching_res, word)
     endif
-    return filtered_menu
   else " for nvim(<=0.5.0)
     " 完整匹配
     let original_matching_menu = []
@@ -1287,6 +1242,57 @@ function! easycomplete#util#CompleteMenuFilter(all_menu, word, maxlength)
   endif
 endfunction
 
+function! s:CompleteMenuFilterVim(matching_res, word)
+  let matching_res = a:matching_res
+  let word = a:word
+  let fullmatch_result = [] " 完全匹配
+  let firstchar_result = [] " 首字母匹配
+  let fuzzymatching = []
+  let fuzzymatching = matching_res[0]
+  let fuzzy_position = matching_res[1]
+  let fuzzy_scores = matching_res[2]
+  let fuzzymatch_result = []
+  if g:env_is_nvim && has("nvim-0.6.1")
+    let count_i = 0
+    while count_i < len(fuzzymatching)
+      let abbr = get(fuzzymatching[count_i], "abbr", "")
+      if empty(abbr)
+        let fuzzymatching[count_i]["abbr"] = fuzzymatching[count_i]["word"]
+        let abbr = fuzzymatching[count_i]["word"]
+      endif
+      let abbr = easycomplete#util#parseAbbr(abbr)
+      let fuzzymatching[count_i]["abbr"] = abbr
+      let p = fuzzy_position[count_i]
+      let fuzzymatching[count_i]["abbr_marked"] = s:ReplaceMent(abbr, p, "§")
+      let fuzzymatching[count_i]["marked_position"] = p
+      let fuzzymatching[count_i]["score"] = fuzzy_scores[count_i]
+
+      " 进行初步分检
+      if stridx(toupper(fuzzymatching[count_i]["word"]), toupper(word)) == 0
+        " 完全匹配，放在fullmatch_result
+        call add(fullmatch_result, fuzzymatching[count_i])
+      elseif fuzzymatching[count_i]["word"][0] == word[0]
+        " 首字母匹配，放在firstchar_result
+        call add(firstchar_result, fuzzymatching[count_i])
+      else
+        " 否则就是fuzzymatch的结果，放在 fuzzymatch_result 中
+        call add(fuzzymatch_result, fuzzymatching[count_i])
+      endif
+      let count_i += 1
+    endwhile
+  endif
+  if len(easycomplete#GetStuntMenuItems()) == 0 && g:easycomplete_first_complete_hit == 1
+    " 对fuzzymatch_result 进行长度排序
+    call sort(fuzzymatch_result, "easycomplete#util#SortTextComparatorByLength")
+  endif
+  if g:env_is_nvim
+    let filtered_menu = fullmatch_result + firstchar_result + fuzzymatch_result
+  else
+    let filtered_menu = fuzzymatching
+  endif
+  return filtered_menu
+endfunction
+
 function! easycomplete#util#ls(path)
   let result_list = []
   let is_win = has('win32') || has('win64')

lua/easycomplete/util.lua

@@ -4,6 +4,16 @@ local zizz_timer = vim.loop.new_timer()
 local async_timer = vim.loop.new_timer()
 local async_timer_counter = 0
 
+local function console(...)
+  local args = {...}
+  local ok, res = pcall(util.console, unpack(args))
+  if ok then
+    return res
+  else
+    print(res)
+  end
+end
+
 function util.parse_abbr(abbr)
   local max_length = vim.g.easycomplete_pum_maxlength
   if max_length == 0 or #abbr <= max_length then
@@ -91,6 +101,47 @@ function util.get_server()
   return Server
 end
 
+function util.complete_menu_filter(matching_res, word)
+  local fullmatch_result = {} -- 完全匹配
+  local firstchar_result = {} -- 首字母匹配
+  local fuzzymatching = matching_res[1]
+  local fuzzy_position = matching_res[2]
+  local fuzzy_scores = matching_res[3]
+  local fuzzymatch_result = {}
+
+  for i, item in ipairs(fuzzymatching) do
+    if item["abbr"] == nil or item["abbr"] == "" then
+      item["abbr"] = item["word"]
+    end
+    local abbr = item["abbr"]
+    abbr = util.parse_abbr(abbr)
+    item["abbr"] = abbr
+    local p = fuzzy_position[i]
+    item["abbr_marked"] = require("easycomplete").replacement(abbr, p, "§")
+    item["marked_position"] = p
+    item["score"] = fuzzy_scores[i]
+    if vim.fn.stridx(string.lower(item["word"]), string.lower(word)) == 0 then
+      table.insert(fullmatch_result, item)
+    elseif string.lower(string.sub(item["word"],1,1)) == string.lower(string.sub(word,1,1)) then
+      table.insert(firstchar_result, item)
+    else
+      table.insert(fuzzymatch_result, item)
+    end
+  end
+
+  if vim.fn["easycomplete#GetStuntMenuItems"]() == 0 and vim.g.easycomplete_first_complete_hit == 1 then
+    table.sort(fuzzymatch_result, function(a, b)
+      return #a.abbr < #b.abbr -- 按 abbr 字段的长度升序排序
+    end)
+  end
+
+  local filtered_menu = {}
+  for _, v in ipairs(fullmatch_result) do table.insert(filtered_menu, v) end
+  for _, v in ipairs(firstchar_result) do table.insert(filtered_menu, v) end
+  for _, v in ipairs(fuzzymatch_result) do table.insert(filtered_menu, v) end
+  return filtered_menu
+end
+
 -- TODO 需要再测试一下这个函数
 function util.get(a, ...)
   local args = {...}