nu_glob

Author: blindFS

Cargo.lock

@@ -9,9 +9,9 @@ license = "MIT"
 
 [dependencies]
 nu-cli = { path = "../nu-cli", version = "0.101.1" }
+nu-glob = { path = "../nu-glob", version = "0.101.1" }
 nu-parser = { path = "../nu-parser", version = "0.101.1" }
 nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
-nu-path = { path = "../nu-path", version = "0.101.1" }
 
 crossbeam-channel = { workspace = true }
 fuzzy-matcher = { workspace = true }
@@ -27,7 +27,6 @@ wax = { workspace = true }
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
 nu-command = { path = "../nu-command", version = "0.101.1" }
-nu-path = { path = "../nu-path", version = "0.101.1" }
 nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
 
 assert-json-diff = "2.0"

crates/nu-lsp/Cargo.toml

@@ -5,7 +5,6 @@ use std::{
     fs,
     path::{Path, PathBuf},
 };
-use wax::{Glob, WalkBehavior};
 
 use crate::{
     ast::find_reference_by_id, path_to_uri, span_to_range, uri_to_path, Id, LanguageServer,
@@ -16,7 +15,7 @@ use lsp_types::{
     TextDocumentPositionParams, TextEdit, Uri, WorkspaceEdit, WorkspaceFolder,
 };
 use miette::{miette, IntoDiagnostic, Result};
-use nu_path::canonicalize_with;
+use nu_glob::{glob, Paths};
 use nu_protocol::{engine::StateWorkingSet, Span};
 use serde_json::Value;
 
@@ -154,8 +153,9 @@ impl LanguageServer {
         let current_workspace_folder = self
             .get_workspace_folder_by_uri(current_uri)
             .ok_or_else(|| miette!("\nCurrent file is not in any workspace"))?;
-        let scripts = Self::find_nu_scripts_in_folder(&current_workspace_folder.uri)
-            .ok_or_else(|| miette!("\nFailed to find nu scripts in workspace"))?;
+        let scripts: Vec<PathBuf> = Self::find_nu_scripts_in_folder(&current_workspace_folder.uri)?
+            .filter_map(|p| p.ok())
+            .collect();
         let len = scripts.len();
 
         self.send_progress_begin(token.clone(), message)?;
@@ -233,28 +233,15 @@ impl LanguageServer {
             .cloned()
     }
 
-    fn find_nu_scripts_in_folder(folder_uri: &Uri) -> Option<Vec<PathBuf>> {
+    fn find_nu_scripts_in_folder(folder_uri: &Uri) -> Result<Paths> {
         println!(" ======================================== ");
         let path = uri_to_path(folder_uri);
         if !path.is_dir() {
-            return None;
+            return Err(miette!("\n workspace folder does not exist."));
         }
         let pattern = format!("{}/**/*.nu", path.to_string_lossy());
-        let (prefix, glob) = Glob::new(&pattern).ok()?.partition();
-        let path = canonicalize_with(&prefix, &path).ok()?;
-        Some(
-            glob.walk_with_behavior(
-                path,
-                WalkBehavior {
-                    // NOTE: as the progress is not cancellable ATM,
-                    // hard coded the max depth allowed in case it's triggered by accident
-                    depth: 5,
-                    ..Default::default()
-                },
-            )
-            .filter_map(|e| Some(e.ok()?.path().to_path_buf()))
-            .collect(),
-        )
+        println!(" ========= {} ========", pattern);
+        glob(&pattern).into_diagnostic()
     }
 }