feat(complete): Add DirPath support in bash

Author: sudotac

clap_complete/src/shells/bash.rs

@@ -170,6 +170,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,
  };
 
@@ -229,6 +230,8 @@ fn vals_for(o: &Arg) -> String {
  .collect::<Vec<_>>()
  .join(" ")
  )
+ } else if o.get_value_hint() == ValueHint::DirPath {
+ String::from("") // should be empty to avoid duplicate candidates
  } else if o.get_value_hint() == ValueHint::Other {
  String::from("\"${cur}\"")
  } else {

clap_complete/tests/snapshots/home/static/exhaustive/bash/.bashrc

@@ -567,11 +567,17 @@ _exhaustive() {
  return 0
  ;;
  --dir)
- COMPREPLY=($(compgen -f "${cur}"))
+ COMPREPLY=()
+ if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
+ compopt -o plusdirs
+ fi
  return 0
  ;;
  -d)
- COMPREPLY=($(compgen -f "${cur}"))
+ COMPREPLY=()
+ if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
+ compopt -o plusdirs
+ fi
  return 0
  ;;
  --exe)

clap_complete/tests/snapshots/value_hint.bash

@@ -60,11 +60,17 @@ _my-app() {
  return 0
  ;;
  --dir)
- COMPREPLY=($(compgen -f "${cur}"))
+ COMPREPLY=()
+ if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
+ compopt -o plusdirs
+ fi
  return 0
  ;;
  -d)
- COMPREPLY=($(compgen -f "${cur}"))
+ COMPREPLY=()
+ if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
+ compopt -o plusdirs
+ fi
  return 0
  ;;
  --exe)

clap_complete/tests/testsuite/bash.rs

@@ -200,8 +200,8 @@ fn complete() {
  );
  let actual = runtime.complete(input.as_str(), &term).unwrap();
  assert!(
- actual.contains("a_file")
- && actual.contains("b_file")
+ !actual.contains("a_file")
+ && !actual.contains("b_file")
  && actual.contains("c_dir")
  && actual.contains("d_dir"),
  "Actual output:\n{}",