library will no longer use the ignore configuration.

Author: CppCXY

crates/emmylua_check/src/init.rs

@@ -60,7 +60,7 @@ pub fn setup_logger(verbose: bool) {
 
 pub fn load_workspace(
     main_path: PathBuf,
-    mut workspace_folders: Vec<PathBuf>,
+    workspace_folders: Vec<PathBuf>,
     config_paths: Option<Vec<PathBuf>>,
     ignore: Option<Vec<String>>,
 ) -> Option<EmmyLuaAnalysis> {
@@ -93,9 +93,10 @@ pub fn load_workspace(
     let mut analysis = EmmyLuaAnalysis::new();
     analysis.update_config(emmyrc.clone().into());
     analysis.init_std_lib(None);
-
+    let mut workspace_infos = vec![];
     for path in &workspace_folders {
         analysis.add_main_workspace(path.clone());
+        workspace_infos.push((path.clone(), false));
     }
 
     for root in &emmyrc.workspace.workspace_roots {
@@ -104,10 +105,10 @@ pub fn load_workspace(
 
     for lib in &emmyrc.workspace.library {
         analysis.add_library_workspace(PathBuf::from(lib));
-        workspace_folders.push(PathBuf::from(lib));
+        workspace_infos.push((PathBuf::from(lib), true));
     }
 
-    let file_infos = collect_files(&workspace_folders, &analysis.emmyrc, ignore);
+    let file_infos = collect_files(&workspace_infos, &analysis.emmyrc, ignore);
     let files = file_infos
         .into_iter()
         .filter_map(|file| {
@@ -134,7 +135,7 @@ pub fn load_workspace(
 }
 
 pub fn collect_files(
-    workspaces: &Vec<PathBuf>,
+    workspaces: &Vec<(PathBuf, bool)>,
     emmyrc: &Emmyrc,
     ignore: Option<Vec<String>>,
 ) -> Vec<LuaFileInfo> {
@@ -143,15 +144,19 @@ pub fn collect_files(
 
     let encoding = &emmyrc.workspace.encoding;
 
-    for workspace in workspaces {
-        let loaded = load_workspace_files(
-            workspace,
-            &match_pattern,
-            &exclude,
-            &exclude_dir,
-            Some(encoding),
-        )
-        .ok();
+    for (workspace, is_lib) in workspaces {
+        let loaded = if *is_lib {
+            load_workspace_files(workspace, &match_pattern, &[], &[], Some(encoding)).ok()
+        } else {
+            load_workspace_files(
+                workspace,
+                &match_pattern,
+                &exclude,
+                &exclude_dir,
+                Some(encoding),
+            )
+            .ok()
+        };
         if let Some(loaded) = loaded {
             files.extend(loaded);
         }

crates/emmylua_ls/src/context/workspace_manager.rs

@@ -24,20 +24,23 @@ pub enum WorkspaceImport {
 pub struct WorkspaceFolder {
     pub root: PathBuf,
     pub import: WorkspaceImport,
+    pub is_library: bool,
 }
 
 impl WorkspaceFolder {
-    pub fn new(root: PathBuf) -> Self {
+    pub fn new(root: PathBuf, is_library: bool) -> Self {
         Self {
             root,
             import: WorkspaceImport::All,
+            is_library,
         }
     }
 
-    pub fn with_sub_paths(root: PathBuf, sub_paths: Vec<PathBuf>) -> Self {
+    pub fn with_sub_paths(root: PathBuf, sub_paths: Vec<PathBuf>, is_library: bool) -> Self {
         Self {
             root,
             import: WorkspaceImport::SubPaths(sub_paths),
+            is_library,
         }
     }
 }

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

@@ -18,29 +18,38 @@ pub fn collect_files(workspaces: &Vec<WorkspaceFolder>, emmyrc: &Emmyrc) -> Vec<
     for workspace in workspaces {
         match &workspace.import {
             WorkspaceImport::All => {
-                let loaded = load_workspace_files(
-                    &workspace.root,
-                    &match_pattern,
-                    &exclude,
-                    &exclude_dir,
-                    Some(encoding),
-                )
-                .ok();
+                let loaded = if workspace.is_library {
+                    load_workspace_files(&workspace.root, &match_pattern, &[], &[], Some(encoding))
+                        .ok()
+                } else {
+                    load_workspace_files(
+                        &workspace.root,
+                        &match_pattern,
+                        &exclude,
+                        &exclude_dir,
+                        Some(encoding),
+                    )
+                    .ok()
+                };
                 if let Some(loaded) = loaded {
                     files.extend(loaded);
                 }
             }
             WorkspaceImport::SubPaths(paths) => {
                 for sub in paths {
                     let target = workspace.root.join(sub);
-                    let loaded = load_workspace_files(
-                        &target,
-                        &match_pattern,
-                        &exclude,
-                        &exclude_dir,
-                        Some(encoding),
-                    )
-                    .ok();
+                    let loaded = if workspace.is_library {
+                        load_workspace_files(&target, &match_pattern, &[], &[], Some(encoding)).ok()
+                    } else {
+                        load_workspace_files(
+                            &target,
+                            &match_pattern,
+                            &exclude,
+                            &exclude_dir,
+                            Some(encoding),
+                        )
+                        .ok()
+                    };
                     if let Some(loaded) = loaded {
                         files.extend(loaded);
                     }

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

@@ -136,14 +136,13 @@ pub async fn init_analysis(
         log::info!("add workspace root: {:?}", workspace_root);
         let root_path = PathBuf::from(workspace_root);
         mut_analysis.add_main_workspace(root_path.clone());
-        workspace_folders.push(WorkspaceFolder::new(root_path));
     }
 
     for lib in &emmyrc.workspace.library {
         log::info!("add library: {:?}", lib);
         let lib_path = PathBuf::from(lib);
         mut_analysis.add_library_workspace(lib_path.clone());
-        workspace_folders.push(WorkspaceFolder::new(lib_path));
+        workspace_folders.push(WorkspaceFolder::new(lib_path, true));
     }
 
     for package_dir in &emmyrc.workspace.package_dirs {
@@ -160,6 +159,7 @@ pub async fn init_analysis(
                 workspace_folders.push(WorkspaceFolder::with_sub_paths(
                     parent_path,
                     vec![PathBuf::from(name)],
+                    true,
                 ));
             } else {
                 log::warn!("package dir {:?} has no file name", package_path);
@@ -214,7 +214,7 @@ pub fn get_workspace_folders(params: &InitializeParams) -> Vec<WorkspaceFolder>
     if let Some(workspaces) = &params.workspace_folders {
         for workspace in workspaces {
             if let Some(path) = uri_to_file_path(&workspace.uri) {
-                workspace_folders.push(WorkspaceFolder::new(path));
+                workspace_folders.push(WorkspaceFolder::new(path, false));
             }
         }
     }
@@ -225,7 +225,7 @@ pub fn get_workspace_folders(params: &InitializeParams) -> Vec<WorkspaceFolder>
         if let Some(uri) = &params.root_uri {
             let root_workspace = uri_to_file_path(uri);
             if let Some(path) = root_workspace {
-                workspace_folders.push(WorkspaceFolder::new(path));
+                workspace_folders.push(WorkspaceFolder::new(path, false));
             }
         }
     }