Stop searching if query string has changed

fzf

@@ -73,7 +73,6 @@ require 'curses'
 @cursor_x = 0
 @vcursor  = 0
 @events   = {}
-@stat     = { :hit => 0, :partial_hit => 0, :prefix_hit => 0, :search => 0 }
 
 def emit event
   @mtx.synchronize do
@@ -232,33 +231,28 @@ searcher = Thread.new {
             sum << "#{e}[^#{e}]*?"
           }, @rxflag)
 
-        matches =
+        matches = fcache[q] ||=
-          if fcache.has_key?(q)
+          begin
-            @stat[:hit] += 1
-            fcache[q]
-          else
             @smtx.synchronize do
               print_info true, ' ..'
               refresh
             end unless q.empty?
 
-            found = @lists.map { |pair|
+            found = []
-              list, cache = pair
+            skip  = false
+            @lists.each do |pair|
+              @mtx.synchronize { skip = @events[:key] }
+              break if skip
 
-              if cache[q]
+              list, cache = pair
-                @stat[:partial_hit] += 1
+              found.concat(cache[q] ||= begin
-                cache[q]
-              else
                 prefix_cache = nil
                 (q.length - 1).downto(1) do |len|
                   prefix = q[0, len]
-                  if prefix_cache = cache[prefix]
+                  break if prefix_cache = cache[prefix]
-                    @stat[:prefix_hit] += 1
-                    break
-                  end
                 end
 
-                cache[q] ||= (prefix_cache ? prefix_cache.map { |e| e.first } : list).map { |line|
+                (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
@@ -267,11 +261,11 @@ searcher = Thread.new {
                     [line, zz]
                   end
                 }.compact
+              end)
             end
-            }.inject([]) { |all, e| all.concat e }
+            next if skip
-            fcache[q] = @sort ? found : found.reverse
+            @sort ? found : found.reverse
           end
-        @stat[:search] += 1
 
         mcount = matches.length
         if @sort && mcount <= @sort