Update gem version (0.6.0)

- Smart-case pattern matching
- CTRL-Q

README.md

@@ -16,8 +16,6 @@ fzf requires Ruby (>= 1.8.5).
 Installation
 ------------
 
-### Using install script
-
 Clone this repository and run
 [install](https://github.com/junegunn/fzf/blob/master/install) script.
 
@@ -26,32 +24,13 @@ git clone https://github.com/junegunn/fzf.git ~/.fzf
 ~/.fzf/install
 ```
 
-The script will add an alias to fzf and auto-completion support to your
-`.bashrc` and `.zshrc`.
-
-### Manual installation
+The script will generate `~/.fzf.bash` and `~/.fzf.zsh` and update your
+`.bashrc` and `.zshrc` to load them.
 
 Or you can just download
 [fzf executable](https://raw.github.com/junegunn/fzf/master/fzf) and put it
 somewhere in your search $PATH.
 
-```sh
-mkdir -p ~/bin
-wget https://raw.github.com/junegunn/fzf/master/fzf -O ~/bin/fzf
-chmod +x ~/bin/fzf
-```
-
-### Install as Ruby gem
-
-fzf can be installed as a Ruby gem
-
-```
-gem install fzf
-```
-
-It's a bit easier to install and update the script but the Ruby gem version
-takes slightly longer to start.
-
 ### Install as Vim plugin
 
 You can use any Vim plugin manager to install fzf for Vim. If you don't use one,
@@ -78,6 +57,7 @@ usage: fzf [options]
     -q, --query=STR  Initial query
     -s, --sort=MAX   Maximum number of matched items to sort. Default: 1000
     +s, --no-sort    Do not sort the result. Keep the sequence unchanged.
+    -i               Case-insensitive match (default: smart-case match)
     +i               Case-sensitive match
     +c, --no-color   Disable colors
 ```
@@ -173,8 +153,8 @@ Most of the time, you will prefer native Vim plugins with better integration
 with Vim. The only reason one might consider using fzf in Vim is its speed. For
 a very large list of files, fzf is significantly faster and it does not block.
 
-Useful bash examples
---------------------
+Useful examples
+---------------
 
 ```sh
 # vimf - Open selected file in Vim
@@ -189,15 +169,7 @@ fd() {
 
 # fda - including hidden directories
 fda() {
-  DIR=$(find ${1:-*} -type d 2> /dev/null | fzf) && cd "$DIR"
-}
-
-# fsel - Select multiple files in the given path
-fsel() {
-  find ${1:-*} | fzf -m | while read item; do
-    echo -n "\"$item\" "
-  done
-  echo
+  DIR=$(find ${1:-.} -type d 2> /dev/null | fzf) && cd "$DIR"
 }
 
 # fh - repeat history
@@ -209,19 +181,43 @@ fh() {
 fkill() {
   ps -ef | sed 1d | fzf -m | awk '{print $2}' | xargs kill -${1:-9}
 }
+```
 
-# (Assuming you don't use the default CTRL-T and CTRL-R)
+Key bindings for command line
+-----------------------------
+
+The install script will add the following key bindings to your configuration
+files.
+
+### bash
+
+- `CTRL-T` - Paste the selected file path(s) into the command line
+- `CTRL-R` - Paste the selected command from history into the command line
+
+```sh
+# Required to refresh the prompt after fzf
+bind '"\er": redraw-current-line'
 
 # CTRL-T - Paste the selected file path into 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"'
+fsel() {
+  find * -path '*/\.*' -prune \
+    -o -type f -print \
+    -o -type l -print 2> /dev/null | fzf -m | while read item; do
+    printf '%q ' "$item"
+  done
+  echo
+}
+bind '"\C-t": " \C-u \C-a\C-k$(fsel)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er"'
 
 # CTRL-R - Paste the selected command from history into the command line
 bind '"\C-r": " \C-e\C-u$(history | fzf +s | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
 ```
 
-zsh widgets
------------
+### zsh
+
+- `CTRL-T` - Paste the selected file path(s) into the command line
+- `CTRL-R` - Paste the selected command from history into the command line
+- `ALT-C` - cd into the selected directory
 
 ```sh
 # CTRL-T - Paste the selected file path(s) into the command line
@@ -259,21 +255,21 @@ zle     -N   fzf-history-widget
 bindkey '^R' fzf-history-widget
 ```
 
-Auto-completion (experimental)
-------------------------------
+Auto-completion
+---------------
 
 Disclaimer: *Auto-completion feature is currently experimental, it can change
 over time*
 
 ### bash
 
-Fuzzy completion can be triggered if the word before the cursor ends
-with the trigger sequence which is by default `**`.
+#### Files and directories
+
+Fuzzy completion for files and directories can be triggered if the word before
+the cursor ends with the trigger sequence which is by default `**`.
 
 - `COMMAND [DIRECTORY/][FUZZY_PATTERN]**<TAB>`
 
-#### Examples
-
 ```sh
 # Files under current directory
 # - You can select multiple items with TAB key
@@ -296,6 +292,26 @@ cd **<TAB>
 cd ~/github/fzf**<TAB>
 ```
 
+#### Process IDs
+
+Fuzzy completion for PIDs is provided for kill command. In this case
+there is no trigger sequence, just press tab key after kill command.
+
+```sh
+# Can select multiple processes with <TAB> or <Shift-TAB> keys
+kill -9 <TAB>
+```
+
+#### Host names
+
+For ssh and telnet commands, fuzzy completion for host names is provided. The
+names are extracted from /etc/hosts file.
+
+```sh
+ssh <TAB>
+telnet <TAB>
+```
+
 #### Settings
 
 ```sh
@@ -325,14 +341,17 @@ If you're running Ruby 1.9 or above, you can improve the startup time with
 - `time ruby --disable-gems ~/bin/fzf -h`
     - 0.025 sec
 
-Define fzf alias with the option as follows:
+You can define fzf function with the option as follows:
 
 ```sh
-alias fzf='ruby --disable-gems ~/bin/fzf'
+fzf() {
+  ruby --disable-gems ~/bin/fzf "$@"
+}
+export -f fzf
 ```
 
-This is automatically set up in your .bashrc and .zshrc if you use the bundled
-[install](https://github.com/junegunn/fzf/blob/master/install) script.
+However, this is automatically set up in your .bashrc and .zshrc if you use the
+bundled [install](https://github.com/junegunn/fzf/blob/master/install) script.
 
 ### Incorrect display on Ruby 1.8
 
@@ -341,6 +360,20 @@ when it's running on Ruby 1.8. If you experience the problem, upgrade your Ruby
 to 1.9 or above. Ruby 1.9 or above is also required for displaying Unicode
 characters.
 
+### Ranking algorithm
+
+fzf sorts the result first by the length of the matched substring, then by the
+length of the whole string. However it only does so when the number of matches
+is less than the limit which is by default 1000, in order to avoid the cost of
+sorting a large list and limit the response time of the query.
+
+This limit can be adjusted with `-s` option, or with the environment variable
+`FZF_DEFAULT_SORT`.
+
+```sh
+export FZF_DEFAULT_SORT=10000
+```
+
 License
 -------
 

fzf

@@ -10,7 +10,7 @@
 # URL:         https://github.com/junegunn/fzf
 # Author:      Junegunn Choi
 # License:     MIT
-# Last update: November 24, 2013
+# Last update: December 20, 2013
 #
 # Copyright (c) 2013 Junegunn Choi
 #
@@ -67,7 +67,7 @@ class FZF
   end
 
   def initialize argv, source = $stdin
-    @rxflag = Regexp::IGNORECASE
+    @rxflag = nil
     @sort   = ENV.fetch('FZF_DEFAULT_SORT', 1000).to_i
     @color  = true
     @multi  = false
@@ -79,6 +79,7 @@ class FZF
       when '-h', '--help'     then usage 0
       when '-m', '--multi'    then @multi  = true
       when '-x', '--extended' then @xmode  = true
+      when '-i'               then @rxflag = Regexp::IGNORECASE
       when '+i'               then @rxflag = 0
       when '+s', '--no-sort'  then @sort   = nil
       when '+c', '--no-color' then @color  = false
@@ -136,6 +137,7 @@ class FZF
     -q, --query=STR  Initial query
     -s, --sort=MAX   Maximum number of matched items to sort. Default: 1000
     +s, --no-sort    Do not sort the result. Keep the sequence unchanged.
+    -i               Case-insensitive match (default: smart-case match)
     +i               Case-sensitive match
     +c, --no-color   Disable colors]
     exit x
@@ -347,7 +349,7 @@ class FZF
       tokens << [line[b...e], true]
       index = e
     end
-    tokens << [line[index..-1], false]
+    tokens << [line[index..-1], false] if index < line.length
     tokens.reject { |pair| pair.first.empty? }
   end
 
@@ -446,7 +448,7 @@ class FZF
     C.noecho
 
     if @color
-      if C.can_change_color?
+      if C.can_change_color? && ENV['TERM'].to_s =~ /256/
         C.init_pair 1, 110, dbg
         C.init_pair 2, 108, dbg
         C.init_pair 3, 254, 236
@@ -706,7 +708,7 @@ class FZF
       actions[ctrl(:h)] = actions[127]
       actions[ctrl(:n)] = actions[ctrl(:j)]
       actions[ctrl(:p)] = actions[ctrl(:k)]
-      actions[ctrl(:g)] = actions[ctrl(:c)] = actions[:esc]
+      actions[ctrl(:q)] = actions[ctrl(:g)] = actions[ctrl(:c)] = actions[:esc]
       actions[:stab]    = actions[9]
 
       emit(:key) { [@query.get, cursor] } unless @query.empty?
@@ -770,14 +772,18 @@ class FZF
       q.empty?
     end
 
+    def rxflag_for q
+      @rxflag || (q =~ /[A-Z]/ ? 0 : Regexp::IGNORECASE)
+    end
+
     def fuzzy_regex q
       @regexp[q] ||= begin
-        q = q.downcase if @rxflag != 0
+        q = q.downcase if @rxflag == Regexp::IGNORECASE
         Regexp.new(query_chars(q).inject('') { |sum, e|
           e = Regexp.escape e
           sum << (e.length > 1 ? "(?:#{e}).*?" :  # FIXME: not equivalent
                                  "#{e}[^#{e}]*?")
-        }, @rxflag)
+        }, rxflag_for(q))
       end
     end
 
@@ -829,15 +835,17 @@ class FZF
             case w
             when ''
               nil
+            when /^\^(.*)\$$/
+              Regexp.new('^' << sanitize(Regexp.escape($1)) << '$', rxflag_for(w))
             when /^'/
               w.length > 1 ?
-                Regexp.new(sanitize(Regexp.escape(w[1..-1])), rxflag) : nil
+                Regexp.new(sanitize(Regexp.escape(w[1..-1])), rxflag_for(w)) : nil
             when /^\^/
               w.length > 1 ?
-                Regexp.new('^' << sanitize(Regexp.escape(w[1..-1])), rxflag) : nil
+                Regexp.new('^' << sanitize(Regexp.escape(w[1..-1])), rxflag_for(w)) : nil
             when /\$$/
               w.length > 1 ?
-                Regexp.new(sanitize(Regexp.escape(w[0..-2])) << '$', rxflag) : nil
+                Regexp.new(sanitize(Regexp.escape(w[0..-2])) << '$', rxflag_for(w)) : nil
             else
               fuzzy_regex w
             end, invert ]

fzf-completion.bash

@@ -31,11 +31,10 @@ _fzf_opts_completion() {
 }
 
 _fzf_generic_completion() {
-  local cur prev opts base dir leftover matches
+  local cur base dir leftover matches
   COMPREPLY=()
   FZF_COMPLETION_TRIGGER=${FZF_COMPLETION_TRIGGER:-**}
   cur="${COMP_WORDS[COMP_CWORD]}"
-  prev="${COMP_WORDS[COMP_CWORD-1]}"
   if [[ ${cur} == *"$FZF_COMPLETION_TRIGGER" ]]; then
     base=${cur:0:${#cur}-${#FZF_COMPLETION_TRIGGER}}
     eval base=$base
@@ -46,12 +45,9 @@ _fzf_generic_completion() {
         leftover=${base/#"$dir"}
         leftover=${leftover/#\/}
         [ "$dir" = './' ] && dir=''
+        tput sc
         matches=$(find "$dir"* $1 2> /dev/null | fzf $FZF_COMPLETION_OPTS $2 -q "$leftover" | while read item; do
-          if [[ ${item} =~ \  ]]; then
-            echo -n "\"$item\" "
-          else
-            echo -n "$item "
-          fi
+          printf '%q ' "$item"
         done)
         matches=${matches% }
         if [ -n "$matches" ]; then
@@ -59,6 +55,7 @@ _fzf_generic_completion() {
         else
           COMPREPLY=( "$cur" )
         fi
+        tput rc
         return 0
       fi
       dir=$(dirname "$dir")
@@ -85,6 +82,36 @@ _fzf_dir_completion() {
     ""
 }
 
+_fzf_kill_completion() {
+  [ -n "${COMP_WORDS[COMP_CWORD]}" ] && return 1
+
+  local selected
+  tput sc
+  selected=$(ps -ef | sed 1d | fzf -m $FZF_COMPLETION_OPTS | awk '{print $2}' | tr '\n' ' ')
+  tput rc
+
+  if [ -n "$selected" ]; then
+    COMPREPLY=( "$selected" )
+    return 0
+  fi
+}
+
+_fzf_host_completion() {
+  local cur prev selected
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  prev="${COMP_WORDS[COMP_CWORD-1]}"
+  [[ "$cur" =~ ^- || "$prev" =~ ^- ]] && return 1
+
+  tput sc
+  selected=$(grep -v '^\s*\(#\|$\)' /etc/hosts | awk '{print $2}' | sort -u | fzf $FZF_COMPLETION_OPTS -q "$cur")
+  tput rc
+
+  if [ -n "$selected" ]; then
+    COMPREPLY=("$selected")
+    return 0
+  fi
+}
+
 complete -F _fzf_opts_completion fzf
 
 # Directory
@@ -110,7 +137,11 @@ for cmd in "
   complete -F _fzf_all_completion -o default -o bashdefault $cmd
 done
 
-bind '"\e\e": complete'
-bind '"\er": redraw-current-line'
-bind '"\C-i": "\e\e\er"'
+# Kill completion
+complete -F _fzf_kill_completion -o nospace -o default -o bashdefault kill
+
+# Host completion
+for cmd in "ssh telnet"; do
+  complete -F _fzf_host_completion -o default -o bashdefault $cmd
+done
 

fzf.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'fzf'
-  spec.version       = '0.5.0'
+  spec.version       = '0.6.0'
   spec.authors       = ['Junegunn Choi']
   spec.email         = ['junegunn.c@gmail.com']
   spec.description   = %q{Fuzzy finder for your shell}

install

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 cd `dirname $BASH_SOURCE`
-FZF_BASE=`pwd`
+fzf_base=`pwd`
 
 # ruby executable
 echo -n "Checking Ruby executable ... "
-RUBY=`which ruby`
+ruby=`which ruby`
 if [ $? -ne 0 ]; then
   echo "ruby executable not found!"
   exit 1
@@ -26,51 +26,138 @@ echo -n "Checking Ruby version ... "
 /usr/bin/env ruby -e 'exit RUBY_VERSION >= "1.9"'
 if [ $? -eq 0 ]; then
   echo ">= 1.9"
-  FZF_ALIAS="alias fzf='$RUBY --disable-gems $FZF_BASE/fzf'"
+  fzf_cmd="$ruby --disable-gems $fzf_base/fzf"
 else
   echo "< 1.9"
-  FZF_ALIAS="alias fzf='$RUBY $FZF_BASE/fzf' # fzf"
+  fzf_cmd="$ruby $fzf_base/fzf"
 fi
 
 # Auto-completion
-read -p "Do you want to add auto-completion support? (y/n) " -n 1 -r
+read -p "Do you want to add auto-completion support? ([y]/n) " -n 1 -r
 echo
 [[ ! $REPLY =~ ^[Nn]$ ]]
-AUTO_COMPLETION=$?
+auto_completion=$?
+
+# Key-bindings
+read -p "Do you want to add key bindings? ([y]/n) " -n 1 -r
+echo
+[[ ! $REPLY =~ ^[Nn]$ ]]
+key_bindings=$?
+
+echo
+for shell in bash zsh; do
+  echo -n "Generate ~/.fzf.$shell ... "
+  src=~/.fzf.${shell}
+
+  fzf_completion="source $fzf_base/fzf-completion.${shell}"
+  if [ $auto_completion -ne 0 ]; then
+    fzf_completion="# $fzf_completion"
+  fi
+
+  cat > $src << EOF
+# Setup fzf function
+# ------------------
+unalias fzf 2> /dev/null
+fzf() {
+  $fzf_cmd "\$@"
+}
+export -f fzf > /dev/null
+
+# Auto-completion
+# ---------------
+$fzf_completion
+
+EOF
+
+  if [ $key_bindings -eq 0 ]; then
+    if [ $shell = bash ]; then
+      cat >> $src << "EOF"
+# Key bindings
+# ------------
+# Required to refresh the prompt after fzf
+bind '"\er": redraw-current-line'
+
+# CTRL-T - Paste the selected file path into the command line
+fsel() {
+  find * -path '*/\.*' -prune \
+    -o -type f -print \
+    -o -type l -print 2> /dev/null | fzf -m | while read item; do
+    printf '%q ' "$item"
+  done
+  echo
+}
+bind '"\C-t": " \C-u \C-a\C-k$(fsel)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er"'
+
+# CTRL-R - Paste the selected command from history into the command line
+bind '"\C-r": " \C-e\C-u$(history | fzf +s | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
+
+EOF
+    else
+      cat >> $src << "EOF"
+# Key bindings
+# ------------
+# CTRL-T - Paste the selected file path(s) into the command line
+fzf-file-widget() {
+  local FILES
+  local IFS="
+"
+  FILES=($(
+    find * -path '*/\.*' -prune \
+    -o -type f -print \
+    -o -type l -print 2> /dev/null | fzf -m))
+  unset IFS
+  FILES=$FILES:q
+  LBUFFER="${LBUFFER%% #} $FILES"
+  zle redisplay
+}
+zle     -N   fzf-file-widget
+bindkey '^T' fzf-file-widget
+
+# ALT-C - cd into the selected directory
+fzf-cd-widget() {
+  cd "${$(find * -path '*/\.*' -prune \
+          -o -type d -print 2> /dev/null | fzf):-.}"
+  zle reset-prompt
+}
+zle     -N    fzf-cd-widget
+bindkey '\ec' fzf-cd-widget
+
+# CTRL-R - Paste the selected command from history into the command line
+fzf-history-widget() {
+  LBUFFER=$(history | fzf +s | sed "s/ *[0-9]* *//")
+  zle redisplay
+}
+zle     -N   fzf-history-widget
+bindkey '^R' fzf-history-widget
+
+EOF
+    fi
+  fi
+
+  echo "OK"
+done
 
 echo
 for shell in bash zsh; do
   rc=~/.${shell}rc
+  src="source ~/.fzf.${shell}"
+
   echo "Update $rc:"
-
-  # Install fzf alias
-  echo "- Add fzf alias:"
-  echo "  - $FZF_ALIAS"
-  if [ $(grep "alias fzf=" $rc | wc -l) -gt 0 ]; then
-    echo "    - (X) fzf alias already exists"
+  echo "  - $src"
+  if [ $(grep -F "$src" $rc | wc -l) -gt 0 ]; then
+    echo "    - Not added (already being sourced)"
   else
-    echo $FZF_ALIAS >> $rc
-    echo "    - Added."
-  fi
-
-  # Install auto-completion support
-  if [ $AUTO_COMPLETION -eq 0 ]; then
-    FZF_COMPLETION="source $FZF_BASE/fzf-completion.${shell}"
-    echo "- Add auto-completion support"
-    echo "  - $FZF_COMPLETION"
-    if [ $(grep "source.*fzf-completion" $rc | wc -l) -gt 0 ]; then
-      echo "    - (X) fzf-completion.${shell} already being sourced"
-    else
-      echo $FZF_COMPLETION >> $rc
-      echo "    - Added."
-    fi
+    echo $src >> $rc
+    echo "    - Added"
   fi
   echo
 done
 
-echo "Finished. Reload your .bashrc or .zshrc to take effect."
-echo "   source ~/.bashrc  # bash"
-echo "   source ~/.zshrc   # zsh"
-echo
-echo "To uninstall fzf, simply remove the added lines."
+cat << EOF
+Finished. Reload your .bashrc or .zshrc to take effect.
+   source ~/.bashrc  # bash"
+   source ~/.zshrc   # zsh"
+
+To uninstall fzf, simply remove the added line.
+EOF
 

test/test_fzf.rb

@@ -12,7 +12,7 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal 1000,  fzf.sort
     assert_equal false, fzf.multi
     assert_equal true,  fzf.color
-    assert_equal Regexp::IGNORECASE, fzf.rxflag
+    assert_equal nil,   fzf.rxflag
 
     begin
       ENV['FZF_DEFAULT_SORT'] = '1500'
@@ -152,15 +152,59 @@ class TestFZF < MiniTest::Unit::TestCase
     # TODO : partial_cache
   end
 
+  def test_fuzzy_matcher_rxflag
+    assert_equal nil, FZF::FuzzyMatcher.new(nil).rxflag
+    assert_equal 0, FZF::FuzzyMatcher.new(0).rxflag
+    assert_equal 1, FZF::FuzzyMatcher.new(1).rxflag
+
+    assert_equal 1, FZF::FuzzyMatcher.new(nil).rxflag_for('abc')
+    assert_equal 0, FZF::FuzzyMatcher.new(nil).rxflag_for('Abc')
+    assert_equal 0, FZF::FuzzyMatcher.new(0).rxflag_for('abc')
+    assert_equal 0, FZF::FuzzyMatcher.new(0).rxflag_for('Abc')
+    assert_equal 1, FZF::FuzzyMatcher.new(1).rxflag_for('abc')
+    assert_equal 1, FZF::FuzzyMatcher.new(1).rxflag_for('Abc')
+  end
+
   def test_fuzzy_matcher_case_sensitive
+    # Smart-case match (Uppercase found)
+    assert_equal [['Fruit', [[0, 5]]]],
+      FZF::FuzzyMatcher.new(nil).match(%w[Fruit Grapefruit], 'Fruit', '', '').sort
+
+    # Smart-case match (Uppercase not-found)
+    assert_equal [["Fruit", [[0, 5]]], ["Grapefruit", [[5, 10]]]],
+      FZF::FuzzyMatcher.new(nil).match(%w[Fruit Grapefruit], 'fruit', '', '').sort
+
+    # Case-sensitive match (-i)
     assert_equal [['Fruit', [[0, 5]]]],
       FZF::FuzzyMatcher.new(0).match(%w[Fruit Grapefruit], 'Fruit', '', '').sort
 
+    # Case-insensitive match (+i)
     assert_equal [["Fruit", [[0, 5]]], ["Grapefruit", [[5, 10]]]],
       FZF::FuzzyMatcher.new(Regexp::IGNORECASE).
       match(%w[Fruit Grapefruit], 'Fruit', '', '').sort
   end
 
+  def test_extended_fuzzy_matcher_case_sensitive
+    %w['Fruit Fruit$].each do |q|
+      # Smart-case match (Uppercase found)
+      assert_equal [['Fruit', [[0, 5]]]],
+        FZF::ExtendedFuzzyMatcher.new(nil).match(%w[Fruit Grapefruit], q, '', '').sort
+
+      # Smart-case match (Uppercase not-found)
+      assert_equal [["Fruit", [[0, 5]]], ["Grapefruit", [[5, 10]]]],
+        FZF::ExtendedFuzzyMatcher.new(nil).match(%w[Fruit Grapefruit], q.downcase, '', '').sort
+
+      # Case-sensitive match (-i)
+      assert_equal [['Fruit', [[0, 5]]]],
+        FZF::ExtendedFuzzyMatcher.new(0).match(%w[Fruit Grapefruit], q, '', '').sort
+
+      # Case-insensitive match (+i)
+      assert_equal [["Fruit", [[0, 5]]], ["Grapefruit", [[5, 10]]]],
+        FZF::ExtendedFuzzyMatcher.new(Regexp::IGNORECASE).
+        match(%w[Fruit Grapefruit], q, '', '').sort
+    end
+  end
+
   def test_extended_fuzzy_matcher
     matcher = FZF::ExtendedFuzzyMatcher.new Regexp::IGNORECASE
     list = %w[
@@ -197,6 +241,11 @@ class TestFZF < MiniTest::Unit::TestCase
       assert_equal list.length,     match.call('j', '').length
       assert_equal list.length - 1, match.call('^j', '').length
 
+      # ^ + $
+      assert_equal 0, match.call('^juici$', '').length
+      assert_equal 1, match.call('^juice$', '').length
+      assert_equal 0, match.call('^.*$', '').length
+
       # !
       assert_equal 0, match.call('!j', '').length
 
@@ -332,5 +381,14 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal ["a", "b", "c", "\xFF", "d", "e", "f"],
       FZF::UConv.split("abc\xFFdef")
   end
+
+  # ^$ -> matches empty item
+  def test_format_empty_item
+    fzf = FZF.new []
+    item = ['', [[0, 0]]]
+    line, offsets = fzf.convert_item item
+    tokens        = fzf.format line, 80, offsets
+    assert_equal [], tokens
+  end
 end