Move fix to DotNuCompletion

Author: hongquan

crates/nu-cli/src/completions/completer.rs

@@ -322,46 +322,16 @@ impl NuCompleter {
                             || prev_expr_str == b"overlay use"
                             || prev_expr_str == b"source-env"
                         {
-                            // Apart from default completer, which searches for .nu files from NU_LIB_DIRS,
-                            // we also support the case where .nu files are in other folders, like Python
-                            // virtual environments.
-                            let mut default_completer = DotNuCompletion::new();
-                            let default_suggestions = self.process_completion(
-                                &mut default_completer,
-                                &working_set,
-                                prefix,
-                                new_span,
-                                fake_offset,
-                                pos,
-                            );
-                            if !default_suggestions.is_empty() || prefix.len() < 2 {
-                                return default_suggestions;
-                            }
+                            let mut completer = DotNuCompletion::new();
 
-                            // When user types the beginning of a path, sometimes DotNuCompletion doesn't give a result.
-                            // We will search subdirectories and files, then. We only switch to these provider if user
-                            // has typed at least 2 characters for the path.
-                            let mut file_completer =
-                                FileCompletion::new_with_suffix(".nu".to_string());
-                            let mut file_suggestions = self.process_completion(
-                                &mut file_completer,
-                                &working_set,
-                                prefix,
-                                new_span,
-                                fake_offset,
-                                pos,
-                            );
-                            let mut dir_completer = DirectoryCompletion::new();
-                            let mut dir_suggestions = self.process_completion(
-                                &mut dir_completer,
+                            return self.process_completion(
+                                &mut completer,
                                 &working_set,
                                 prefix,
                                 new_span,
                                 fake_offset,
                                 pos,
                             );
-                            file_suggestions.append(&mut dir_suggestions);
-                            return file_suggestions;
                         } else if prev_expr_str == b"ls" {
                             let mut completer = FileCompletion::new();
 

crates/nu-cli/src/completions/dotnu_completions.rs

@@ -35,10 +35,19 @@ impl Completer for DotNuCompletion {
         let prefix_str = prefix_str.replace('`', "");
         let mut search_dirs: Vec<PathBuf> = vec![];
 
-        // If prefix_str is only a word we want to search in the current dir
-        let (base, partial) = prefix_str
-            .rsplit_once(is_separator)
-            .unwrap_or((".", &prefix_str));
+        let (base, partial) = if prefix_str == "~" {
+            ("~", "")
+        } else if let Some((parent, remain)) = prefix_str.split_once(is_separator) {
+            // If prefix_str is only a word we want to search in the current dir.
+            // "/xx" should be split to "/" and "xx".
+            if parent.is_empty() {
+                ("/", remain)
+            } else {
+                (parent, remain)
+            }
+        } else {
+            (".", prefix_str.as_str())
+        };
         let base_dir = base.replace(is_separator, MAIN_SEPARATOR_STR);
 
         // Fetch the lib dirs
@@ -61,15 +70,26 @@ impl Completer for DotNuCompletion {
         // rsplit_once removes the separator
         let cwd = working_set.permanent_state.cwd(None);
         if base_dir != "." {
-            // Search in base_dir as well as lib_dirs
+            let expanded_base_dir = expand_tilde(&base_dir);
+            let is_base_dir_relative = expanded_base_dir.is_relative();
+            // Search in base_dir as well as lib_dirs.
+            // After expanded, base_dir can be a relative path or absolute path.
+            // If relative, we join "current working dir" with it to get subdirectory and add to search_dirs.
+            // If absolute, we add it to search_dirs.
             if let Ok(mut cwd) = cwd {
-                cwd.push(&base_dir);
-                search_dirs.push(cwd.into_std_path_buf());
+                if is_base_dir_relative {
+                    cwd.push(&base_dir);
+                    search_dirs.push(cwd.into_std_path_buf());
+                } else {
+                    search_dirs.push(expanded_base_dir);
+                }
+            }
+            if is_base_dir_relative {
+                search_dirs.extend(lib_dirs.into_iter().map(|mut dir| {
+                    dir.push(&base_dir);
+                    dir
+                }));
             }
-            search_dirs.extend(lib_dirs.into_iter().map(|mut dir| {
-                dir.push(&base_dir);
-                dir
-            }));
         } else {
             if let Ok(cwd) = cwd {
                 search_dirs.push(cwd.into_std_path_buf());
@@ -105,7 +125,9 @@ impl Completer for DotNuCompletion {
                 let mut span_offset = 0;
                 let mut value = x.path.to_string();
                 // Complete only the last path component
-                if base_dir != "." {
+                if base_dir == "/" {
+                    span_offset = base_dir.len()
+                } else if base_dir != "." {
                     span_offset = base_dir.len() + 1
                 }
                 // Retain only one '`'

crates/nu-cli/src/completions/file_completions.rs

@@ -12,17 +12,12 @@ use std::path::Path;
 use super::{completion_common::FileSuggestion, SemanticSuggestion};
 
 #[derive(Clone, Default)]
-pub struct FileCompletion {
-    suffix: String,
-}
+pub struct FileCompletion {}
 
 impl FileCompletion {
     pub fn new() -> Self {
         Self::default()
     }
-    pub fn new_with_suffix(suffix: String) -> Self {
-        Self { suffix }
-    }
 }
 
 impl Completer for FileCompletion {
@@ -42,46 +37,31 @@ impl Completer for FileCompletion {
             readjusted,
         } = adjust_if_intermediate(prefix, working_set, span);
 
-        let cwd = working_set
-            .permanent_state
-            .cwd(None)
-            .ok()
-            .and_then(|p| p.into_os_string().into_string().ok());
-
-        let cwds = if let Some(d) = cwd {
-            vec![d]
-        } else {
-            Vec::new()
-        };
-
-        let mut files = complete_item(
+        #[allow(deprecated)]
+        let items: Vec<_> = complete_item(
             readjusted,
             span,
             &prefix,
-            &cwds,
+            &[&working_set.permanent_state.current_work_dir()],
             options,
             working_set.permanent_state,
             stack,
-        );
-        if !self.suffix.is_empty() {
-            files.retain(|f| f.path.trim_end_matches('`').ends_with(&self.suffix));
-        }
-        let items: Vec<_> = files
-            .into_iter()
-            .map(move |x| SemanticSuggestion {
-                suggestion: Suggestion {
-                    value: x.path,
-                    style: x.style,
-                    span: reedline::Span {
-                        start: x.span.start - offset,
-                        end: x.span.end - offset,
-                    },
-                    ..Suggestion::default()
+        )
+        .into_iter()
+        .map(move |x| SemanticSuggestion {
+            suggestion: Suggestion {
+                value: x.path,
+                style: x.style,
+                span: reedline::Span {
+                    start: x.span.start - offset,
+                    end: x.span.end - offset,
                 },
-                // TODO????
-                kind: None,
-            })
-            .collect();
+                ..Suggestion::default()
+            },
+            // TODO????
+            kind: None,
+        })
+        .collect();
 
         // Sort results prioritizing the non hidden folders