feat(complete): Add DirPath support in bash

clap-rs · Dec 3, 2023 · 7cfd921 · 7cfd921
1 parent b1d3f9e
commit 7cfd921
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/clap_complete/src/shells/bash.rs b/clap_complete/src/shells/bash.rs
@@ -166,6 +166,7 @@ fn option_details_for_path(cmd: &Command, path: &str) -> String {
     for o in p.get_opts() {
         let compopt = match o.get_value_hint() {
             ValueHint::FilePath => Some("compopt -o filenames"),
+            ValueHint::DirPath => Some("compopt -o plusdirs"),
             _ => None,
         };
 
@@ -217,6 +218,8 @@ fn vals_for(o: &Arg) -> String {
                 .collect::<Vec<_>>()
                 .join(" ")
         )
+    } else if o.get_value_hint() == ValueHint::DirPath {
+        String::from("$(compgen -d \"${cur}\")")
     } else if o.get_value_hint() == ValueHint::Other {
         String::from("\"${cur}\"")
     } else {

diff --git a/clap_complete/tests/snapshots/home/static/exhaustive/bash/.bashrc b/clap_complete/tests/snapshots/home/static/exhaustive/bash/.bashrc
@@ -563,11 +563,13 @@ _exhaustive() {
                     return 0
                     ;;
                 --dir)
-                    COMPREPLY=($(compgen -f "${cur}"))
+                    COMPREPLY=($(compgen -d "${cur}"))
+                    compopt -o plusdirs
                     return 0
                     ;;
                 -d)
-                    COMPREPLY=($(compgen -f "${cur}"))
+                    COMPREPLY=($(compgen -d "${cur}"))
+                    compopt -o plusdirs
                     return 0
                     ;;
                 --exe)

diff --git a/clap_complete/tests/snapshots/value_hint.bash b/clap_complete/tests/snapshots/value_hint.bash
@@ -56,11 +56,13 @@ _my-app() {
                     return 0
                     ;;
                 --dir)
-                    COMPREPLY=($(compgen -f "${cur}"))
+                    COMPREPLY=($(compgen -d "${cur}"))
+                    compopt -o plusdirs
                     return 0
                     ;;
                 -d)
-                    COMPREPLY=($(compgen -f "${cur}"))
+                    COMPREPLY=($(compgen -d "${cur}"))
+                    compopt -o plusdirs
                     return 0
                     ;;
                 --exe)