add option resources-path and load-stdlib

Author: CppCXY

crates/emmylua_check/src/init.rs

@@ -11,7 +11,7 @@ pub fn load_workspace(
     ignore: Option<Vec<String>>,
 ) -> Option<EmmyLuaAnalysis> {
     let mut analysis = EmmyLuaAnalysis::new();
-    analysis.init_std_lib(false);
+    analysis.init_std_lib(None);
 
     let mut workspace_folders = vec![workspace_folder];
     for path in &workspace_folders {

crates/emmylua_code_analysis/resources/std/global.lua

@@ -355,8 +355,8 @@ function select(index, ...) end
 ---@field __eq? fun(t1,t2):boolean
 ---@field __lt? fun(t1,t2):boolean
 ---@field __le? fun(t1,t2):boolean
----@field __index? table|(fun(t,k):any
----@field __newindex? table|fun(t,k,v
+---@field __index? table|fun(t,k):any
+---@field __newindex? table|fun(t,k,v)
 ---@field __call? fun(t,...): any...
 ---@field __pairs? fun(t):((fun(t,k,v):any,any),any,any)
 ---@field __close? fun(t,errobj):any

crates/emmylua_code_analysis/src/lib.rs

@@ -52,8 +52,8 @@ impl EmmyLuaAnalysis {
         }
     }
 
-    pub fn init_std_lib(&mut self, allow_create_resources_dir: bool) {
-        let (std_root, files) = load_resource_std(allow_create_resources_dir);
+    pub fn init_std_lib(&mut self, create_resources_dir: Option<String>) {
+        let (std_root, files) = load_resource_std(create_resources_dir);
         self.compilation
             .get_db_mut()
             .get_module_index_mut()

crates/emmylua_code_analysis/src/resources/mod.rs

@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use include_dir::{include_dir, Dir, DirEntry};
 
@@ -7,20 +7,28 @@ use crate::{load_workspace_files, LuaFileInfo};
 static RESOURCE_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/resources");
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
-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();
+pub fn load_resource_std(create_resources_dir: Option<String>) -> (PathBuf, Vec<LuaFileInfo>) {
+    if let Some(create_resources_dir) = create_resources_dir {
+        let resource_path = if create_resources_dir.is_empty() {
+            let exe_path = std::env::current_exe().unwrap();
+            let exe_dir = exe_path.parent().unwrap();
+            let resoucres_dir = exe_dir.join("resources");
+            resoucres_dir
+        } else {
+            PathBuf::from(&create_resources_dir)
+        };
+        let std_dir = PathBuf::from(&create_resources_dir).join("std");
+        let result = load_resource_from_file_system(&resource_path);
         match result {
             Some(files) => return (std_dir, files),
             None => {}
         }
     }
 
+    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");
     let files = load_resource_from_include_dir();
     let files = files
         .into_iter()
@@ -40,16 +48,12 @@ pub fn load_resource_std(allow_create_resources_dir: bool) -> (PathBuf, Vec<LuaF
     (std_dir, files)
 }
 
-fn load_resource_from_file_system() -> Option<Vec<LuaFileInfo>> {
-    let exe_path = std::env::current_exe().unwrap();
-    let exe_dir = exe_path.parent().unwrap();
-    let resoucres_dir = exe_dir.join("resources");
-
+fn load_resource_from_file_system(resources_dir: &Path) -> Option<Vec<LuaFileInfo>> {
     if check_need_dump_to_file_system() {
-        log::info!("Creating resources dir: {:?}", resoucres_dir);
+        log::info!("Creating resources dir: {:?}", resources_dir);
         let files = load_resource_from_include_dir();
         for file in &files {
-            let path = resoucres_dir.join(&file.path);
+            let path = resources_dir.join(&file.path);
             let parent = path.parent().unwrap();
             if !parent.exists() {
                 match std::fs::create_dir_all(parent) {
@@ -70,7 +74,7 @@ fn load_resource_from_file_system() -> Option<Vec<LuaFileInfo>> {
             }
         }
 
-        let version_path = resoucres_dir.join("version");
+        let version_path = resources_dir.join("version");
         let content = format!("{}", VERSION);
         match std::fs::write(&version_path, content) {
             Ok(_) => {}
@@ -81,7 +85,7 @@ fn load_resource_from_file_system() -> Option<Vec<LuaFileInfo>> {
         }
     }
 
-    let std_dir = resoucres_dir.join("std");
+    let std_dir = resources_dir.join("std");
     let match_pattern = vec!["**/*.lua".to_string()];
     let files = match load_workspace_files(&std_dir, &match_pattern, &Vec::new(), &Vec::new(), None)
     {

crates/emmylua_code_analysis/src/test_lib/mod.rs

@@ -35,7 +35,7 @@ impl VirtualWorkspace {
     pub fn new_with_init_std_lib() -> Self {
         let gen = VirtualUrlGenerator::new();
         let mut analysis = EmmyLuaAnalysis::new();
-        analysis.init_std_lib(false);
+        analysis.init_std_lib(None);
         let base = &gen.base;
         analysis.add_main_workspace(base.clone());
         VirtualWorkspace {

crates/emmylua_doc_cli/src/init.rs

@@ -7,7 +7,7 @@ use emmylua_code_analysis::{
 #[allow(unused)]
 pub fn load_workspace(workspace_folders: Vec<&str>) -> Option<EmmyLuaAnalysis> {
     let mut analysis = EmmyLuaAnalysis::new();
-    analysis.init_std_lib(false);
+    analysis.init_std_lib(None);
 
     let mut workspace_folders = workspace_folders
         .iter()

crates/emmylua_ls/src/cmd_args.rs

@@ -29,13 +29,33 @@ pub struct CmdArgs {
     )]
     pub port: u16,
 
-    /// Path to the log file
-    #[structopt(long = "log-path", help = "Path to the log file", default_value = "")]
-    pub log_path: String,
-
     /// Logging level (e.g., "error", "warn", "info", "debug", "trace")
     #[structopt(long = "log-level", help = "Logging level", default_value = "info")]
     pub log_level: LogLevel,
+
+    /// Path to the log file
+    #[structopt(
+        long = "log-path",
+        help = "Path to the log file. Use 'none' to disable log file output.",
+        default_value = ""
+    )]
+    pub log_path: NoneableString,
+
+    /// Path to the resources and logs directory. Use 'none' to indicate that assets should not be output to the file system.
+    #[structopt(
+        long = "resources-path",
+        help = "Path to the resources. Use 'none' to disable resources file output.",
+        default_value = ""
+    )]
+    pub resources_path: NoneableString,
+
+    /// Whether to load the standard library.
+    #[structopt(
+        long = "load-stdlib",
+        help = "Whether to load the standard library",
+        default_value = "true"
+    )]
+    pub load_std_lib: CmdBool,
 }
 
 /// Logging level enum
@@ -90,3 +110,44 @@ impl std::str::FromStr for Communication {
         }
     }
 }
+
+/// A string that can be "None" to represent an empty option
+#[derive(Debug, Clone)]
+pub struct NoneableString(pub Option<String>);
+
+impl std::str::FromStr for NoneableString {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if s.eq_ignore_ascii_case("none") {
+            Ok(NoneableString(None))
+        } else {
+            Ok(NoneableString(Some(s.to_string())))
+        }
+    }
+}
+
+#[allow(unused)]
+impl NoneableString {
+    pub fn as_deref(&self) -> Option<&str> {
+        self.0.as_deref()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct CmdBool(pub bool);
+
+impl std::str::FromStr for CmdBool {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "true" => Ok(CmdBool(true)),
+            "false" => Ok(CmdBool(false)),
+            _ => Err(format!(
+                "Invalid boolean value: '{}'. Please choose 'true' or 'false'",
+                s
+            )),
+        }
+    }
+}

crates/emmylua_ls/src/context/mod.rs

@@ -37,10 +37,7 @@ impl ServerContext {
             receiver: conn.receiver.clone(),
         }));
 
-        let mut analysis = EmmyLuaAnalysis::new();
-        analysis.init_std_lib(true);
-
-        let analysis = Arc::new(RwLock::new(analysis));
+        let analysis = Arc::new(RwLock::new(EmmyLuaAnalysis::new()));
         let status_bar = Arc::new(StatusBar::new(client.clone()));
         let file_diagnostic = Arc::new(FileDiagnostic::new(
             analysis.clone(),

crates/emmylua_ls/src/handlers/completion/test/mod.rs

@@ -38,7 +38,7 @@ impl CompletionVirtualWorkspace {
     pub fn new_with_init_std_lib() -> Self {
         let gen = VirtualUrlGenerator::new();
         let mut analysis = EmmyLuaAnalysis::new();
-        analysis.init_std_lib(false);
+        analysis.init_std_lib(None);
         let base = &gen.base;
         analysis.add_main_workspace(base.clone());
         CompletionVirtualWorkspace {

crates/emmylua_ls/src/handlers/hover/test/mod.rs

@@ -36,7 +36,7 @@ impl HoverVirtualWorkspace {
     pub fn new_with_init_std_lib() -> Self {
         let gen = VirtualUrlGenerator::new();
         let mut analysis = EmmyLuaAnalysis::new();
-        analysis.init_std_lib(false);
+        analysis.init_std_lib(None);
         let base = &gen.base;
         analysis.add_main_workspace(base.clone());
         HoverVirtualWorkspace {