Make completion.bash load faster

* Reduce number of `__fzf_orig_completion < <(complete -p "$@" 2> /dev/null)`s
* Clean up options in fzf completion
* Remove telnet completion

shell/completion.bash

@@ -100,128 +100,77 @@ _fzf_opts_completion() {
   prev="${COMP_WORDS[COMP_CWORD-1]}"
   opts="
     -h --help
-    -x --extended
     -e --exact
-    --extended-exact
     +x --no-extended
-    +e --no-exact
     -q --query
     -f --filter
     --literal
-    --no-literal
-    --algo
     --scheme
     --expect
-    --no-expect
-    --enabled --no-phony
-    --disabled --phony
+    --disabled
     --tiebreak
     --bind
     --color
-    --toggle-sort
     -d --delimiter
     -n --nth
     --with-nth
-    -s --sort
     +s --no-sort
     --track
-    --no-track
     --tac
-    --no-tac
     -i
     +i
     -m --multi
-    +m --no-multi
     --ansi
-    --no-ansi
     --no-mouse
     +c --no-color
-    +2 --no-256
-    --black
-    --no-black
-    --bold
     --no-bold
     --layout
     --reverse
-    --no-reverse
     --cycle
-    --no-cycle
     --keep-right
-    --no-keep-right
-    --hscroll
     --no-hscroll
     --hscroll-off
     --scroll-off
     --filepath-word
-    --no-filepath-word
     --info
-    --no-info
-    --inline-info
-    --no-inline-info
     --separator
     --no-separator
-    --scrollbar
     --no-scrollbar
     --jump-labels
     -1 --select-1
-    +1 --no-select-1
     -0 --exit-0
-    +0 --no-exit-0
     --read0
-    --no-read0
     --print0
-    --no-print0
     --print-query
-    --no-print-query
     --prompt
     --pointer
     --marker
     --sync
-    --no-sync
-    --async
-    --no-history
     --history
     --history-size
-    --no-header
-    --no-header-lines
     --header
     --header-lines
     --header-first
-    --no-header-first
     --ellipsis
     --preview
-    --no-preview
     --preview-window
     --height
     --min-height
-    --no-height
-    --no-margin
-    --no-padding
-    --no-border
     --border
-    --no-border-label
     --border-label
     --border-label-pos
-    --no-preview-label
     --preview-label
     --preview-label-pos
     --no-unicode
-    --unicode
     --margin
     --padding
     --tabstop
     --listen
-    --no-listen
-    --clear
     --no-clear
     --version
     --"
 
   case "${prev}" in
-  --algo)
-    COMPREPLY=( $(compgen -W "v1 v2" -- "$cur") )
-    return 0
-    ;;
   --scheme)
     COMPREPLY=( $(compgen -W "default path history" -- "$cur") )
     return 0
@@ -524,9 +473,10 @@ a_cmds="
   find git grep gunzip gzip hg jar
   ln ls mv open rm rsync scp
   svn tar unzip zip"
+v_cmds="export unset printenv"
 
 # Preserve existing completion
-__fzf_orig_completion < <(complete -p $d_cmds $a_cmds ssh 2> /dev/null)
+__fzf_orig_completion < <(complete -p $d_cmds $a_cmds $v_cmds unalias kill ssh 2> /dev/null)
 
 if type _comp_load > /dev/null 2>&1; then
   # _comp_load was added in bash-completion 2.12 to replace _completion_loader.
@@ -562,10 +512,21 @@ for cmd in $d_cmds; do
   __fzf_defc "$cmd" _fzf_dir_completion "-o bashdefault -o nospace -o dirnames"
 done
 
+# Variables
+for cmd in $v_cmds; do
+  __fzf_defc "$cmd" _fzf_var_completion "-o default -o nospace -v"
+done
+
+# Aliases
+__fzf_defc unalias _fzf_alias_completion "-a"
+
+# Processes
+__fzf_defc kill _fzf_proc_completion "-o default -o bashdefault"
+
 # ssh
 __fzf_defc ssh _fzf_complete_ssh "-o default -o bashdefault"
 
-unset cmd d_cmds a_cmds
+unset cmd d_cmds a_cmds v_cmds
 
 _fzf_setup_completion() {
   local kind fn cmd
@@ -587,10 +548,4 @@ _fzf_setup_completion() {
   done
 }
 
-# Environment variables / Aliases / Hosts / Process
-_fzf_setup_completion 'var'   export unset printenv
-_fzf_setup_completion 'alias' unalias
-_fzf_setup_completion 'host'  telnet
-_fzf_setup_completion 'proc'  kill
-
 fi

src/options.go

@@ -1876,9 +1876,7 @@ func parseOptions(opts *Options, allArgs []string) {
 			opts.Marker = firstLine(nextString(allArgs, &i, "selected sign string required"))
 		case "--sync":
 			opts.Sync = true
-		case "--no-sync":
-			opts.Sync = false
-		case "--async":
+		case "--no-sync", "--async":
 			opts.Sync = false
 		case "--no-history":
 			opts.History = nil

src/reader.go

@@ -147,7 +147,7 @@ func (r *Reader) feed(src io.Reader) {
 		}
 
 		// We're not making any progress after 100 tries. Stop.
-		if n == 0 && err == nil {
+		if n == 0 {
 			break
 		}
 

test/test_go.rb

@@ -1955,6 +1955,11 @@ class TestGoFZF < TestBase
     tmux.until { |lines| assert_equal 10, lines.item_count }
   end
 
+  def test_reload_should_terminate_stadard_input_stream
+    tmux.send_keys %(ruby -e "STDOUT.sync = true; loop { puts 1; sleep 0.1 }" | fzf --bind 'start:reload(seq 100)'), :Enter
+    tmux.until { |lines| assert_equal 100, lines.item_count }
+  end
+
   def test_clear_list_when_header_lines_changed_due_to_reload
     tmux.send_keys %(seq 10 | #{FZF} --header 0 --header-lines 3 --bind 'space:reload(seq 1)'), :Enter
     tmux.until { |lines| assert_includes lines, '  9' }