fix std resource load, and cli tool relative path issue

Author: CppCXY

CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
-# 0.4.3(unreleased)
+# 0.4.4(unreleased)
+
+# 0.4.3
+
+`FIX` Fix std resource loaded for cli tools
 
 # 0.4.2
 

crates/emmylua_check/src/main.rs

@@ -12,20 +12,19 @@ use tokio_util::sync::CancellationToken;
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Sync + Send>> {
     let cmd_args = CmdArgs::from_args();
-    let analysis =
-        match init::load_workspace(cmd_args.workspace.clone(), cmd_args.config, cmd_args.ignore) {
-            Some(analysis) => analysis,
-            None => {
-                eprintln!("Failed to load workspace");
-                return Err("Failed to load workspace".into());
-            }
-        };
-
     let mut workspace = cmd_args.workspace;
     if !workspace.is_absolute() {
         workspace = std::env::current_dir()?.join(workspace);
     }
 
+    let analysis = match init::load_workspace(workspace.clone(), cmd_args.config, cmd_args.ignore) {
+        Some(analysis) => analysis,
+        None => {
+            eprintln!("Failed to load workspace");
+            return Err("Failed to load workspace".into());
+        }
+    };
+
     let files = analysis.compilation.get_db().get_vfs().get_all_file_ids();
     let db = analysis.compilation.get_db();
     let need_check_files = get_need_check_ids(db, files, &workspace);
@@ -50,13 +49,13 @@ async fn main() -> Result<(), Box<dyn Error + Sync + Send>> {
         receiver,
         cmd_args.output_format,
         cmd_args.output,
-        cmd_args.warnings_as_errors
+        cmd_args.warnings_as_errors,
     )
     .await;
 
     if exit_code != 0 {
         return Err(format!("exit code: {}", exit_code).into());
-    } 
+    }
 
     eprintln!("Check finished");
     Ok(())

crates/emmylua_code_analysis/src/lib.rs

@@ -46,7 +46,8 @@ impl EmmyLuaAnalysis {
     }
 
     pub fn init_std_lib(&mut self, allow_create_resources_dir: bool) {
-        let files = load_resource_std(allow_create_resources_dir);
+        let (std_root, files) = load_resource_std(allow_create_resources_dir);
+        self.add_workspace_root(std_root);
         let files = files
             .into_iter()
             .filter_map(|file| {
@@ -121,22 +122,6 @@ impl EmmyLuaAnalysis {
         updated_files
     }
 
-    // pub fn parrallel_update_files_by_uri(
-    //     &mut self,
-    //     files: Vec<(Uri, Option<String>)>,
-    // ) -> Vec<FileId> {
-    //     let mut removed_files = HashSet::new();
-    //     let mut updated_files = HashSet::new();
-    //     {
-    //         let _p = Profile::new("parrallel update files");
-    //     }
-    //     self.compilation
-    //         .remove_index(removed_files.into_iter().collect());
-    //     let updated_files: Vec<FileId> = updated_files.into_iter().collect();
-    //     self.compilation.update_index(updated_files.clone());
-    //     updated_files
-    // }
-
     pub fn update_files_by_path(&mut self, files: Vec<(PathBuf, Option<String>)>) -> Vec<FileId> {
         let files = files
             .into_iter()

crates/emmylua_code_analysis/src/resources/mod.rs

@@ -1,29 +1,42 @@
+use std::path::PathBuf;
+
 use include_dir::{include_dir, Dir, DirEntry};
 
 use crate::{load_workspace_files, LuaFileInfo};
 
 static RESOURCE_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/resources");
 
-pub fn load_resource_std(allow_create_resources_dir: bool) -> Vec<LuaFileInfo> {
+pub fn load_resource_std(allow_create_resources_dir: bool) -> (PathBuf, Vec<LuaFileInfo>) {
+    let exe_path = std::env::current_exe().unwrap();
+    let exe_dir = exe_path.parent().unwrap();
+    let resoucres_dir = exe_dir.join("resources");
+    let std_dir = resoucres_dir.join("std");
+
     if allow_create_resources_dir {
         let result = load_resource_from_file_system();
         match result {
-            Some(files) => return files,
+            Some(files) => return (std_dir, files),
             None => {}
         }
     }
 
     let files = load_resource_from_include_dir();
-    return files
+    let files = files
         .into_iter()
         .filter_map(|file| {
             if file.path.ends_with(".lua") {
-                Some(file)
+                let path = std_dir.join(&file.path).to_str().unwrap().to_string();
+                Some(LuaFileInfo {
+                    path,
+                    content: file.content,
+                })
             } else {
                 None
             }
         })
         .collect::<_>();
+
+    (std_dir, files)
 }
 
 fn load_resource_from_file_system() -> Option<Vec<LuaFileInfo>> {
@@ -83,7 +96,7 @@ fn walk_resource_dir(dir: &Dir, files: &mut Vec<LuaFileInfo>) {
             DirEntry::File(file) => {
                 let path = file.path();
                 let content = file.contents_utf8().unwrap();
-        
+
                 files.push(LuaFileInfo {
                     path: path.to_str().unwrap().to_string(),
                     content: content.to_string(),
@@ -94,4 +107,4 @@ fn walk_resource_dir(dir: &Dir, files: &mut Vec<LuaFileInfo>) {
             }
         }
     }
-}
+}

crates/emmylua_doc_cli/src/main.rs

@@ -7,8 +7,13 @@ mod markdown_generator;
 
 fn main() {
     let args = CmdArgs::from_args();
-    let analysis = init::load_workspace(vec![args.input.to_str().unwrap()]);
+    let mut input = args.input;
+    if input.is_relative() {
+        input = std::env::current_dir().ok().unwrap().join(&input);
+    }
+
+    let analysis = init::load_workspace(vec![input.to_str().unwrap()]);
     if let Some(mut analysis) = analysis {
-        markdown_generator::generate_markdown(&mut analysis, &args.input, &args.output);
+        markdown_generator::generate_markdown(&mut analysis, &input, &args.output);
     }
 }

crates/emmylua_doc_cli/src/markdown_generator/typ_gen.rs

@@ -38,13 +38,6 @@ pub fn generate_type_markdown(
 }
 
 fn check_filter(db: &DbIndex, typ: &LuaTypeDecl, workspace: &Path) -> Option<()> {
-    // if workspace is relative path, convert it to absolute path
-    let workspace = if workspace.is_relative() {
-        std::env::current_dir().ok()?.join(workspace)
-    } else {
-        workspace.to_path_buf()
-    };
-
     let location = typ.get_locations();
     for loc in location {
         let file_id = loc.file_id;