fix: std i18n translator

Author: xuhuanzy

crates/emmylua_code_analysis/src/resources/mod.rs

@@ -60,17 +60,20 @@ pub fn load_resource_std(
 }
 
 fn remove_jit_resource(files: &mut Vec<LuaFileInfo>) {
+    const JIT_FILES_TO_REMOVE: &[&str] = &[
+        "jit.lua",
+        "jit/profile.lua",
+        "jit/util.lua",
+        "string/buffer.lua",
+        "table/clear.lua",
+        "table/new.lua",
+        "ffi.lua",
+    ];
     files.retain(|file| {
         let path = Path::new(&file.path);
-        let should_remove = path.ends_with("jit.lua")
-            || path.ends_with("jit/profile.lua")
-            || path.ends_with("jit/util.lua")
-            || path.ends_with("string/buffer.lua")
-            || path.ends_with("table/clear.lua")
-            || path.ends_with("table/new.lua")
-            || path.ends_with("ffi.lua");
-
-        !should_remove
+        !JIT_FILES_TO_REMOVE
+            .iter()
+            .any(|suffix| path.ends_with(suffix))
     });
 }
 
@@ -177,7 +180,11 @@ fn walk_resource_dir(dir: &Dir, files: &mut Vec<LuaFileInfo>) {
 // 优先使用当前语言环境的 std-{locale} 目录, 否则回退到默认的 std 目录
 fn get_std_dir(resources_dir: &Path) -> PathBuf {
     let locale = get_locale_code(&rust_i18n::locale());
-    Some(resources_dir.join(format!("std-{locale}")))
-        .filter(|p| locale != "en" && p.exists())
-        .unwrap_or_else(|| resources_dir.join("std"))
+    if locale != "en" {
+        let locale_dir = resources_dir.join(format!("std-{locale}"));
+        if locale_dir.exists() {
+            return locale_dir;
+        }
+    }
+    resources_dir.join("std")
 }

crates/emmylua_ls/src/handlers/initialized/std_i18n.rs

@@ -118,7 +118,7 @@ fn check_need_dump_std(resources_dir: &Path, locale: &str) -> bool {
 /// Params:
 /// - `locale` - 语言
 /// - `out_parent_dir` - 输出目录的父目录
-fn generate(locale: &str, out_parent_dir: &Path) -> (PathBuf, Vec<LuaFileInfo>) {
+fn generate(locale: &str, out_parent_dir: &Path) -> Vec<LuaFileInfo> {
     let origin_std_files = emmylua_code_analysis::load_resource_from_include_dir();
     let translate_std_root = out_parent_dir.join(format!("std-{locale}"));
     log::info!("Creating std-{locale} dir: {:?}", translate_std_root);
@@ -145,11 +145,7 @@ fn generate(locale: &str, out_parent_dir: &Path) -> (PathBuf, Vec<LuaFileInfo>)
         });
     }
 
-    // 写入版本文件，用于下次启动时判断是否需要重新生成
-    let version_path = translate_std_root.join("version");
-    let _ = std::fs::write(&version_path, VERSION);
-
-    (translate_std_root, out_files)
+    out_files
 }
 
 fn translate_one_std_file(locale: &str, rel_lua_path: &Path, content: &str) -> Option<String> {
@@ -385,14 +381,14 @@ mod tests {
     use super::generate;
 
     #[test]
+    #[ignore]
     fn test_generate_translated() {
         let test_output_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
             .parent()
             .unwrap()
             .join("emmylua_code_analysis")
             .join("resources");
-        let (root, files) = generate("zh_CN", &test_output_dir);
-        assert!(root.exists());
+        let files = generate("zh_CN", &test_output_dir);
         assert!(!files.is_empty());
     }
 }