Merge pull request #889 from xuhuanzy/translator

std translator

Author: CppCXY

Cargo.lock

@@ -27,6 +27,8 @@ pub use emmylua_codestyle::*;
 pub use locale::get_locale_code;
 use lsp_types::Uri;
 pub use profile::Profile;
+pub use resources::get_best_resources_dir;
+pub use resources::load_resource_from_include_dir;
 use resources::load_resource_std;
 pub use semantic::*;
 use std::{collections::HashSet, path::PathBuf, sync::Arc};

crates/emmylua_code_analysis/src/lib.rs

@@ -2,10 +2,10 @@ mod best_resource_path;
 
 use std::path::{Path, PathBuf};
 
-use best_resource_path::get_best_resources_dir;
+pub use best_resource_path::get_best_resources_dir;
 use include_dir::{Dir, DirEntry, include_dir};
 
-use crate::{LuaFileInfo, load_workspace_files};
+use crate::{LuaFileInfo, get_locale_code, load_workspace_files};
 
 static RESOURCE_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/resources");
 const VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -14,13 +14,15 @@ pub fn load_resource_std(
     create_resources_dir: Option<String>,
     is_jit: bool,
 ) -> (PathBuf, Vec<LuaFileInfo>) {
+    // 指定了输出的资源目录, 目前只有 lsp 会指定
     if let Some(create_resources_dir) = create_resources_dir {
         let resource_path = if create_resources_dir.is_empty() {
             get_best_resources_dir()
         } else {
             PathBuf::from(&create_resources_dir)
         };
-        let std_dir = PathBuf::from(&resource_path).join("std");
+        // 此时会存在 i18n, 我们需要根据当前语言环境切换到对应语言的 std 目录
+        let std_dir = get_std_dir(&resource_path);
         let result = load_resource_from_file_system(&resource_path);
         if let Some(mut files) = result {
             if !is_jit {
@@ -29,7 +31,7 @@ pub fn load_resource_std(
             return (std_dir, files);
         }
     }
-
+    // 没有指定资源目录, 那么直接使用默认的资源目录, 此时不会存在 i18n
     let resoucres_dir = get_best_resources_dir();
     let std_dir = resoucres_dir.join("std");
     let files = load_resource_from_include_dir();
@@ -58,21 +60,25 @@ 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("std/jit.lua")
-            || path.ends_with("std/jit/profile.lua")
-            || path.ends_with("std/jit/util.lua")
-            || path.ends_with("std/string/buffer.lua")
-            || path.ends_with("std/table/clear.lua")
-            || path.ends_with("std/table/new.lua")
-            || path.ends_with("std/ffi.lua");
-
-        !should_remove
+        !JIT_FILES_TO_REMOVE
+            .iter()
+            .any(|suffix| path.ends_with(suffix))
     });
 }
 
 fn load_resource_from_file_system(resources_dir: &Path) -> Option<Vec<LuaFileInfo>> {
+    // lsp i18n 的资源在更早之前的 crates\emmylua_ls\src\handlers\initialized\std_i18n.rs 中写入到文件系统
     if check_need_dump_to_file_system() {
         log::info!("Creating resources dir: {:?}", resources_dir);
         let files = load_resource_from_include_dir();
@@ -109,7 +115,7 @@ fn load_resource_from_file_system(resources_dir: &Path) -> Option<Vec<LuaFileInf
         }
     }
 
-    let std_dir = resources_dir.join("std");
+    let std_dir = get_std_dir(&resources_dir);
     let match_pattern = vec!["**/*.lua".to_string()];
     let files = match load_workspace_files(&std_dir, &match_pattern, &Vec::new(), &Vec::new(), None)
     {
@@ -146,7 +152,7 @@ fn check_need_dump_to_file_system() -> bool {
     false
 }
 
-fn load_resource_from_include_dir() -> Vec<LuaFileInfo> {
+pub fn load_resource_from_include_dir() -> Vec<LuaFileInfo> {
     let mut files = Vec::new();
     walk_resource_dir(&RESOURCE_DIR, &mut files);
     files
@@ -170,3 +176,15 @@ 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());
+    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_code_analysis/src/resources/mod.rs

@@ -40,6 +40,7 @@ itertools.workspace = true
 dirs.workspace = true
 wax.workspace = true
 internment.workspace = true
+include_dir.workspace = true
 
 [dependencies.clap]
 workspace = true