[#1458][#1473] Test fixes; update RELEASE-NOTES for autocompletion su…

…pport for file names with spaces
remkop · Nov 25, 2021 · b7612f8 · b7612f8
1 parent 6e59e18
commit b7612f8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -21,6 +21,7 @@ Picocli follows [semantic versioning](http://semver.org/).
 ## <a name="4.6.3-fixes"></a> Fixed issues
 * [#1474] Bugfix: Avoid `UnsupportedCharsetException: cp65001` on Microsoft Windows console when code page is set to UTF-8. Thanks to [epuni](https://github.com/epuni) for raising this.
 * [#1466][#1467] Bugfix/Enhancement: Autocomplete now shows subcommand aliases in the completion candidates. Thanks to [Ruud Senden](https://github.com/rsenden) for the pull request.
+* [#1458][#1473] Enhancement: autocompletion now supports file names containing spaces. Thanks to [zpater345](https://github.com/zpater345) for raising this and thanks to [NewbieOrange](https://github.com/NewbieOrange) for the pull request.
 * [#1475] Enhancement: Fix typo in annotation target-type error message. Thanks to [Ross Goldberg](https://github.com/rgoldberg) for the pull request.
 * [#1409][#1463] DOC: add documentation section on using default values in argument groups. Thanks to [Ben Kedo](https://github.com/MadFoal) for the pull request.
 * [#1462] DOC, BUILD, DEP: Extend documentation on argument files, fix broken/outdated links, update dependencies. Thanks to [Andreas Deininger](https://github.com/deining) for the pull request.

diff --git a/src/test/resources/picocompletion-demo-help_completion.bash b/src/test/resources/picocompletion-demo-help_completion.bash
@@ -295,6 +295,7 @@ function _picocli_picocompletion-demo-help_sub2alias() {
       return
       ;;
     --directory|-d)
+      local IFS=$'\n'
       compopt -o filenames
       COMPREPLY=( $( compgen -f -- "${curr_word}" ) ) # files
       return $?
@@ -511,6 +512,7 @@ function _picocli_picocompletion-demo-help_sub2_sub2child3alias() {
     if (( currIndex >= 0 && currIndex <= 0 )); then
       positionals=$( compgen -W "$cands_pos_param_args" -- "${curr_word}" )
     elif (( currIndex >= 1 && currIndex <= 2 )); then
+      local IFS=$'\n'
       compopt -o filenames
       positionals=$( compgen -f -- "${curr_word}" ) # files
     elif (( currIndex >= 3 && currIndex <= 2147483647 )); then
@@ -670,6 +672,7 @@ function _picocli_picocompletion-demo-help_sub2alias_subsub3() {
     if (( currIndex >= 0 && currIndex <= 0 )); then
       positionals=$( compgen -W "$cands_pos_param_args" -- "${curr_word}" )
     elif (( currIndex >= 1 && currIndex <= 2 )); then
+      local IFS=$'\n'
       compopt -o filenames
       positionals=$( compgen -f -- "${curr_word}" ) # files
     elif (( currIndex >= 3 && currIndex <= 2147483647 )); then
@@ -699,6 +702,7 @@ function _picocli_picocompletion-demo-help_sub2alias_sub2child3alias() {
     if (( currIndex >= 0 && currIndex <= 0 )); then
       positionals=$( compgen -W "$cands_pos_param_args" -- "${curr_word}" )
     elif (( currIndex >= 1 && currIndex <= 2 )); then
+      local IFS=$'\n'
       compopt -o filenames
       positionals=$( compgen -f -- "${curr_word}" ) # files
     elif (( currIndex >= 3 && currIndex <= 2147483647 )); then

diff --git a/src/test/resources/picocompletion-demo_completion.bash b/src/test/resources/picocompletion-demo_completion.bash
@@ -293,6 +293,7 @@ function _picocli_picocompletion-demo_sub2alias() {
       return
       ;;
     --directory|-d)
+      local IFS=$'\n'
       compopt -o filenames
       COMPREPLY=( $( compgen -f -- "${curr_word}" ) ) # files
       return $?
@@ -492,6 +493,7 @@ function _picocli_picocompletion-demo_sub2_sub2child3alias() {
     if (( currIndex >= 0 && currIndex <= 0 )); then
       positionals=$( compgen -W "$cands_pos_param_args" -- "${curr_word}" )
     elif (( currIndex >= 1 && currIndex <= 2 )); then
+      local IFS=$'\n'
       compopt -o filenames
       positionals=$( compgen -f -- "${curr_word}" ) # files
     elif (( currIndex >= 3 && currIndex <= 2147483647 )); then
@@ -651,6 +653,7 @@ function _picocli_picocompletion-demo_sub2alias_subsub3() {
     if (( currIndex >= 0 && currIndex <= 0 )); then
       positionals=$( compgen -W "$cands_pos_param_args" -- "${curr_word}" )
     elif (( currIndex >= 1 && currIndex <= 2 )); then
+      local IFS=$'\n'
       compopt -o filenames
       positionals=$( compgen -f -- "${curr_word}" ) # files
     elif (( currIndex >= 3 && currIndex <= 2147483647 )); then
@@ -680,6 +683,7 @@ function _picocli_picocompletion-demo_sub2alias_sub2child3alias() {
     if (( currIndex >= 0 && currIndex <= 0 )); then
       positionals=$( compgen -W "$cands_pos_param_args" -- "${curr_word}" )
     elif (( currIndex >= 1 && currIndex <= 2 )); then
+      local IFS=$'\n'
       compopt -o filenames
       positionals=$( compgen -f -- "${curr_word}" ) # files
     elif (( currIndex >= 3 && currIndex <= 2147483647 )); then