Leverage existing bash completion

This is a PoC implementation for leveraging existing bash completion git **<tab> kubectl **<tab>
2025-11-10 12:23:48 -05:00 · 2024-09-30 19:08:28 +09:00
27 changed files with 427 additions and 920 deletions
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -7,4 +7,4 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v4
-    - uses: crate-ci/typos@v1.28.2
+    - uses: crate-ci/typos@v1.24.1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,57 +1,6 @@
 CHANGELOG
 =========

-0.57.0
------
- You can now resize the preview window by dragging the border
- Built-in walker improvements
-    - `--walker-root` can take multiple directory arguments. e.g. `--walker-root include src lib`
-    - `--walker-skip` can handle multi-component patterns. e.g. `--walker-skip target/build`
- Removed long processing delay when displaying images in the preview window
- `FZF_PREVIEW_*` environment variables are exported to all child processes (#4098)
- Bug fixes in fish scripts
-
-0.56.3
------
- Bug fixes in zsh scripts
-    - fix(zsh): handle backtick trigger edge case (#4090)
-    - revert(zsh): remove 'fc -RI' call in the history widget (#4093)
-    - Thanks to @LangLangBart for the contributions
-
-0.56.2
------
- Bug fixes
-    - Fixed abnormal scrolling behavior when `--wrap` is set (#4083)
-    - [zsh] Fixed warning message when `ksh_arrays` is set (#4084)
-
-0.56.1
------
- Bug fixes and improvements
-    - Fixed a race condition which would cause fzf to present stale results after `reload` (#4070)
-    - `page-up` and `page-down` actions now work correctly with multi-line items (#4069)
-    - `{n}` is allowed in `SCROLL` expression in `--preview-window` (#4079)
-    - [zsh] Fixed regression in history loading with shared option (#4071)
-    - [zsh] Better command extraction in zsh completion (#4082)
- Thanks to @LangLangBart, @jaydee-coder, @alex-huff, and @vejkse for the contributions
-
-0.56.0
------
- Added `--gap[=N]` option to display empty lines between items.
-    - This can be useful to visually separate adjacent multi-line items.
-      ```sh
-      # All bash functions, highlighted
-      declare -f | perl -0777 -pe 's/^}\n/}\0/gm' |
-        bat --plain --language bash --color always |
-        fzf --read0 --ansi --reverse --multi --highlight-line --gap
-      ```
-    - Or just to make the list easier to read. For single-line items, you probably want to set `--color gutter:-1` as well to hide the gutter.
-      ```sh
-      fzf --info inline-right --gap --color gutter:-1
-      ```
- Added `noinfo` option to `--preview-window` to hide the scroll indicator in the preview window
- Bug fixes
-    - Thanks to @LangLangBart, @akinomyoga, and @charlievieth for fixing the bugs
-
 0.55.0
 ------
 _Release highlights: https://junegunn.github.io/fzf/releases/0.55.0/_
--- a/4
+++ b/4
@@ -8,5 +8,5 @@ RUN echo '. ~/.bashrc' >> ~/.bash_profile
 RUN rm -f /etc/bash.bashrc
 COPY . /fzf
 RUN cd /fzf && make install && ./install --all
-ENV LANG=C.UTF-8
-CMD ["bash", "-ic", "tmux new 'set -o pipefail; ruby /fzf/test/test_go.rb | tee out && touch ok' && cat out && [ -e ok ]"]
+ENV LANG C.UTF-8
+CMD tmux new 'set -o pipefail; ruby /fzf/test/test_go.rb | tee out && touch ok' && cat out && [ -e ok ]
--- a/README.md
+++ b/README.md
--- a/go.mod
+++ b/go.mod
@@ -1,13 +1,13 @@
 module github.com/junegunn/fzf

 require (
-	github.com/charlievieth/fastwalk v1.0.9
+	github.com/charlievieth/fastwalk v1.0.8
 	github.com/gdamore/tcell/v2 v2.7.4
 	github.com/junegunn/go-shellwords v0.0.0-20240813092932-a62c48c52e97
 	github.com/mattn/go-isatty v0.0.20
 	github.com/rivo/uniseg v0.4.7
-	golang.org/x/sys v0.28.0
-	golang.org/x/term v0.27.0
+	golang.org/x/sys v0.25.0
+	golang.org/x/term v0.24.0
 )

 require (
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-github.com/charlievieth/fastwalk v1.0.9 h1:Odb92AfoReO3oFBfDGT5J+nwgzQPF/gWAw6E6/lkor0=
-github.com/charlievieth/fastwalk v1.0.9/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI=
+github.com/charlievieth/fastwalk v1.0.8 h1:uaoH6cAKSk73aK7aKXqs0+bL+J3Txzd3NGH8tRXgHko=
+github.com/charlievieth/fastwalk v1.0.8/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU=
@@ -36,14 +36,14 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
--- a/41
+++ b/41
@@ -2,7 +2,7 @@

 set -u

-version=0.57.0
+version=0.55.0
 auto_completion=
 key_bindings=
 update_config=2
@@ -295,44 +295,35 @@ EOF
 fi

 append_line() {
-  local update line file pat lines
+  set -e
+
+  local update line file pat lno
  update="$1"
  line="$2"
  file="$3"
  pat="${4:-}"
-  lines=""
+  lno=""

  echo "Update $file:"
  echo "  - $line"
  if [ -f "$file" ]; then
    if [ $# -lt 4 ]; then
-      lines=$(\grep -nF "$line" "$file")
+      lno=$(\grep -nF "$line" "$file" | sed 's/:.*//' | tr '\n' ' ')
    else
-      lines=$(\grep -nF "$pat" "$file")
+      lno=$(\grep -nF "$pat" "$file" | sed 's/:.*//' | tr '\n' ' ')
    fi
  fi
-
-  if [ -n "$lines" ]; then
-    echo "    - Already exists:"
-    sed 's/^/        Line /' <<< "$lines"
-
-    update=0
-    if ! \grep -qv "^[0-9]*:[[:space:]]*#" <<< "$lines" ; then
-      echo "    - But they all seem to be commented"
-      ask  "    - Continue modifying $file?"
-      update=$?
-    fi
-  fi
-
-  set -e
-  if [ "$update" -eq 1 ]; then
-    [ -f "$file" ] && echo >> "$file"
-    echo "$line" >> "$file"
-    echo "    + Added"
+  if [ -n "$lno" ]; then
+    echo "    - Already exists: line #$lno"
  else
-    echo "    ~ Skipped"
+    if [ $update -eq 1 ]; then
+      [ -f "$file" ] && echo >> "$file"
+      echo "$line" >> "$file"
+      echo "    + Added"
+    else
+      echo "    ~ Skipped"
+    fi
  fi
-
  echo
  set +e
 }
--- a/install.ps1
+++ b/install.ps1
@@ -1,4 +1,4 @@
-$version="0.57.0"
+$version="0.55.0"

 $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition

--- a/main.go
+++ b/main.go
@@ -11,7 +11,7 @@ import (
 	"github.com/junegunn/fzf/src/protector"
 )

-var version = "0.57"
+var version = "0.55"
 var revision = "devel"

 //go:embed shell/key-bindings.bash
--- a/man/man1/fzf-tmux.1
+++ b/man/man1/fzf-tmux.1
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf\-tmux 1 "Dec 2024" "fzf 0.57.0" "fzf\-tmux - open fzf in tmux split pane"
+.TH fzf\-tmux 1 "Aug 2024" "fzf 0.55.0" "fzf\-tmux - open fzf in tmux split pane"

 .SH NAME
 fzf\-tmux - open fzf in tmux split pane
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf 1 "Dec 2024" "fzf 0.57.0" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Sep 2024" "fzf 0.56.0" "fzf - a command-line fuzzy finder"

 .SH NAME
 fzf - a command-line fuzzy finder
@@ -208,9 +208,6 @@ Indicator for wrapped lines. The default is '↳ ' or '> ' depending on
 .B "\-\-no\-multi\-line"
 Disable multi-line display of items when using \fB\-\-read0\fR
 .TP
-.BI "\-\-gap" "[=N]"
-Render empty lines between each item
-.TP
 .B "\-\-keep\-right"
 Keep the right end of the line visible when it's too long. Effective only when
 the query string is empty.
@@ -805,7 +802,7 @@ e.g. \fBborder\-rounded\fR (border with rounded edges, default),
 * \fB[:+SCROLL[OFFSETS][/DENOM]]\fR determines the initial scroll offset of the
 preview window.

-  - \fBSCROLL\fR can be either a numeric integer or a single-field index expression that refers to a numeric integer or {n} to refer to the zero-based ordinal index of the current item.
+  - \fBSCROLL\fR can be either a numeric integer or a single-field index expression that refers to a numeric integer.

  - The optional \fBOFFSETS\fR part is for adjusting the base offset. It should be given as a series of signed integers (\fB\-INTEGER\fR or \fB+INTEGER\fR).

@@ -1005,8 +1002,8 @@ Determines the behavior of the built-in directory walker that is used when
 .br

 .TP
-.B "\-\-walker\-root=DIR [...]"
-List of directory names to start the built-in directory walker.
+.B "\-\-walker\-root=DIR"
+The root directory from which to start the built-in directory walker.
 The default value is the current working directory.

 .TP
@@ -1122,6 +1119,9 @@ fzf exports the following environment variables to its child processes.
 .br
 .BR FZF_PORT "            Port number when \-\-listen option is used"
 .br
+
+The following variables are additionally exported to the preview commands.
+
 .BR FZF_PREVIEW_TOP "     Top position of the preview window"
 .br
 .BR FZF_PREVIEW_LEFT "    Left position of the preview window"
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -283,7 +283,7 @@ _fzf_handle_dynamic_completion() {
 }

 __fzf_generic_path_completion() {
-  local cur base dir leftover matches trigger cmd
+  local cur base dir leftover matches trigger cmd rest
  cmd="${COMP_WORDS[0]}"
  if [[ $cmd == \\* ]]; then
    cmd="${cmd:1}"
@@ -295,6 +295,16 @@ __fzf_generic_path_completion() {
    base=${cur:0:${#cur}-${#trigger}}
    eval "base=$base" 2> /dev/null || return

+    # Try to leverage existing completion
+    rest=("${@:4}")
+    unset 'rest[${#rest[@]}-2]'
+    COMP_LINE=${COMP_LINE:0:${#COMP_LINE}-${#trigger}}
+    COMP_POINT=$((COMP_POINT-${#trigger}))
+    COMP_WORDS[$COMP_CWORD]=$base
+    _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
+    [[ $? -ne 0 ]] &&
+      _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
+
    dir=
    [[ $base = *"/"* ]] && dir="$base"
    while true; do
@@ -306,7 +316,11 @@ __fzf_generic_path_completion() {
        matches=$(
          export FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-} $2")
          unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE
-          if declare -F "$1" > /dev/null; then
+          if [[ ${#COMPREPLY[@]} -gt 0 ]]; then
+            for h in "${COMPREPLY[@]}"; do
+              echo "$h"
+            done | command sort -u | __fzf_comprun "$4" -q "$leftover"
+          elif declare -F "$1" > /dev/null; then
            eval "$1 $(printf %q "$dir")" | __fzf_comprun "$4" -q "$leftover"
          else
            if [[ $1 =~ dir ]]; then
@@ -374,10 +388,23 @@ _fzf_complete() {
  if [[ "$cur" == *"$trigger" ]] && [[ $cur != *'$('* ]] && [[ $cur != *':='* ]] && [[ $cur != *'`'* ]]; then
    cur=${cur:0:${#cur}-${#trigger}}

+    # Try to leverage existing completion
+    COMP_LINE=${COMP_LINE:0:${#COMP_LINE}-${#trigger}}
+    COMP_POINT=$((COMP_POINT-${#trigger}))
+    unset 'rest[${#rest[@]}-2]'
+    _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
+    [[ $? -ne 0 ]] &&
+      _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
+
    selected=$(
+      (if [[ ${#COMPREPLY[@]} -gt 0 ]]; then
+        for h in "${COMPREPLY[@]}"; do
+          echo "$h"
+        done
+      fi; cat) | command sort -u |
      FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse" "${FZF_COMPLETION_OPTS-} $str_arg") \
      FZF_DEFAULT_OPTS_FILE='' \
-        __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | eval "$post" | command tr '\n' ' ')
+        __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | $post | command tr '\n' ' ')
    selected=${selected% } # Strip trailing space not to repeat "-o nospace"
    if [[ -n "$selected" ]]; then
      COMPREPLY=("$selected")
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -120,18 +120,25 @@ __fzf_comprun() {
  fi
 }

-# Extract the name of the command. e.g. ls; foo=1 ssh **<tab>
+# Extract the name of the command. e.g. foo=1 bar baz**<tab>
 __fzf_extract_command() {
-  # Control completion with the "compstate" parameter, insert and list nothing
-  compstate[insert]=
-  compstate[list]=
-  cmd_word="${(Q)words[1]}"
+  local token tokens
+  tokens=(${(z)1})
+  for token in $tokens; do
+    token=${(Q)token}
+    if [[ "$token" =~ [[:alnum:]] && ! "$token" =~ "=" ]]; then
+      echo "$token"
+      return
+    fi
+  done
+  echo "${tokens[1]}"
 }

 __fzf_generic_path_completion() {
-  local base lbuf compgen fzf_opts suffix tail dir leftover matches
+  local base lbuf cmd compgen fzf_opts suffix tail dir leftover matches
  base=$1
  lbuf=$2
+  cmd=$(__fzf_extract_command "$lbuf")
  compgen=$3
  fzf_opts=$4
  suffix=$5
@@ -154,7 +161,7 @@ __fzf_generic_path_completion() {
        FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-}")
        unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE
        if declare -f "$compgen" > /dev/null; then
-          eval "$compgen $(printf %q "$dir")" | __fzf_comprun "$cmd_word" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover"
+          eval "$compgen $(printf %q "$dir")" | __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover"
        else
          if [[ $compgen =~ dir ]]; then
            walker=dir,follow
@@ -163,7 +170,7 @@ __fzf_generic_path_completion() {
            walker=file,dir,follow,hidden
            rest=${FZF_COMPLETION_PATH_OPTS-}
          fi
-          __fzf_comprun "$cmd_word" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" --walker "$walker" --walker-root="$dir" ${(Q)${(Z+n+)rest}} < /dev/tty
+          __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" --walker "$walker" --walker-root="$dir" ${(Q)${(Z+n+)rest}} < /dev/tty
        fi | while read -r item; do
          item="${item%$suffix}$suffix"
          echo -n -E "${(q)item} "
@@ -220,9 +227,10 @@ _fzf_complete() {
    rest=("$@")
  fi

-  local fifo lbuf matches post
+  local fifo lbuf cmd matches post
  fifo="${TMPDIR:-/tmp}/fzf-complete-fifo-$$"
  lbuf=${rest[0]}
+  cmd=$(__fzf_extract_command "$lbuf")
  post="${funcstack[1]}_post"
  type $post > /dev/null 2>&1 || post=cat

@@ -230,7 +238,7 @@ _fzf_complete() {
  matches=$(
    FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse" "${FZF_COMPLETION_OPTS-} $str_arg") \
    FZF_DEFAULT_OPTS_FILE='' \
-      __fzf_comprun "$cmd_word" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ')
+      __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ')
  if [ -n "$matches" ]; then
    LBUFFER="$lbuf$matches"
  fi
@@ -302,7 +310,7 @@ _fzf_complete_kill_post() {
 }

 fzf-completion() {
-  local tokens prefix trigger tail matches lbuf d_cmds cursor_pos cmd_word
+  local tokens cmd prefix trigger tail matches lbuf d_cmds
  setopt localoptions noshwordsplit noksh_arrays noposixbuiltins

  # http://zsh.sourceforge.net/FAQ/zshfaq03.html
@@ -313,9 +321,11 @@ fzf-completion() {
    return
  fi

+  cmd=$(__fzf_extract_command "$LBUFFER")
+
  # Explicitly allow for empty trigger.
  trigger=${FZF_COMPLETION_TRIGGER-'**'}
-  [[ -z $trigger && ${LBUFFER[-1]} == ' ' ]] && tokens+=("")
+  [ -z "$trigger" -a ${LBUFFER[-1]} = ' ' ] && tokens+=("")

  # When the trigger starts with ';', it becomes a separate token
  if [[ ${LBUFFER} = *"${tokens[-2]-}${tokens[-1]}" ]]; then
@@ -330,37 +340,16 @@ fzf-completion() {
  if [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then
    d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS-cd pushd rmdir})

-    {
-      cursor_pos=$CURSOR
-      # Move the cursor before the trigger to preserve word array elements when
-      # trigger chars like ';' or '`' would otherwise reset the 'words' array.
-      CURSOR=$((cursor_pos - ${#trigger} - 1))
-      # Check if at least one completion system (old or new) is active.
-      # If at least one user-defined completion widget is detected, nothing will
-      # be completed if neither the old nor the new completion system is enabled.
-      # In such cases, the 'zsh/compctl' module is loaded as a fallback.
-      if ! zmodload -F zsh/parameter p:functions 2>/dev/null || ! (( ${+functions[compdef]} )); then
-        zmodload -F zsh/compctl 2>/dev/null
-      fi
-      # Create a completion widget to access the 'words' array (man zshcompwid)
-      zle -C __fzf_extract_command .complete-word __fzf_extract_command
-      zle __fzf_extract_command
-    } always {
-      CURSOR=$cursor_pos
-      # Delete the completion widget
-      zle -D __fzf_extract_command  2>/dev/null
-    }
-
    [ -z "$trigger"      ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}}
    if [[ $prefix = *'$('* ]] || [[ $prefix = *'<('* ]] || [[ $prefix = *'>('* ]] || [[ $prefix = *':='* ]] || [[ $prefix = *'`'* ]]; then
      return
    fi
    [ -n "${tokens[-1]}" ] && lbuf=${lbuf:0:-${#tokens[-1]}}

-    if eval "noglob type _fzf_complete_${cmd_word} >/dev/null"; then
-      prefix="$prefix" eval _fzf_complete_${cmd_word} ${(q)lbuf}
+    if eval "type _fzf_complete_${cmd} > /dev/null"; then
+      prefix="$prefix" eval _fzf_complete_${cmd} ${(q)lbuf}
      zle reset-prompt
-    elif [ ${d_cmds[(i)$cmd_word]} -le ${#d_cmds} ]; then
+    elif [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then
      _fzf_dir_completion "$prefix" "$lbuf"
    else
      _fzf_path_completion "$prefix" "$lbuf"
@@ -377,7 +366,6 @@ fzf-completion() {
  unset binding
 }

-# Normal widget
 zle     -N   fzf-completion
 bindkey '^I' fzf-completion
 fi
--- a/shell/key-bindings.fish
+++ b/shell/key-bindings.fish
@@ -11,6 +11,8 @@
 # - $FZF_ALT_C_COMMAND
 # - $FZF_ALT_C_OPTS

+status is-interactive; or exit 0
+

 # Key bindings
 # ------------
@@ -21,7 +23,7 @@ function fzf_key_bindings
    # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
    echo "--height $FZF_TMUX_HEIGHT --bind=ctrl-z:ignore" $argv[1]
-    test -r "$FZF_DEFAULT_OPTS_FILE"; and string collect -N -- <$FZF_DEFAULT_OPTS_FILE
+    command cat "$FZF_DEFAULT_OPTS_FILE" 2> /dev/null
    echo $FZF_DEFAULT_OPTS $argv[2]
  end

@@ -34,12 +36,12 @@ function fzf_key_bindings

    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
    begin
-      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path --walker-root=$dir" "$FZF_CTRL_T_OPTS")
+      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_CTRL_T_OPTS")
      set -lx FZF_DEFAULT_COMMAND "$FZF_CTRL_T_COMMAND"
      set -lx FZF_DEFAULT_OPTS_FILE ''
-      eval (__fzfcmd) -m --query=$fzf_query | while read -l r; set -a result $r; end
+      eval (__fzfcmd)' -m --query "'$fzf_query'"' | while read -l r; set result $result $r; end
    end
-    if test -z "$result"
+    if [ -z "$result" ]
      commandline -f repaint
      return
    else
@@ -48,7 +50,7 @@ function fzf_key_bindings
    end
    for i in $result
      commandline -it -- $prefix
-      commandline -it -- (string escape -- $i)
+      commandline -it -- (string escape $i)
      commandline -it -- ' '
    end
    commandline -f repaint
@@ -57,27 +59,27 @@ function fzf_key_bindings
  function fzf-history-widget -d "Show command history"
    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
    begin
-      set -l FISH_MAJOR (string split '.' -- $version)[1]
-      set -l FISH_MINOR (string split '.' -- $version)[2]
+      set -l FISH_MAJOR (echo $version | cut -f1 -d.)
+      set -l FISH_MINOR (echo $version | cut -f2 -d.)

      # merge history from other sessions before searching
-      test -z "$fish_private_mode"; and builtin history merge
+      if test -z "$fish_private_mode"
+        builtin history merge
+      end

      # history's -z flag is needed for multi-line support.
      # history's -z flag was added in fish 2.4.0, so don't use it for versions
      # before 2.4.0.
-      if test "$FISH_MAJOR" -gt 2 -o \( "$FISH_MAJOR" -eq 2 -a "$FISH_MINOR" -ge 4 \)
-        set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
-        set -lx FZF_DEFAULT_OPTS_FILE ''
-        if type -q perl
-          builtin history -z --reverse | command perl -0 -pe 's/^/$.\t/g; s/\n/\n\t/gm' | eval (__fzfcmd) --tac --read0 --print0 -q '(commandline)' | string replace -r '^\d*\t' '' | read -lz result
+      if [ "$FISH_MAJOR" -gt 2 -o \( "$FISH_MAJOR" -eq 2 -a "$FISH_MINOR" -ge 4 \) ];
+        if type -P perl > /dev/null 2>&1
+          set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
+          set -lx FZF_DEFAULT_OPTS_FILE ''
+          builtin history -z --reverse | command perl -0 -pe 's/^/$.\t/g; s/\n/\n\t/gm' | eval (__fzfcmd) --tac --read0 --print0 -q '(commandline)' | command perl -pe 's/^\d*\t//' | read -lz result
          and commandline -- $result
        else
-          set -l line 0
-          for i in (builtin history -z --reverse | string split0)
-            set line (math $line + 1)
-            string escape -n -- $line\t$i
-          end | string join0 | string replace -a '\n' '\n\t' | string unescape -n | eval (__fzfcmd) --tac --read0 --print0 -q '(commandline)' | string replace -r '^\d*\t' '' | read -lz result
+          set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "--scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
+          set -lx FZF_DEFAULT_OPTS_FILE ''
+          builtin history -z | eval (__fzfcmd) --read0 --print0 -q '(commandline)' | read -lz result
          and commandline -- $result
        end
      else
@@ -96,12 +98,12 @@ function fzf_key_bindings

    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
    begin
-      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path --walker-root=$dir" "$FZF_ALT_C_OPTS")
+      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_ALT_C_OPTS")
      set -lx FZF_DEFAULT_OPTS_FILE ''
      set -lx FZF_DEFAULT_COMMAND "$FZF_ALT_C_COMMAND"
-      eval (__fzfcmd) +m --query=$fzf_query | read -l result
+      eval (__fzfcmd)' +m --query "'$fzf_query'"' | read -l result

-      if test -n "$result"
+      if [ -n "$result" ]
        cd -- $result

        # Remove last token from commandline.
@@ -116,9 +118,9 @@ function fzf_key_bindings
  function __fzfcmd
    test -n "$FZF_TMUX"; or set FZF_TMUX 0
    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
-    if test -n "$FZF_TMUX_OPTS"
+    if [ -n "$FZF_TMUX_OPTS" ]
      echo "fzf-tmux $FZF_TMUX_OPTS -- "
-    else if test "$FZF_TMUX" = "1"
+    else if [ $FZF_TMUX -eq 1 ]
      echo "fzf-tmux -d$FZF_TMUX_HEIGHT -- "
    else
      echo "fzf"
@@ -133,7 +135,7 @@ function fzf_key_bindings
    bind \ec fzf-cd-widget
  end

-  if bind -M insert &> /dev/null
+  if bind -M insert > /dev/null 2>&1
    bind -M insert \cr fzf-history-widget
    if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
      bind -M insert \ct fzf-file-widget
@@ -150,50 +152,40 @@ function fzf_key_bindings
    set -l prefix (string match -r -- '^-[^\s=]+=' $commandline)
    set commandline (string replace -- "$prefix" '' $commandline)

-    # escape special characters, except for the $ sign of valid variable names,
-    # so that after eval, the original string is returned, but with the
-    # variable names replaced by their values.
-    set commandline (string escape -n -- $commandline)
-    set commandline (string replace -r -a '\x5c\$(?=[\w])' '\$' -- $commandline)
-
    # eval is used to do shell expansion on paths
    eval set commandline $commandline

-    # Combine multiple consecutive slashes into one
-    set commandline (string replace -r -a '/+' '/' -- $commandline)
-
-    if test -z "$commandline"
+    if [ -z $commandline ]
      # Default to current directory with no --query
      set dir '.'
      set fzf_query ''
    else
      set dir (__fzf_get_dir $commandline)

-      # BUG: on combined expressions, if a left argument is a single `!`, the
-      # builtin test command of fish will treat it as the ! operator. To
-      # overcome this, have the variable parts on the right.
-      if test "." = "$dir" -a "." != (string sub -l 1 -- $commandline)
+      if [ "$dir" = "." -a (string sub -l 1 -- $commandline) != '.' ]
        # if $dir is "." but commandline is not a relative path, this means no file path found
        set fzf_query $commandline
      else
        # Also remove trailing slash after dir, to "split" input properly
-        set fzf_query (string replace -r "^$dir/?" '' -- $commandline)
+        set fzf_query (string replace -r "^$dir/?" -- '' "$commandline")
      end
    end

-    echo (string escape -- $dir)
-    echo (string escape -- $fzf_query)
+    echo $dir
+    echo $fzf_query
    echo $prefix
  end

  function __fzf_get_dir -d 'Find the longest existing filepath from input string'
    set dir $argv

-    # Strip trailing slash, unless $dir is root dir (/)
-    set dir (string replace -r '(?<!^)/$' '' -- $dir)
+    # Strip all trailing slashes. Ignore if $dir is root dir (/)
+    if [ (string length -- $dir) -gt 1 ]
+      set dir (string replace -r '/*$' -- '' $dir)
+    end

    # Iteratively check if dir exists and strip tail end of path
-    while test ! -d "$dir"
+    while [ ! -d "$dir" ]
      # If path is absolute, this can keep going until ends up at /
      # If path is relative, this can keep going until entire input is consumed, dirname returns "."
      set dir (dirname -- "$dir")
--- a/shell/key-bindings.zsh
+++ b/shell/key-bindings.zsh
@@ -108,10 +108,9 @@ fi
 fzf-history-widget() {
  local selected
  setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases noglob nobash_rematch 2> /dev/null
-  # Ensure the module is loaded if not already, and the required features, such
-  # as the associative 'history' array, which maps event numbers to full history
-  # lines, are set. Also, make sure Perl is installed for multi-line output.
-  if zmodload -F zsh/parameter p:{commands,history} 2>/dev/null && (( ${+commands[perl]} )); then
+  # Ensure the associative history array, which maps event numbers to the full
+  # history lines, is loaded, and that Perl is installed for multi-line output.
+  if zmodload -F zsh/parameter p:history 2>/dev/null && (( ${#commands[perl]} )); then
    selected="$(printf '%s\t%s\000' "${(kv)history[@]}" |
      perl -0 -ne 'if (!$seen{(/^\s*[0-9]+\**\t(.*)/s, $1)}++) { s/\n/\n\t/g; print; }' |
      FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m --read0") \
--- a/src/core.go
+++ b/src/core.go
@@ -172,9 +172,7 @@ func Run(opts *Options) (int, error) {
 			return chunkList.Push(data)
 		}, eventBox, executor, opts.ReadZero, opts.Filter == nil)

-		readyChan := make(chan bool)
-		go reader.ReadSource(opts.Input, opts.WalkerRoot, opts.WalkerOpts, opts.WalkerSkip, initialReload, initialEnv, readyChan)
-		<-readyChan
+		go reader.ReadSource(opts.Input, opts.WalkerRoot, opts.WalkerOpts, opts.WalkerSkip, initialReload, initialEnv)
 	}

 	// Matcher
@@ -226,7 +224,7 @@ func Run(opts *Options) (int, error) {
 					}
 					return false
 				}, eventBox, executor, opts.ReadZero, false)
-			reader.ReadSource(opts.Input, opts.WalkerRoot, opts.WalkerOpts, opts.WalkerSkip, initialReload, initialEnv, nil)
+			reader.ReadSource(opts.Input, opts.WalkerRoot, opts.WalkerOpts, opts.WalkerSkip, initialReload, initialEnv)
 		} else {
 			eventBox.Unwatch(EvtReadNew)
 			eventBox.WaitFor(EvtReadFin)
@@ -301,9 +299,7 @@ func Run(opts *Options) (int, error) {
 		itemIndex = 0
 		inputRevision.bumpMajor()
 		header = make([]string, 0, opts.HeaderLines)
-		readyChan := make(chan bool)
-		go reader.restart(command, environ, readyChan)
-		<-readyChan
+		go reader.restart(command, environ)
 	}

 	exitCode := ExitOk
--- a/src/matcher.go
+++ b/src/matcher.go
@@ -102,7 +102,7 @@ func (m *Matcher) Loop() {
 		if !cacheCleared {
 			if count == prevCount {
 				// Look up mergerCache
-				if cached, found := m.mergerCache[patternString]; found && cached.final == request.final {
+				if cached, found := m.mergerCache[patternString]; found {
 					merger = cached
 				}
 			} else {
--- a/src/options.go
+++ b/src/options.go
@@ -56,7 +56,6 @@ Usage: fzf [options]
    --wrap                  Enable line wrap
    --wrap-sign=STR         Indicator for wrapped lines
    --no-multi-line         Disable multi-line display of items when using --read0
-    --gap[=N]               Render empty lines between each item
    --keep-right            Keep the right end of the line visible on overflow
    --scroll-off=LINES      Number of screen lines to keep above or below when
                            scrolling to the top or to the bottom (default: 0)
@@ -145,7 +144,7 @@ Usage: fzf [options]

  Directory traversal       (Only used when $FZF_DEFAULT_COMMAND is not set)
    --walker=OPTS           [file][,dir][,follow][,hidden] (default: file,follow,hidden)
-    --walker-root=DIR [...] List of directories to walk (default: .)
+    --walker-root=DIR       Root directory from which to start walker (default: .)
    --walker-skip=DIRS      Comma-separated list of directory names to skip
                            (default: .git,node_modules)

@@ -381,46 +380,14 @@ func (a previewOpts) aboveOrBelow() bool {
 	return a.size.size > 0 && (a.position == posUp || a.position == posDown)
 }

-type previewOptsCompare int
+func (a previewOpts) sameLayout(b previewOpts) bool {
+	return a.size == b.size && a.position == b.position && a.border == b.border && a.hidden == b.hidden && a.threshold == b.threshold &&
+		(a.alternative != nil && b.alternative != nil && a.alternative.sameLayout(*b.alternative) ||
+			a.alternative == nil && b.alternative == nil)
+}

-const (
-	previewOptsSame previewOptsCompare = iota
-	previewOptsDifferentContentLayout
-	previewOptsDifferentLayout
-)
-
-func (o *previewOpts) compare(active *previewOpts, b *previewOpts) previewOptsCompare {
-	a := o
-
-	sameThreshold := o.position == b.position && o.threshold == b.threshold
-	// Alternative layout is being used
-	if o.alternative == active {
-		a = active
-
-		// If the other also has an alternative layout,
-		if b.alternative != nil {
-			// and if the same condition is the same, compare alt vs. alt.
-			if sameThreshold {
-				b = b.alternative
-			} else {
-				// If not, we pessimistically decide that the layouts may not be the same
-				return previewOptsDifferentLayout
-			}
-		}
-	} else if b.alternative != nil && !sameThreshold {
-		// We may choose the other's alternative layout, so let's be conservative.
-		return previewOptsDifferentLayout
-	}
-
-	if !(a.size == b.size && a.position == b.position && a.border == b.border && a.hidden == b.hidden) {
-		return previewOptsDifferentLayout
-	}
-
-	if a.wrap == b.wrap && a.headerLines == b.headerLines && a.info == b.info && a.scroll == b.scroll {
-		return previewOptsSame
-	}
-
-	return previewOptsDifferentContentLayout
+func (a previewOpts) sameContentLayout(b previewOpts) bool {
+	return a.wrap == b.wrap && a.headerLines == b.headerLines && a.info == b.info
 }

 func firstLine(s string) string {
@@ -506,7 +473,6 @@ type Options struct {
 	Header       []string
 	HeaderLines  int
 	HeaderFirst  bool
-	Gap          int
 	Ellipsis     *string
 	Scrollbar    *string
 	Margin       [4]sizeSpec
@@ -522,7 +488,7 @@ type Options struct {
 	Unsafe       bool
 	ClearOnExit  bool
 	WalkerOpts   walkerOpts
-	WalkerRoot   []string
+	WalkerRoot   string
 	WalkerSkip   []string
 	Version      bool
 	Help         bool
@@ -613,7 +579,6 @@ func defaultOptions() *Options {
 		Header:       make([]string, 0),
 		HeaderLines:  0,
 		HeaderFirst:  false,
-		Gap:          0,
 		Ellipsis:     nil,
 		Scrollbar:    nil,
 		Margin:       defaultMargin(),
@@ -626,7 +591,7 @@ func defaultOptions() *Options {
 		Unsafe:       false,
 		ClearOnExit:  true,
 		WalkerOpts:   walkerOpts{file: true, hidden: true, follow: true},
-		WalkerRoot:   []string{"."},
+		WalkerRoot:   ".",
 		WalkerSkip:   []string{".git", "node_modules"},
 		Help:         false,
 		Version:      false}
@@ -658,28 +623,6 @@ func optionalNextString(args []string, i *int) (bool, string) {
 	return false, ""
 }

-func isDir(path string) bool {
-	stat, err := os.Stat(path)
-	return err == nil && stat.IsDir()
-}
-
-func nextDirs(args []string, i *int) ([]string, error) {
-	dirs := []string{}
-	for *i < len(args)-1 {
-		arg := args[*i+1]
-		if isDir(arg) {
-			dirs = append(dirs, arg)
-			*i++
-		} else {
-			break
-		}
-	}
-	if len(dirs) == 0 {
-		return nil, errors.New("no directory specified")
-	}
-	return dirs, nil
-}
-
 func atoi(str string) (int, error) {
 	num, err := strconv.Atoi(str)
 	if err != nil {
@@ -1780,7 +1723,7 @@ func parsePreviewWindowImpl(opts *previewOpts, input string) error {
 	var err error
 	tokenRegex := regexp.MustCompile(`[:,]*(<([1-9][0-9]*)\(([^)<]+)\)|[^,:]+)`)
 	sizeRegex := regexp.MustCompile("^[0-9]+%?$")
-	offsetRegex := regexp.MustCompile(`^(\+{(-?[0-9]+|n)})?([+-][0-9]+)*(-?/[1-9][0-9]*)?$`)
+	offsetRegex := regexp.MustCompile(`^(\+{-?[0-9]+})?([+-][0-9]+)*(-?/[1-9][0-9]*)?$`)
 	headerRegex := regexp.MustCompile("^~(0|[1-9][0-9]*)$")
 	tokens := tokenRegex.FindAllStringSubmatch(input, -1)
 	var alternative string
@@ -2400,12 +2343,6 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 			opts.HeaderFirst = true
 		case "--no-header-first":
 			opts.HeaderFirst = false
-		case "--gap":
-			if opts.Gap, err = optionalNumeric(allArgs, &i, 1); err != nil {
-				return err
-			}
-		case "--no-gap":
-			opts.Gap = 0
 		case "--ellipsis":
 			str, err := nextString(allArgs, &i, "ellipsis string required")
 			if err != nil {
@@ -2541,7 +2478,7 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 				return err
 			}
 		case "--walker-root":
-			if opts.WalkerRoot, err = nextDirs(allArgs, &i); err != nil {
+			if opts.WalkerRoot, err = nextString(allArgs, &i, "directory required"); err != nil {
 				return err
 			}
 		case "--walker-skip":
@@ -2693,10 +2630,6 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 				if opts.HeaderLines, err = atoi(value); err != nil {
 					return err
 				}
-			} else if match, value := optString(arg, "--gap="); match {
-				if opts.Gap, err = atoi(value); err != nil {
-					return err
-				}
 			} else if match, value := optString(arg, "--ellipsis="); match {
 				str := firstLine(value)
 				opts.Ellipsis = &str
@@ -2739,11 +2672,7 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 					return err
 				}
 			} else if match, value := optString(arg, "--walker-root="); match {
-				if !isDir(value) {
-					return errors.New("not a directory: " + value)
-				}
-				dirs, _ := nextDirs(allArgs, &i)
-				opts.WalkerRoot = append([]string{value}, dirs...)
+				opts.WalkerRoot = value
 			} else if match, value := optString(arg, "--walker-skip="); match {
 				opts.WalkerSkip = filterNonEmpty(strings.Split(value, ","))
 			} else if match, value := optString(arg, "--hscroll-off="); match {
--- a/src/reader.go
+++ b/src/reader.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"io/fs"
 	"os"
+	"os/exec"
 	"path/filepath"
-	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -25,26 +25,16 @@ type Reader struct {
 	event    int32
 	finChan  chan bool
 	mutex    sync.Mutex
-	killed   bool
-	termFunc func()
+	exec     *exec.Cmd
+	execOut  io.ReadCloser
 	command  *string
+	killed   bool
 	wait     bool
 }

 // NewReader returns new Reader object
 func NewReader(pusher func([]byte) bool, eventBox *util.EventBox, executor *util.Executor, delimNil bool, wait bool) *Reader {
-	return &Reader{
-		pusher,
-		executor,
-		eventBox,
-		delimNil,
-		int32(EvtReady),
-		make(chan bool, 1),
-		sync.Mutex{},
-		false,
-		func() { os.Stdin.Close() },
-		nil,
-		wait}
+	return &Reader{pusher, executor, eventBox, delimNil, int32(EvtReady), make(chan bool, 1), sync.Mutex{}, nil, nil, nil, false, wait}
 }

 func (r *Reader) startEventPoller() {
@@ -90,19 +80,19 @@ func (r *Reader) fin(success bool) {
 func (r *Reader) terminate() {
 	r.mutex.Lock()
 	r.killed = true
-	if r.termFunc != nil {
-		r.termFunc()
-		r.termFunc = nil
+	if r.exec != nil && r.exec.Process != nil {
+		r.execOut.Close()
+		util.KillCommand(r.exec)
+	} else {
+		os.Stdin.Close()
 	}
 	r.mutex.Unlock()
 }

-func (r *Reader) restart(command commandSpec, environ []string, readyChan chan bool) {
+func (r *Reader) restart(command commandSpec, environ []string) {
 	r.event = int32(EvtReady)
 	r.startEventPoller()
-	success := r.readFromCommand(command.command, environ, func() {
-		readyChan <- true
-	})
+	success := r.readFromCommand(command.command, environ)
 	r.fin(success)
 	removeFiles(command.tempFiles)
 }
@@ -121,29 +111,21 @@ func (r *Reader) readChannel(inputChan chan string) bool {
 }

 // ReadSource reads data from the default command or from standard input
-func (r *Reader) ReadSource(inputChan chan string, roots []string, opts walkerOpts, ignores []string, initCmd string, initEnv []string, readyChan chan bool) {
+func (r *Reader) ReadSource(inputChan chan string, root string, opts walkerOpts, ignores []string, initCmd string, initEnv []string) {
 	r.startEventPoller()
 	var success bool
-	signalReady := func() {
-		if readyChan != nil {
-			readyChan <- true
-		}
-	}
 	if inputChan != nil {
-		signalReady()
 		success = r.readChannel(inputChan)
 	} else if len(initCmd) > 0 {
-		success = r.readFromCommand(initCmd, initEnv, signalReady)
+		success = r.readFromCommand(initCmd, initEnv)
 	} else if util.IsTty(os.Stdin) {
 		cmd := os.Getenv("FZF_DEFAULT_COMMAND")
 		if len(cmd) == 0 {
-			signalReady()
-			success = r.readFiles(roots, opts, ignores)
+			success = r.readFiles(root, opts, ignores)
 		} else {
-			success = r.readFromCommand(cmd, initEnv, signalReady)
+			success = r.readFromCommand(cmd, initEnv)
 		}
 	} else {
-		signalReady()
 		success = r.readFromStdin()
 	}
 	r.fin(success)
@@ -266,33 +248,14 @@ func trimPath(path string) string {
 	return byteString(bytes)
 }

-func (r *Reader) readFiles(roots []string, opts walkerOpts, ignores []string) bool {
+func (r *Reader) readFiles(root string, opts walkerOpts, ignores []string) bool {
+	r.killed = false
 	conf := fastwalk.Config{
 		Follow: opts.follow,
 		// Use forward slashes when running a Windows binary under WSL or MSYS
 		ToSlash: fastwalk.DefaultToSlash(),
 		Sort:    fastwalk.SortFilesFirst,
 	}
-	ignoresBase := []string{}
-	ignoresFull := []string{}
-	ignoresSuffix := []string{}
-	sep := string(os.PathSeparator)
-	for _, ignore := range ignores {
-		if strings.ContainsRune(ignore, os.PathSeparator) {
-			if strings.HasPrefix(ignore, sep) {
-				ignoresSuffix = append(ignoresSuffix, ignore)
-			} else {
-				// 'foo/bar' should match match
-				// * 'foo/bar'
-				// * 'baz/foo/bar'
-				// * but NOT 'bazfoo/bar'
-				ignoresFull = append(ignoresFull, ignore)
-				ignoresSuffix = append(ignoresSuffix, sep+ignore)
-			}
-		} else {
-			ignoresBase = append(ignoresBase, ignore)
-		}
-	}
 	fn := func(path string, de os.DirEntry, err error) error {
 		if err != nil {
 			return nil
@@ -302,24 +265,14 @@ func (r *Reader) readFiles(roots []string, opts walkerOpts, ignores []string) bo
 			isDir := de.IsDir()
 			if isDir || opts.follow && isSymlinkToDir(path, de) {
 				base := filepath.Base(path)
-				if !opts.hidden && base[0] == '.' && base != ".." {
+				if !opts.hidden && base[0] == '.' {
 					return filepath.SkipDir
 				}
-				for _, ignore := range ignoresBase {
+				for _, ignore := range ignores {
 					if ignore == base {
 						return filepath.SkipDir
 					}
 				}
-				for _, ignore := range ignoresFull {
-					if ignore == path {
-						return filepath.SkipDir
-					}
-				}
-				for _, ignore := range ignoresSuffix {
-					if strings.HasSuffix(path, ignore) {
-						return filepath.SkipDir
-					}
-				}
 			}
 			if ((opts.file && !isDir) || (opts.dir && isDir)) && r.pusher(stringBytes(path)) {
 				atomic.StoreInt32(&r.event, int32(EvtReadNew))
@@ -332,39 +285,34 @@ func (r *Reader) readFiles(roots []string, opts walkerOpts, ignores []string) bo
 		}
 		return nil
 	}
-	noerr := true
-	for _, root := range roots {
-		noerr = noerr && (fastwalk.Walk(&conf, root, fn) == nil)
-	}
-	return noerr
+	return fastwalk.Walk(&conf, root, fn) == nil
 }

-func (r *Reader) readFromCommand(command string, environ []string, signalReady func()) bool {
+func (r *Reader) readFromCommand(command string, environ []string) bool {
 	r.mutex.Lock()
-
 	r.killed = false
-	r.termFunc = nil
 	r.command = &command
-	exec := r.executor.ExecCommand(command, true)
+	r.exec = r.executor.ExecCommand(command, true)
 	if environ != nil {
-		exec.Env = environ
+		r.exec.Env = environ
 	}
-	execOut, err := exec.StdoutPipe()
-	if err != nil || exec.Start() != nil {
-		signalReady()
+
+	var err error
+	r.execOut, err = r.exec.StdoutPipe()
+	if err != nil {
+		r.exec = nil
 		r.mutex.Unlock()
 		return false
 	}

-	// Function to call to terminate the running command
-	r.termFunc = func() {
-		execOut.Close()
-		util.KillCommand(exec)
+	err = r.exec.Start()
+	if err != nil {
+		r.exec = nil
+		r.mutex.Unlock()
+		return false
 	}

-	signalReady()
 	r.mutex.Unlock()
-
-	r.feed(execOut)
-	return exec.Wait() == nil
+	r.feed(r.execOut)
+	return r.exec.Wait() == nil
 }
--- a/src/reader_test.go
+++ b/src/reader_test.go
@@ -23,12 +23,8 @@ func TestReadFromCommand(t *testing.T) {
 	}

 	// Normal command
-	counter := 0
-	ready := func() {
-		counter++
-	}
-	reader.fin(reader.readFromCommand(`echo abc&&echo def`, nil, ready))
-	if len(strs) != 2 || strs[0] != "abc" || strs[1] != "def" || counter != 1 {
+	reader.fin(reader.readFromCommand(`echo abc&&echo def`, nil))
+	if len(strs) != 2 || strs[0] != "abc" || strs[1] != "def" {
 		t.Errorf("%s", strs)
 	}

@@ -52,9 +48,9 @@ func TestReadFromCommand(t *testing.T) {
 	reader.startEventPoller()

 	// Failing command
-	reader.fin(reader.readFromCommand(`no-such-command`, nil, ready))
+	reader.fin(reader.readFromCommand(`no-such-command`, nil))
 	strs = []string{}
-	if len(strs) > 0 || counter != 2 {
+	if len(strs) > 0 {
 		t.Errorf("%s", strs)
 	}

--- a/src/terminal.go
+++ b/src/terminal.go
--- a/src/terminal_test.go
+++ b/src/terminal_test.go
@@ -507,34 +507,6 @@ func TestParsePlaceholder(t *testing.T) {
 	}
 }

-func TestExtractPassthroughs(t *testing.T) {
-	for _, middle := range []string{
-		"\x1bPtmux;\x1b\x1bbar\x1b\\",
-		"\x1bPtmux;\x1b\x1bbar\x1bbar\x1b\\",
-		"\x1b]1337;bar\x1b\\",
-		"\x1b]1337;bar\x1bbar\x1b\\",
-		"\x1b]1337;bar\a",
-		"\x1b_Ga=T,f=32,s=1258,v=1295,c=74,r=35,m=1\x1b\\",
-		"\x1b_Ga=T,f=32,s=1258,v=1295,c=74,r=35,m=1\x1b\\\r",
-		"\x1b_Ga=T,f=32,s=1258,v=1295,c=74,r=35,m=1\x1bbar\x1b\\\r",
-		"\x1b_Gm=1;AAAAAAAAA=\x1b\\",
-		"\x1b_Gm=1;AAAAAAAAA=\x1b\\\r",
-		"\x1b_Gm=1;\x1bAAAAAAAAA=\x1b\\\r",
-	} {
-		line := "foo" + middle + "baz"
-		loc := findPassThrough(line)
-		if loc == nil || line[0:loc[0]] != "foo" || line[loc[1]:] != "baz" {
-			t.Error("failed to find passthrough")
-		}
-		garbage := "\x1bPtmux;\x1b]1337;\x1b_Ga=\x1b]1337;bar\x1b."
-		line = strings.Repeat("foo"+middle+middle+"baz", 3) + garbage
-		passthroughs, result := extractPassThroughs(line)
-		if result != "foobazfoobazfoobaz"+garbage || len(passthroughs) != 6 {
-			t.Error("failed to extract passthroughs")
-		}
-	}
-}
-
 /* utilities section */

 // Item represents one line in fzf UI. Usually it is relative path to files and folders.
--- a/src/tui/light.go
+++ b/src/tui/light.go
@@ -73,15 +73,11 @@ func (r *LightRenderer) csi(code string) string {

 func (r *LightRenderer) flush() {
 	if r.queued.Len() > 0 {
-		r.flushRaw("\x1b[?7l\x1b[?25l" + r.queued.String() + "\x1b[?25h\x1b[?7h")
+		fmt.Fprint(r.ttyout, "\x1b[?7l\x1b[?25l"+r.queued.String()+"\x1b[?25h\x1b[?7h")
 		r.queued.Reset()
 	}
 }

-func (r *LightRenderer) flushRaw(sequence string) {
-	fmt.Fprint(r.ttyout, sequence)
-}
-
 // Light renderer
 type LightRenderer struct {
 	closed        *util.AtomicBool
@@ -659,13 +655,11 @@ func (r *LightRenderer) mouseSequence(sz *int) Event {
 }

 func (r *LightRenderer) smcup() {
-	r.flush()
-	r.flushRaw("\x1b[?1049h")
+	r.csi("?1049h")
 }

 func (r *LightRenderer) rmcup() {
-	r.flush()
-	r.flushRaw("\x1b[?1049l")
+	r.csi("?1049l")
 }

 func (r *LightRenderer) Pause(clear bool) {
@@ -935,6 +929,9 @@ func (w *LightWindow) Height() int {
 func (w *LightWindow) Refresh() {
 }

+func (w *LightWindow) Close() {
+}
+
 func (w *LightWindow) X() int {
 	return w.posx
 }
@@ -1100,7 +1097,7 @@ func (w *LightWindow) fill(str string, resetCode string) FillReturn {
 			}
 		}
 	}
-	if w.posx >= w.Width() {
+	if w.posx+1 >= w.Width() {
 		if w.posy+1 >= w.height {
 			return FillSuspend
 		}
--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -555,6 +555,10 @@ func (r *FullscreenRenderer) NewWindow(top int, left int, width int, height int,
 	return w
 }

+func (w *TcellWindow) Close() {
+	// TODO
+}
+
 func fill(x, y, w, h int, n ColorPair, r rune) {
 	for ly := 0; ly <= h; ly++ {
 		for lx := 0; lx <= w; lx++ {
--- a/src/tui/tui.go
+++ b/src/tui/tui.go
@@ -387,14 +387,6 @@ func (s BorderShape) HasTop() bool {
 	return true
 }

-func (s BorderShape) HasBottom() bool {
-	switch s {
-	case BorderNone, BorderLeft, BorderRight, BorderTop, BorderVertical: // No bottom
-		return false
-	}
-	return true
-}
-
 type BorderStyle struct {
 	shape       BorderShape
 	top         rune
@@ -410,18 +402,6 @@ type BorderStyle struct {
 type BorderCharacter int

 func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
-	if shape == BorderNone {
-		return BorderStyle{
-			shape:       shape,
-			top:         ' ',
-			bottom:      ' ',
-			left:        ' ',
-			right:       ' ',
-			topLeft:     ' ',
-			topRight:    ' ',
-			bottomLeft:  ' ',
-			bottomRight: ' '}
-	}
 	if !unicode {
 		return BorderStyle{
 			shape:       shape,
@@ -518,6 +498,19 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 	}
 }

+func MakeTransparentBorder() BorderStyle {
+	return BorderStyle{
+		shape:       BorderRounded,
+		top:         ' ',
+		bottom:      ' ',
+		left:        ' ',
+		right:       ' ',
+		topLeft:     ' ',
+		topRight:    ' ',
+		bottomLeft:  ' ',
+		bottomRight: ' '}
+}
+
 type TermSize struct {
 	Lines    int
 	Columns  int
@@ -559,6 +552,7 @@ type Window interface {
 	DrawHBorder()
 	Refresh()
 	FinishFill()
+	Close()

 	X() int
 	Y() int
--- a/src/util/chars.go
+++ b/src/util/chars.go
@@ -306,5 +306,5 @@ func (chars *Chars) Lines(multiLine bool, maxLines int, wrapCols int, wrapSignWi
 		}
 	}

-	return wrapped, overflow
+	return wrapped, false
 }
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -2814,13 +2814,13 @@ class TestGoFZF < TestBase
    tmux.send_keys "seq 3 | fzf --height ~100% --border=vertical --preview 'seq {}' --preview-window left,5,border-right --padding 1 --exit-0 --header $'hello\\nworld' --header-lines=2", :Enter
    expected = <<~OUTPUT
      │
-      │  1     │ > 3
-      │  2     │   2
-      │  3     │   1
-      │        │   hello
-      │        │   world
-      │        │   1/1 ─
-      │        │ >
+      │  1       │ > 3
+      │  2       │   2
+      │  3       │   1
+      │          │   hello
+      │          │   world
+      │          │   1/1 ─
+      │          │ >
      │
    OUTPUT
    tmux.until { assert_block(expected, _1) }
@@ -3073,21 +3073,6 @@ class TestGoFZF < TestBase
    tmux.until { |lines| assert_includes lines, '/1/1/' }
  end

-  def test_alternative_preview_window_opts
-    tmux.send_keys "seq 10 | #{FZF} --preview-window '~5,2,+0,<100000(~0,+100,wrap,noinfo)' --preview 'seq 1000'", :Enter
-    tmux.until { |lines| assert_equal 10, lines.item_count }
-    tmux.until do |lines|
-      assert_equal ['╭────╮', '│ 10 │', '│ 0  │', '│ 10 │', '│ 1  │'], lines.take(5).map(&:strip)
-    end
-  end
-
-  def test_preview_window_width_exception
-    tmux.send_keys "seq 10 | #{FZF} --scrollbar --preview-window border-left --border --preview 'seq 1000'", :Enter
-    tmux.until do |lines|
-      assert lines[1]&.end_with?(' 1/1000││')
-    end
-  end
-
  def test_become
    tmux.send_keys "seq 100 | #{FZF} --bind 'enter:become:seq {} | #{FZF}'", :Enter
    tmux.until { |lines| assert_equal 100, lines.item_count }
@@ -3407,40 +3392,6 @@ class TestGoFZF < TestBase
      assert lines[1]&.end_with?('1000││')
    end
  end
-
-  def test_gap
-    tmux.send_keys %(seq 100 | #{FZF} --gap --border --reverse), :Enter
-    block = <<~BLOCK
-      ╭─────────────────
-      │ >
-      │   100/100 ──────
-      │ > 1
-      │
-      │   2
-      │
-      │   3
-      │
-      │   4
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_gap_2
-    tmux.send_keys %(seq 100 | #{FZF} --gap=2 --border --reverse), :Enter
-    block = <<~BLOCK
-      ╭─────────────────
-      │ >
-      │   100/100 ──────
-      │ > 1
-      │
-      │
-      │   2
-      │
-      │
-      │   3
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
 end

 module TestShell
@@ -3752,23 +3703,6 @@ module CompletionTest
    tmux.until { |lines| assert_equal 'unset FZFFOOBAR', lines[-1] }
  end

-  def test_completion_in_command_sequence
-    tmux.send_keys 'export FZFFOOBAR=BAZ', :Enter
-    tmux.prepare
-
-    triggers = ['**', '~~', '++', 'ff', '/']
-    triggers.concat(['&', '[', ';', '`']) if instance_of?(TestZsh)
-
-    triggers.each do |trigger|
-      set_var('FZF_COMPLETION_TRIGGER', trigger)
-      command = "echo foo; QUX=THUD unset FZFFOOBR#{trigger}"
-      tmux.send_keys command.sub(/(;|`)$/, '\\\\\1'), :Tab
-      tmux.until { |lines| assert_equal 1, lines.match_count }
-      tmux.send_keys :Enter
-      tmux.until { |lines| assert_equal 'echo foo; QUX=THUD unset FZFFOOBAR', lines[-1] }
-    end
-  end
-
  def test_file_completion_unicode
    FileUtils.mkdir_p('/tmp/fzf-test')
    tmux.paste "cd /tmp/fzf-test; echo test3 > $'fzf-unicode \\355\\205\\214\\354\\212\\244\\355\\212\\2701'; echo test4 > $'fzf-unicode \\355\\205\\214\\354\\212\\244\\355\\212\\2702'"