saving code

Author: jayli

autoload/easycomplete/util.vim

@@ -1229,7 +1229,8 @@ function! easycomplete#util#CompleteMenuFilter(all_menu, word, maxlength)
     " 和 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 = 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)

build.sh

@@ -1,46 +1,44 @@
 #!/usr/bin/env sh
 
+name="debug"
+#name="release"
+
 rm -rf ./target/release
 
-# cargo build --target x86_64-apple-darwin --release
-# cargo build --target aarch64-apple-darwin --release
-
-# mkdir -p target/universal/release
-
-# lipo -create \
-#   target/x86_64-apple-darwin/release/libeasycomplete_util.dylib \
-#   target/aarch64-apple-darwin/release/libeasycomplete_util.dylib \
-#   -output target/debug/libeasycomplete_util.dylib
-
-####################### dev #######################
-
-# cargo rustc -- \
-#   -C link-arg=-undefined \
-#   -C link-arg=dynamic_lookup \
-#   -C opt-level=3 \
-#   --target x86_64-apple-darwin
-
-# cd ./target
-# ln -s debug release
-
-####################### release #######################
-
-rm -rf ./target/debug
-cargo rustc --release -- \
-  -C link-arg=-undefined \
-  -C link-arg=dynamic_lookup \
-  -C opt-level=3 \
-  -C debuginfo=0 \
-  --target x86_64-apple-darwin
-rm ./target/CACHEDIR.TAG
-rm ./target/.rustc_info.json
-rm ./target/release/libeasycomplete_rust_speed.d
-rm -rf ./target/release/incremental
-rm -rf ./target/release/examples
-rm -rf ./target/release/deps
-rm -rf ./target/release/build
-rm -rf ./target/release/.fingerprint
-rm ./target/release/.cargo-lock
-#
-# -C profile-generate \
+if [ "$name" = "debug" ]; then
+    ####################### dev #######################
+    echo "debug build"
+
+    cargo rustc -- \
+      -C link-arg=-undefined \
+      -C link-arg=dynamic_lookup \
+      -C opt-level=3 \
+      --target x86_64-apple-darwin
+
+    cd ./target
+    ln -s debug release
+
+else
+    ####################### release #######################
+    echo "release build"
+
+    rm -rf ./target/debug
+    cargo rustc --release -- \
+      -C link-arg=-undefined \
+      -C link-arg=dynamic_lookup \
+      -C opt-level=3 \
+      -C debuginfo=0 \
+      --target x86_64-apple-darwin
+
+    rm ./target/CACHEDIR.TAG
+    rm ./target/.rustc_info.json
+    rm ./target/release/libeasycomplete_rust_speed.d
+    rm ./target/release/.cargo-lock
+    rm -rf ./target/release/incremental
+    rm -rf ./target/release/examples
+    rm -rf ./target/release/deps
+    rm -rf ./target/release/build
+    rm -rf ./target/release/.fingerprint
+fi
+
 echo "dylib created!"

lua/easycomplete/lib/speed.rs

@@ -407,18 +407,19 @@ fn trim_array_to_length(lua: &Lua, (arr, n): (LuaTable, i32)) -> Result<LuaTable
 }
 
 // https://crates.io/crates/sublime_fuzzy
-// 废弃：vim 原生matchfuzzypos速度最快，rust 涉及到跨语言，2~8ms，原生0.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()?;
+    let key: String = opt.get("key")?;
+    let limit: i32 = opt.get("limit")?;
 
-    let mut iter = list.sequence_values::<Table>();
+    let mut list_iter = list.sequence_values::<Table>();
     let mut i: usize = 1;
-    while let Some(every_item) = iter.next() {
-        let item = every_item?;
-        let t_word: String = item.get("word")?;
+    while let Some(every_item) = list_iter.next() {
+        let mut item = every_item?;
+        let t_word: String = item.get(key.clone())?;
         let mut position: LuaTable = lua.create_table()?;
         let mut score: i32;
         // let m = best_match(&word, &t_word).expect("No match");
@@ -431,23 +432,49 @@ fn matchfuzzypos(lua: &Lua, (list, word, opt): (LuaTable, String, LuaTable)) ->
                         position.push(*p as i32);
                     }
                     score = m.score() as i32;
+
+                    item.set("score", score.clone());
+                    item.set("position", position.clone());
                     matchfuzzy.push(item.clone());
-                    positions.push(position.clone());
-                    scores.push(score.clone());
                 }
             }
             None => {
                 // catch 异常情况
+                // do nothing and continue
             }
         }
         i += 1;
     }
 
+    let mut matchfuzzy_vec: Vec<Table> = matchfuzzy
+        .sequence_values::<Table>()
+        .collect::<Result<Vec<_>, _>>()?;
+
+    matchfuzzy_vec.sort_by(|a, b| {
+        let score_a = a.get::<i32>("score").unwrap_or_default();
+        let score_b = b.get::<i32>("score").unwrap_or_default();
+        score_b.cmp(&score_a)
+    });
+
+    let mut new_matchfuzzy = lua.create_table()?;
+    let max: usize = limit as usize;
+
+    // 4. 写回排序后的结果
+    for (i, item) in matchfuzzy_vec.into_iter().enumerate() {
+        let mut p: LuaTable = item.get("position")?;
+        let mut s: i32 = item.get("score")?;
+        new_matchfuzzy.set(i+1, item)?; // Lua 索引从 1 开始
+        positions.set(i+1, p.clone())?;
+        scores.set(i+1, s.clone())?;
+        if i > max {
+            break;
+        }
+    }
+
     let mut result = lua.create_table()?;
-    result.push(matchfuzzy);
+    result.push(new_matchfuzzy);
     result.push(positions);
     result.push(scores);
-    // TODO 根据 Score 进行排序
     Ok(result)
 }
 

lua/easycomplete/util.lua

@@ -291,6 +291,11 @@ function util.fuzzy_search(haystack, needle)
   end
 end
 
+function util.matchfuzzypos(a,b,c)
+  local ret = rust_speed.matchfuzzypos(a,b,c)
+  return ret
+end
+
 -- easycomplete#util#GetVimCompletionItems 的 lua 实现
 function util.get_vim_complete_items(response, plugin_name, word)
   local tt = vim.fn.reltime()

target/release

@@ -0,0 +1 @@
+debug