From 376a76d1d3c39a1686b6ac7a6118c1f80af3178e Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sun, 30 Jul 2017 21:51:44 +0900
Subject: [bash] Do not append space when path completion is cancelled

Close #990
---
 shell/completion.bash | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'shell/completion.bash')

diff --git a/shell/completion.bash b/shell/completion.bash
index e8c34e57..eeb5a5d9 100644
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -151,7 +151,7 @@ __fzf_generic_path_completion() {
         matches=$(eval "$1 $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS" $fzf $2 -q "$leftover" | while read -r item; do
           printf "%q$3 " "$item"
         done)
-        matches=${matches% }
+        [ $4 = 1 ] && matches=${matches% }
         if [ -n "$matches" ]; then
           COMPREPLY=( "$matches" )
         else
@@ -167,6 +167,7 @@ __fzf_generic_path_completion() {
     shift
     shift
     shift
+    shift
     _fzf_handle_dynamic_completion "$cmd" "$@"
   fi
 }
@@ -198,7 +199,7 @@ _fzf_complete() {
 }
 
 _fzf_path_completion() {
-  __fzf_generic_path_completion _fzf_compgen_path "-m" "" "$@"
+  __fzf_generic_path_completion _fzf_compgen_path "-m" "" 0 "$@"
 }
 
 # Deprecated. No file only completion.
@@ -207,7 +208,7 @@ _fzf_file_completion() {
 }
 
 _fzf_dir_completion() {
-  __fzf_generic_path_completion _fzf_compgen_dir "" "/" "$@"
+  __fzf_generic_path_completion _fzf_compgen_dir "" "/" 1 "$@"
 }
 
 _fzf_complete_kill() {
@@ -299,7 +300,7 @@ _fzf_defc() {
 
 # Anything
 for cmd in $a_cmds; do
-  _fzf_defc "$cmd" _fzf_path_completion "-o default -o bashdefault"
+  _fzf_defc "$cmd" _fzf_path_completion "-o nospace -o default -o bashdefault"
 done
 
 # Directory
-- 
cgit v1.2.3