Implement --no-sort options with some fixes

README.md

@@ -52,13 +52,6 @@ You can use any plugin manager. If you don't use one, I recommend you try
 
 3. Run `:PlugInstall`
 
-Then, you have `:FZF [optional command]` command.
-
-```vim
-:FZF
-:FZF find ~/github -type d
-```
-
 Usage
 -----
 
@@ -76,6 +69,12 @@ files (excluding hidden ones).
 vim `fzf`
 ```
 
+If you do not want the matched items to be sorted, provide `--no-sort` option.
+
+```sh
+history | fzf --no-sort
+```
+
 ### Key binding
 
 Use CTRL-J and CTRL-K (or CTRL-N and CTRL-P) to change the selection, press
@@ -87,8 +86,24 @@ The following readline key bindings should also work as expected.
 - CTRL-B / CTRL-F
 - CTRL-W / CTRL-U
 
-Useful bash bindings and settings
+Usage as Vim plugin
----------------------------------
+-------------------
+
+If you install fzf as a Vim plugin, `:FZF` command will be added.
+
+```vim
+:FZF
+:FZF --no-sort
+```
+
+You can override the command which produces input to fzf.
+
+```vim
+let g:fzf_command = 'find . -type f'
+```
+
+Useful bash examples
+--------------------
 
 ```sh
 # vimf - Open selected file in Vim
@@ -104,6 +119,16 @@ fda() {
   DIR=`find ${1:-*} -type d 2> /dev/null | fzf` && cd "$DIR"
 }
 
+# fh - repeat history
+fh() {
+  eval $(history | fzf --no-sort | sed 's/ *[0-9]* *//')
+}
+
+# fkill - kill process
+fkill() {
+  ps -ef | sed 1d | fzf | awk '{print $2}' | xargs kill -${1:-9}
+}
+
 # CTRL-T - Open fuzzy finder and paste the selected item to the command line
 bind '"\er": redraw-current-line'
 bind '"\C-t": " \C-u \C-a\C-k$(fzf)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er"'

fzf

@@ -57,7 +57,8 @@ C = Curses
 @cursor_x = 0
 @vcursor  = 0
 @matches  = []
-@fan      = '-\|/-\|/'.split(//)
+@loaded   = false
+@sort     = ARGV.delete('--no-sort').nil?
 @stat     = OpenStruct.new(:hit => 0, :partial_hit => 0,
                            :prefix_hit => 0, :search => 0)
 
@@ -76,7 +77,8 @@ def print_input
   cprint @query, 2
 end
 
-def print_info msg = nil
+def print_info progress = true, msg = nil
+  @fan ||= '-\|/-\|/'.split(//)
   C.setpos cursor_y - 1, 0
   C.clrtoeol
   prefix =
@@ -87,7 +89,7 @@ def print_info msg = nil
     else
       '  '
     end
-  C.addstr "#{prefix}#{@matches.length}/#{@count}"
+  C.addstr "#{prefix}#{@matches.length}/#{@count}" if progress
   C.addstr msg if msg
 end
 
@@ -151,6 +153,10 @@ reader = Thread.new {
       @cv.broadcast
     end
   end
+  @mtx.synchronize do
+    @loaded = true
+    @cv.broadcast
+  end
   @smtx.synchronize { @fan = [] }
 }
 
@@ -158,9 +164,10 @@ searcher = Thread.new {
   fcache     = {}
   matches    = []
   new_length = 0
-  pquery     = nil
+  pquery     = ''
-  vcursor    = 0
+  pvcursor   = 0
-  pvcursor   = nil
+  ploaded    = false
+  plength    = 0
   zz         = [0, 0]
 
   begin
@@ -168,101 +175,118 @@ searcher = Thread.new {
       query_changed = nil
       new_items     = nil
       vcursor_moved = nil
+      wait_for_completion = nil
       @mtx.synchronize do
         while true
-          new_items     = !@new.empty?
+          new_items           = !@new.empty?
-          query_changed = pquery   != @query
+          query_changed       = pquery   != @query
-          vcursor_moved = pvcursor != @vcursor
+          vcursor_moved       = pvcursor != @vcursor
+          loading_finished    = ploaded  != @loaded
+          wait_for_completion = !@sort && !@loaded
 
-          if !new_items && !query_changed && !vcursor_moved
+          if !new_items && !query_changed && !vcursor_moved && !loading_finished
             @cv.wait @mtx
             next
           end
-
           break
         end
 
-        if new_items
+        if !wait_for_completion && new_items
           @lists << [@new, {}]
           @count += @new.length
-
+          @new    = []
-          @new   = []
+          fcache  = {}
-          fcache = {}
         end
 
         pquery   = @query
         pvcursor = @vcursor
+        ploaded  = @loaded
       end#mtx
 
+      if wait_for_completion
+        @smtx.synchronize do
+          print_info false, " +#{@new.length}"
+          print_input
+          refresh
+          sleep 0.1
+        end
+        next
+      end
+
       new_search = new_items || query_changed
-      if new_search
+      if new_search && !@lists.empty?
         regexp = pquery.empty? ? nil :
           Regexp.new(pquery.split(//).inject('') { |sum, e|
             e = Regexp.escape e
             sum << "#{e}[^#{e}]*?"
           }, Regexp::IGNORECASE)
 
-        if fcache.has_key?(pquery)
+        matches =
-          @stat.hit += 1
+          if fcache.has_key?(pquery)
-        else
+            @stat.hit += 1
-          @smtx.synchronize do
+            fcache[pquery]
-            print_info ' ..'
-            refresh
-          end unless pquery.empty?
-        end
-        matches = fcache[pquery] ||= @lists.map { |pair|
-          list, cache = pair
-
-          if cache[pquery]
-            @stat.partial_hit += 1
-            cache[pquery]
           else
-            prefix_cache = nil
+            @smtx.synchronize do
-            (pquery.length - 1).downto(1) do |len|
+              print_info true, ' ..'
-              prefix = pquery[0, len]
+              refresh
-              if prefix_cache = cache[prefix]
+            end unless pquery.empty?
-                @stat.prefix_hit += 1
-                break
-              end
-            end
 
-            cache[pquery] ||= (prefix_cache ? prefix_cache.map { |e| e.first } : list).map { |line|
+            found = @lists.map { |pair|
-              if regexp
+              list, cache = pair
-                md = line.match regexp
+
-                md ? [line, md.offset(0)] : nil
+              if cache[pquery]
+                @stat.partial_hit += 1
+                cache[pquery]
               else
-                [line, zz]
+                prefix_cache = nil
+                (pquery.length - 1).downto(1) do |len|
+                  prefix = pquery[0, len]
+                  if prefix_cache = cache[prefix]
+                    @stat.prefix_hit += 1
+                    break
+                  end
+                end
+
+                cache[pquery] ||= (prefix_cache ? prefix_cache.map { |e| e.first } : list).map { |line|
+                  if regexp
+                    # Ignore errors: e.g. invalid byte sequence in UTF-8
+                    md = line.match(regexp) rescue nil
+                    md ? [line, md.offset(0)] : nil
+                  else
+                    [line, zz]
+                  end
+                }.compact
               end
-            }.compact
+            }.inject([]) { |all, e| all.concat e }
+            fcache[pquery] = @sort ? found : found.reverse
           end
-        }.inject([]) { |all, e| all.concat e }
         @stat.search += 1
 
         new_length = matches.length
-        if new_length <= MAX_SORT_LEN
+        if @sort && new_length <= MAX_SORT_LEN
           matches.replace matches.sort_by { |pair|
             line, offset = pair
             [offset.last - offset.first, line.length, line]
           }
         end
-      end#new matches
+      end#new_search
 
-      # This small delay reduces the number of partial lists.
+      # This small delay reduces the number of partial lists
       sleep 0.2 if !query_changed && !vcursor_moved
 
-      prev_length = @matches.length
       if vcursor_moved || new_search
-        vcursor =
+        @mtx.synchronize do
-          @mtx.synchronize do
+          plength  = [@matches.length, max_items].min
-            @matches = matches
+          @matches = matches
-            @vcursor = [0, [@vcursor, new_length - 1, max_items - 1].min].max
+          pvcursor = @vcursor = [0, [@vcursor, new_length - 1, max_items - 1].min].max
-          end
+        end
       end
 
       # Output
       @smtx.synchronize do
-        if new_length < prev_length
+        item_length = [new_length, max_items].min
-          prev_length.downto(new_length) do |idx|
+        if item_length < plength
+          plength.downto(item_length) do |idx|
             C.setpos cursor_y - idx - 2, 0
             C.clrtoeol
           end
@@ -270,11 +294,11 @@ searcher = Thread.new {
 
         maxc = C.cols - 3
         matches[0, max_items].each_with_index do |item, idx|
-          next if !new_search && !((vcursor-1)..(vcursor+1)).include?(idx)
+          next if !new_search && !((pvcursor-1)..(pvcursor+1)).include?(idx)
 
           line, offset = item
           row = cursor_y - idx - 2
-          chosen = idx == vcursor
+          chosen = idx == pvcursor
 
           if line.length > maxc
             line = line[0, maxc] + '..'
@@ -297,7 +321,7 @@ searcher = Thread.new {
           C.attroff C.color_pair(3) | C::A_BOLD if chosen
         end
 
-        print_info
+        print_info if !@lists.empty? || ploaded
         print_input
         refresh
       end
@@ -327,13 +351,13 @@ begin
     ctrl(:e) => proc { cursor = input.length },
     ctrl(:j) => proc {
       @mtx.synchronize do
-        @vcursor = [0, @vcursor - 1].max
+        @vcursor -= 1
         @cv.broadcast
       end
     },
     ctrl(:k) => proc {
       @mtx.synchronize do
-        @vcursor = [0, [@matches.length - 1, @vcursor + 1].min].max
+        @vcursor += 1
         @cv.broadcast
       end
     },

plugin/fzf.vim

@@ -23,11 +23,11 @@
 
 let s:exec = expand('<sfile>:h:h').'/fzf'
 
-function! s:fzf(cmd)
+function! s:fzf(args)
   try
     let tf = tempname()
-    let prefix = empty(a:cmd) ? '' : a:cmd.' | '
+    let prefix = exists('g:fzf_command') ? g:fzf_command.'|' : ''
-    execute "silent !".prefix."/usr/bin/env bash ".s:exec." > ".tf
+    execute "silent !".prefix."/usr/bin/env bash ".s:exec." ".a:args." > ".tf
     if !v:shell_error
       execute 'silent e '.join(readfile(tf), '')
     endif