rust fuzzy match done

Author: jayli

autoload/easycomplete/util.vim

@@ -1217,26 +1217,22 @@ function! easycomplete#util#CompleteMenuFilter(all_menu, word, maxlength)
   endif
   if exists('*matchfuzzy')
     let tt = reltime()
-    if g:env_is_nvim
-      " 性能：576 个元素，n 是 550 耗时 2ms
-      let all_items = s:util_toolkit.trim_array_to_length(a:all_menu, a:maxlength + 130)
-    else
-      " 性能：576 个元素，n 是 550  耗时 13ms
-      let all_items = s:TrimArrayToLength(a:all_menu, a:maxlength + 130)
-    endif
-    " call s:console(reltimestr(reltime(tt)))
     " 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, 'matchseq': 1, "limit": a:maxlength})
-    let matching_res = s:util_toolkit.matchfuzzypos(all_items, word, {'key': key_name, 'matchseq': 1, "limit": a:maxlength})
     if g:env_is_nvim
-      " 350 个元素，7ms
-      let l:ret = s:util_toolkit.complete_menu_filter(matching_res, word)
+      " complete_menu_fuzzy_filter --------------{---
+      let l:ret = s:util_toolkit.complete_menu_fuzzy_filter(a:all_menu, word, key_name, a:maxlength)
       return l:ret
+      " complete_menu_fuzzy_filter --------------}---
     else
+      " 性能：576 个元素，n 是 550  耗时 13ms
+      " complete_menu_fuzzy_filter --------------{---
+      let all_items = s:TrimArrayToLength(a:all_menu, a:maxlength + 130)
+      let matching_res = all_items->matchfuzzypos(word, {'key': key_name, 'matchseq': 1, "limit": a:maxlength})
       return s:CompleteMenuFilterVim(matching_res, word)
+      " complete_menu_fuzzy_filter --------------}---
     endif
   else " for nvim(<=0.5.0)
     " 完整匹配

build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
-name="debug"
-#name="release"
+#name="debug"
+name="release"
 
 rm -rf ./target/release
 

lua/easycomplete/lib/speed.rs

@@ -406,9 +406,21 @@ fn trim_array_to_length(lua: &Lua, (arr, n): (LuaTable, i32)) -> Result<LuaTable
     Ok(ret)
 }
 
+fn complete_menu_fuzzy_filter(lua: &Lua,
+    (all_menu, word, key_name, maxlength): (LuaTable, String, String, i32)) -> Result<LuaTable, LuaError> {
+
+    let all_items: LuaTable = trim_array_to_length(lua, (all_menu, maxlength + 130))?;
+    let opt: LuaTable = lua.create_table()?;
+    opt.set("key", key_name.to_string())?;
+    opt.set("limit", maxlength)?;
+    let mut matching_res: LuaTable = matchfuzzypos(lua, (all_items, word.clone(), opt))?;
+    let mut ret: LuaTable = complete_menu_filter(lua, (matching_res, word.clone()))?;
+    Ok(ret)
+}
+
 // https://crates.io/crates/sublime_fuzzy
+// TODO maxlength: 350， 耗时 11 ~ 15 ms，比 lua 慢 2ms
 fn matchfuzzypos(lua: &Lua, (list, word, opt): (LuaTable, String, LuaTable)) -> Result<LuaTable, LuaError> {
-
     let mut matchfuzzy = lua.create_table()?;
     let mut positions = lua.create_table()?;
     let mut scores = lua.create_table()?;
@@ -427,7 +439,6 @@ fn matchfuzzypos(lua: &Lua, (list, word, opt): (LuaTable, String, LuaTable)) ->
             Some(m) => {
                 if m.matched_indices().len() == word.chars().count() {
                     // match
-                    // position = m.matched_indices();
                     for p in m.matched_indices() {
                         position.push(*p as i32);
                     }
@@ -457,7 +468,6 @@ fn matchfuzzypos(lua: &Lua, (list, word, opt): (LuaTable, String, LuaTable)) ->
     });
 
     let mut new_matchfuzzy = lua.create_table()?;
-    let max: usize = limit as usize;
 
     // 4. 写回排序后的结果
     for (i, item) in matchfuzzy_vec.into_iter().enumerate() {
@@ -466,7 +476,11 @@ fn matchfuzzypos(lua: &Lua, (list, word, opt): (LuaTable, String, LuaTable)) ->
         new_matchfuzzy.set(i+1, item)?; // Lua 索引从 1 开始
         positions.set(i+1, p.clone())?;
         scores.set(i+1, s.clone())?;
-        if i > max {
+
+        // new_matchfuzzy.push(item)?;
+        // positions.push(p.clone())?;
+        // scores.push(s.clone())?;
+        if i > limit as usize  {
             break;
         }
     }
@@ -497,6 +511,7 @@ fn easycomplete_rust_speed(lua: &Lua) -> LuaResult<LuaTable> {
     exports.set("complete_menu_filter", lua.create_function(complete_menu_filter)?)?;
     exports.set("trim_array_to_length", lua.create_function(trim_array_to_length)?)?;
     exports.set("matchfuzzypos", lua.create_function(matchfuzzypos)?)?;
+    exports.set("complete_menu_fuzzy_filter", lua.create_function(complete_menu_fuzzy_filter)?)?;
 
     Ok(exports)
 }

lua/easycomplete/util.lua

@@ -197,6 +197,26 @@ function util.replacement(abbr, positions, wrap_char)
   end
 end
 
+function util.complete_menu_fuzzy_filter(all_menu, word, key_name, maxlength)
+  local tt = vim.fn.reltime()
+  local ret = nil
+  if util.rust_ready() then
+    -- 应该快，但实际慢3ms
+    ret = rust_speed.complete_menu_fuzzy_filter(all_menu, word, key_name, maxlength)
+  else
+    -- 应该慢，实际快3ms
+    local all_items = util.trim_array_to_length(all_menu, maxlength + 130)
+    local matching_res = vim.fn.matchfuzzypos(all_items, word, {
+        key = key_name,
+        matchseq = 1,
+        limit = maxlength
+      })
+    ret = util.complete_menu_filter(matching_res, word)
+  end
+  -- console(vim.fn.reltimestr(vim.fn.reltime(tt)), #ret)
+  return ret
+end
+
 function util.complete_menu_filter(matching_res, word)
   -- local tt = vim.fn.reltime()
   local ret = {}