fix: relative path completion fixes (#137)

reubeno · Jul 23, 2024 · bf52bcf · bf52bcf
1 parent 1e95afc
commit bf52bcf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/brush-core/src/completion.rs b/brush-core/src/completion.rs
@@ -853,7 +853,7 @@ impl Config {
 fn get_file_completions(shell: &Shell, context: &Context, must_be_dir: bool) -> Vec<String> {
     let glob = std::format!("{}*", context.token_to_complete);
 
-    let path_filter = |path: &Path| !must_be_dir || path.is_dir();
+    let path_filter = |path: &Path| !must_be_dir || shell.get_absolute_path(path).is_dir();
 
     // TODO: Pass through quoting.
     patterns::Pattern::from(glob)

diff --git a/brush-core/src/shell.rs b/brush-core/src/shell.rs
@@ -886,7 +886,7 @@ impl Shell {
     /// # Arguments
     ///
     /// * `path` - The path to get the absolute form of.
-    pub(crate) fn get_absolute_path(&self, path: &Path) -> PathBuf {
+    pub fn get_absolute_path(&self, path: &Path) -> PathBuf {
         if path.is_absolute() {
             path.to_owned()
         } else {

diff --git a/brush-interactive/src/interactive_shell.rs b/brush-interactive/src/interactive_shell.rs
@@ -236,6 +236,8 @@ impl EditorHelper {
         line: &str,
         pos: usize,
     ) -> rustyline::Result<(usize, Vec<rustyline::completion::Pair>)> {
+        let working_dir = self.shell.working_dir.clone();
+
         // Intentionally ignore any errors that arise.
         let completion_future = self.shell.get_completions(line, pos);
         tokio::pin!(completion_future);
@@ -261,9 +263,17 @@ impl EditorHelper {
         if completions.options.treat_as_filenames {
             for candidate in &mut completions.candidates {
                 // Check if it's a directory.
-                if !candidate.ends_with(std::path::MAIN_SEPARATOR) && Path::new(candidate).is_dir()
-                {
-                    candidate.push(std::path::MAIN_SEPARATOR);
+                if !candidate.ends_with(std::path::MAIN_SEPARATOR) {
+                    let candidate_path = Path::new(candidate);
+                    let abs_candidate_path = if candidate_path.is_absolute() {
+                        PathBuf::from(candidate_path)
+                    } else {
+                        working_dir.join(candidate_path)
+                    };
+
+                    if abs_candidate_path.is_dir() {
+                        candidate.push(std::path::MAIN_SEPARATOR);
+                    }
                 }
             }
         }