From 9d2c6a95f4259e9bccc114f48b3b3d21a357b6d1 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Mon, 31 Jul 2017 14:08:17 +0900
Subject: [PATCH] Revert "[bash] Do not append space when path completion is
 cancelled"

This reverts commit 376a76d1d3c39a1686b6ac7a6118c1f80af3178e as it
affects normal completion
---
 shell/completion.bash |  9 ++++-----
 test/test_go.rb       | 13 -------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/shell/completion.bash b/shell/completion.bash
index eeb5a5d..e8c34e5 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)
-        [ $4 = 1 ] && matches=${matches% }
+        matches=${matches% }
         if [ -n "$matches" ]; then
           COMPREPLY=( "$matches" )
         else
@@ -167,7 +167,6 @@ __fzf_generic_path_completion() {
     shift
     shift
     shift
-    shift
     _fzf_handle_dynamic_completion "$cmd" "$@"
   fi
 }
@@ -199,7 +198,7 @@ _fzf_complete() {
 }
 
 _fzf_path_completion() {
-  __fzf_generic_path_completion _fzf_compgen_path "-m" "" 0 "$@"
+  __fzf_generic_path_completion _fzf_compgen_path "-m" "" "$@"
 }
 
 # Deprecated. No file only completion.
@@ -208,7 +207,7 @@ _fzf_file_completion() {
 }
 
 _fzf_dir_completion() {
-  __fzf_generic_path_completion _fzf_compgen_dir "" "/" 1 "$@"
+  __fzf_generic_path_completion _fzf_compgen_dir "" "/" "$@"
 }
 
 _fzf_complete_kill() {
@@ -300,7 +299,7 @@ _fzf_defc() {
 
 # Anything
 for cmd in $a_cmds; do
-  _fzf_defc "$cmd" _fzf_path_completion "-o nospace -o default -o bashdefault"
+  _fzf_defc "$cmd" _fzf_path_completion "-o default -o bashdefault"
 done
 
 # Directory
diff --git a/test/test_go.rb b/test/test_go.rb
index fc3b908..fa4915a 100644
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -1482,19 +1482,6 @@ module CompletionTest
     tmux.send_keys :Enter
   end
 
-  def test_completion_cancel
-    %w[ls cd].each do |cmd|
-      tmux.prepare
-      tmux.send_keys "#{cmd} **", :Tab
-      tmux.until { |lines| lines.item_count > 0 }
-      tmux.send_keys 'C-c'
-      tmux.until { |lines| lines[-1].include?('**') }
-      tmux.send_keys 'xoxo'
-      tmux.until { |lines| lines[-1].include?('**xoxo') }
-      tmux.send_keys 'C-u'
-    end
-  end
-
   def test_dir_completion
     (1..100).each do |idx|
       FileUtils.mkdir_p "/tmp/fzf-test/d#{idx}"