[bugfix] item.user_data !== item.user_data_json when plugin_name ==

"ts"

Author: jayli

Cargo.lock

@@ -19,10 +19,16 @@ function speed.final_normalize_menulist(arr, plugin_name)
   for _, item in ipairs(arr) do
     -- 这里item会转换为"table: 0x0109a29a00"，base64后无需截短
     local sha256_str = vim.base64.encode(tostring(item))
-    local r_user_data = {
+    local r_user_data = {}
+    local t_user_data = {
       plugin_name = plugin_name,
       sha256 = sha256_str
     }
+    if plugin_name == "ts" and item.user_data ~= nil then
+      r_user_data = vim.fn.extend(vim.fn.json_decode(item.user_data), t_user_data)
+    else
+      r_user_data = t_user_data
+    end
     table.insert(l_menu_list, vim.fn.extend({
           word = '',
           menu = '',

lua/easycomplete/lib/speed.lua

@@ -652,6 +652,28 @@ fn final_normalize_menulist(lua: &Lua,
 
         let r_user_data: LuaTable = lua.create_table()?;
 
+        if cloned_plugin_name == "ts" {
+            // 把ts里的user_data原有的字段存到r_user_data里
+            let user_data_string: String = item.get("user_data")?;
+            if !user_data_string.is_empty() {
+                match serde_json::from_str::<serde_json::Value>(&user_data_string) {
+                    Ok(user_data_json_value) => {
+                        if let serde_json::Value::Object(map) = user_data_json_value {
+                            for (key, value) in map.iter() {
+                                // 使用mlua的序列化功能将serde_json::Value转换为Lua值
+                                let lua_value: mlua::Value = lua.to_value(value)?;
+                                r_user_data.set(&**key, lua_value)?;
+                            }
+                        }
+                    }
+                    Err(_) => {
+                        // 如果JSON解析失败，可以选择记录日志或忽略错误
+                    }
+                }
+            }
+
+        }
+
         r_user_data.set("plugin_name", cloned_plugin_name)?;
         r_user_data.set("sha256", sha256_str)?;