command-t 1.13 → 2.0

data/ruby/command-t/finder/file_finder.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Copyright 2010-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT
@@ -24,6 +24,10 @@ module CommandT
       def flush
         @scanner.flush
       end
+
+      def name
+        'Files'
+      end
     end # class FileFinder
   end # class Finder
 end # module CommandT

data/ruby/command-t/finder/jump_finder.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Greg Hurrell. All rights reserved.
+# Copyright 2011-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT
@@ -8,6 +8,10 @@ module CommandT
         @scanner = Scanner::JumpScanner.new
         @matcher = Matcher.new @scanner, :always_show_dot_files => true
       end
+
+      def name
+        'Jumps'
+      end
     end # class JumpFinder
   end # class Finder
 end # module CommandT

data/ruby/command-t/finder/mru_buffer_finder.rb

@@ -1,4 +1,4 @@
-# Copyright 2014 Greg Hurrell. All rights reserved.
+# Copyright 2014-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT
@@ -23,6 +23,10 @@ module CommandT
           matches
         end
       end
+
+      def name
+        'Recent'
+      end
     end # class MRUBufferFinder
   end # class Finder
 end # CommandT

data/ruby/command-t/finder/tag_finder.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Greg Hurrell. All rights reserved.
+# Copyright 2011-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT
@@ -21,6 +21,10 @@ module CommandT
       def flush
         @scanner.flush
       end
+
+      def name
+        'Tags'
+      end
     end # class TagFinder
   end # class Finder
 end # module CommandT

data/ruby/command-t/match.c

@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Greg Hurrell. All rights reserved.
+// Copyright 2010-present Greg Hurrell. All rights reserved.
 // Licensed under the terms of the BSD 2-clause license.
 
 #include <float.h> /* for DBL_MAX */
@@ -16,6 +16,7 @@ typedef struct {
     int     always_show_dot_files;  // boolean
     int     never_show_dot_files;   // boolean
     int     case_sensitive;         // boolean
+    int     recurse;                // boolean
     double  *memo;                  // memoization
 } matchinfo_t;
 
@@ -94,7 +95,7 @@ double recursive_match(matchinfo_t *m,    // sharable meta-data
                     score_for_char *= factor;
                 }
 
-                if (++j < m->haystack_len) {
+                if (++j < m->haystack_len && m->recurse) {
                     // bump cursor one char to the right and
                     // use recursion to try and find a better match
                     double sub_score = recursive_match(m, j, i, last_idx, score);
@@ -125,6 +126,7 @@ void calculate_match(VALUE str,
                      VALUE case_sensitive,
                      VALUE always_show_dot_files,
                      VALUE never_show_dot_files,
+                     VALUE recurse,
                      match_t *out)
 {
     long i, max;
@@ -138,6 +140,7 @@ void calculate_match(VALUE str,
     m.always_show_dot_files = always_show_dot_files == Qtrue;
     m.never_show_dot_files  = never_show_dot_files == Qtrue;
     m.case_sensitive        = case_sensitive;
+    m.recurse               = recurse == Qtrue;
 
     // calculate score
     score = 1.0;

data/ruby/command-t/match.h

@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Greg Hurrell. All rights reserved.
+// Copyright 2010-present Greg Hurrell. All rights reserved.
 // Licensed under the terms of the BSD 2-clause license.
 
 #include <ruby.h>
@@ -14,4 +14,5 @@ extern void calculate_match(VALUE str,
                             VALUE case_sensitive,
                             VALUE always_show_dot_files,
                             VALUE never_show_dot_files,
+                            VALUE recurse,
                             match_t *out);

data/ruby/command-t/match_window.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2015 Greg Hurrell. All rights reserved.
+# Copyright 2010-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 require 'ostruct'
@@ -20,6 +20,9 @@ module CommandT
       @prompt          = options[:prompt]
       @reverse_list    = options[:match_window_reverse]
 
+      quoted_name = VIM::escape_for_single_quotes(options[:name])
+      escaped_name = ::VIM::evaluate("fnameescape('#{quoted_name}')")
+
       # save existing window dimensions so we can restore them later
       @windows = (0..(::VIM::Window.count - 1)).map do |i|
         OpenStruct.new(
@@ -43,26 +46,31 @@ module CommandT
 
       # show match window
       split_location = options[:match_window_at_top] ? 'topleft' : 'botright'
-      if @@buffer # still have buffer from last time
-        ::VIM::command "silent! #{split_location} #{@@buffer.number}sbuffer"
-        raise "Can't re-open GoToFile buffer" unless $curbuf.number == @@buffer.number
+      if ((number = buffer_number)) # still have buffer from last time
+        ::VIM::command "silent! #{split_location} #{number}sbuffer"
+        if $curbuf.number != number
+          raise "Can't re-open Command-T match listing buffer"
+        end
         $curwin.height = 1
+        ::VIM::command "0file"
+        ::VIM::command "keepalt file #{escaped_name}"
       else        # creating match window for first time and set it up
-        ::VIM::command "silent! #{split_location} 1split GoToFile"
-        set 'bufhidden', 'unload' # unload buf when no longer displayed
-        set 'buftype', 'nofile'   # buffer is not related to any file
-        set 'modifiable', false   # prevent manual edits
-        set 'readonly', false     # avoid W10 "Changing a readonly file"
-        set 'swapfile', false     # don't create a swapfile
-        set 'wrap', false         # don't soft-wrap
-        set 'number', false       # don't show line numbers
-        set 'list', false         # don't use List mode (visible tabs etc)
-        set 'foldcolumn', 0       # don't show a fold column at side
-        set 'foldlevel', 99       # don't fold anything
-        set 'cursorline', false   # don't highlight line cursor is on
-        set 'spell', false        # spell-checking off
-        set 'buflisted', false    # don't show up in the buffer list
-        set 'textwidth', 0        # don't hard-wrap (break long lines)
+        ::VIM::command "silent! keepalt #{split_location} 1split #{escaped_name}"
+        set 'bufhidden', 'unload'   # unload buf when no longer displayed
+        set 'buftype', 'nofile'     # buffer is not related to any file
+        set 'filetype', 'command-t' # provide for detectability/extensibility
+        set 'modifiable', false     # prevent manual edits
+        set 'readonly', false       # avoid W10 "Changing a readonly file"
+        set 'swapfile', false       # don't create a swapfile
+        set 'wrap', false           # don't soft-wrap
+        set 'number', false         # don't show line numbers
+        set 'list', false           # don't use List mode (visible tabs etc)
+        set 'foldcolumn', 0         # don't show a fold column at side
+        set 'foldlevel', 99         # don't fold anything
+        set 'cursorline', false     # don't highlight line cursor is on
+        set 'spell', false          # spell-checking off
+        set 'buflisted', false      # don't show up in the buffer list
+        set 'textwidth', 0          # don't hard-wrap (break long lines)
 
         # don't show the color column
         set 'colorcolumn', 0 if VIM::exists?('+colorcolumn')
@@ -71,7 +79,9 @@ module CommandT
         set 'relativenumber', false if VIM::exists?('+relativenumber')
 
         # sanity check: make sure the buffer really was created
-        raise "Can't find GoToFile buffer" unless $curbuf.name.match /GoToFile\z/
+        if File.basename($curbuf.name) != options[:name]
+          raise "Can't find Command-T match listing buffer"
+        end
         @@buffer = $curbuf
       end
 
@@ -117,6 +127,9 @@ module CommandT
 
     def buffer_number
       @@buffer && @@buffer.number
+    rescue Vim::DeletedBufferError
+      # Beware of people manually deleting Command-T's hidden, unlisted buffer.
+      @@buffer = nil
     end
 
     def close
@@ -140,7 +153,9 @@ module CommandT
       # For more details, see: https://wincent.com/issues/1617
       if $curbuf.number == 0
         # use bwipeout as bunload fails if passed the name of a hidden buffer
-        ::VIM::command 'silent! bwipeout! GoToFile'
+        base = File.basename($curbuf.name)
+        escaped_name = ::VIM::evaluate("fnameescape('#{base}')")
+        ::VIM::command "silent! bwipeout! #{escaped_name}"
         @@buffer = nil
       else
         ::VIM::command "silent! bunload! #{@@buffer.number}"

data/ruby/command-t/matcher.c

@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Greg Hurrell. All rights reserved.
+// Copyright 2010-present Greg Hurrell. All rights reserved.
 // Licensed under the terms of the BSD 2-clause license.
 
 #include <stdlib.h>  /* for qsort() */
@@ -90,6 +90,7 @@ typedef struct {
     VALUE abbrev;
     VALUE always_show_dot_files;
     VALUE never_show_dot_files;
+    VALUE recurse;
 } thread_args_t;
 
 void *match_thread(void *thread_args)
@@ -103,6 +104,7 @@ void *match_thread(void *thread_args)
                         args->case_sensitive,
                         args->always_show_dot_files,
                         args->never_show_dot_files,
+                        args->recurse,
                         &args->matches[i]);
     }
 
@@ -123,8 +125,10 @@ VALUE CommandTMatcher_sorted_matches_for(int argc, VALUE *argv, VALUE self)
     VALUE always_show_dot_files;
     VALUE limit_option;
     VALUE never_show_dot_files;
+    VALUE ignore_spaces;
     VALUE options;
     VALUE paths;
+    VALUE recurse;
     VALUE results;
     VALUE scanner;
     VALUE sort_option;
@@ -136,16 +140,21 @@ VALUE CommandTMatcher_sorted_matches_for(int argc, VALUE *argv, VALUE self)
     if (NIL_P(abbrev))
         rb_raise(rb_eArgError, "nil abbrev");
 
-    // check optional options has for overrides
+    // check optional options hash for overrides
     case_sensitive = CommandT_option_from_hash("case_sensitive", options);
     limit_option = CommandT_option_from_hash("limit", options);
     threads_option = CommandT_option_from_hash("threads", options);
     sort_option = CommandT_option_from_hash("sort", options);
+    ignore_spaces = CommandT_option_from_hash("ignore_spaces", options);
+    recurse = CommandT_option_from_hash("recurse", options);
 
     abbrev = StringValue(abbrev);
     if (case_sensitive != Qtrue)
         abbrev = rb_funcall(abbrev, rb_intern("downcase"), 0);
 
+    if (ignore_spaces == Qtrue)
+        abbrev = rb_funcall(abbrev, rb_intern("delete"), 1, rb_str_new2(" "));
+
     // get unsorted matches
     scanner = rb_iv_get(self, "@scanner");
     paths = rb_funcall(scanner, rb_intern("paths"), 0);
@@ -181,6 +190,7 @@ VALUE CommandTMatcher_sorted_matches_for(int argc, VALUE *argv, VALUE self)
         thread_args[i].abbrev = abbrev;
         thread_args[i].always_show_dot_files = always_show_dot_files;
         thread_args[i].never_show_dot_files = never_show_dot_files;
+        thread_args[i].recurse = recurse;
 
 #ifdef HAVE_PTHREAD_H
         if (i == thread_count - 1) {

data/ruby/command-t/matcher.h

@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Greg Hurrell. All rights reserved.
+// Copyright 2010-present Greg Hurrell. All rights reserved.
 // Licensed under the terms of the BSD 2-clause license.
 
 #include <ruby.h>

data/ruby/command-t/metadata/fallback.rb

@@ -0,0 +1,12 @@
+# Copyright 2015-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  module Metadata
+    # This file gets overwritten with actual data during the installation
+    # process (when `ruby extconf.rb` is run).
+    EXPECTED_RUBY_VERSION = '[unknown]'
+    EXPECTED_RUBY_PATCHLEVEL = '[unknown]'
+    UNKNOWN = true
+  end # module Metadata
+end # module CommandT

data/ruby/command-t/mru.rb

@@ -1,4 +1,4 @@
-# Copyright 2014 Greg Hurrell. All rights reserved.
+# Copyright 2014-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT

data/ruby/command-t/path_utilities.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Copyright 2010-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT

data/ruby/command-t/prompt.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Copyright 2010-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT
@@ -6,10 +6,11 @@ module CommandT
   class Prompt
     attr_accessor :abbrev
 
-    def initialize
-      @abbrev     = ''  # abbreviation entered so far
-      @col        = 0   # cursor position
-      @has_focus  = false
+    def initialize(options = {})
+      @abbrev       = ''  # abbreviation entered so far
+      @col          = 0   # cursor position
+      @cursor_color = options[:cursor_color] || 'Underlined'
+      @has_focus    = false
     end
 
     # Erase whatever is displayed in the prompt line,
@@ -117,7 +118,7 @@ module CommandT
       if @has_focus
         prompt_highlight = 'Comment'
         normal_highlight = 'None'
-        cursor_highlight = 'Underlined'
+        cursor_highlight = @cursor_color
       else
         prompt_highlight = 'NonText'
         normal_highlight = 'NonText'

data/ruby/command-t/ruby_compat.h

@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Greg Hurrell. All rights reserved.
+// Copyright 2010-present Greg Hurrell. All rights reserved.
 // Licensed under the terms of the BSD 2-clause license.
 
 #include <ruby.h>

data/ruby/command-t/scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Copyright 2010-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT

data/ruby/command-t/scanner/buffer_scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Copyright 2010-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT

data/ruby/command-t/scanner/file_scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Copyright 2010-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT
@@ -9,9 +9,6 @@ module CommandT
     # obtain file listings via different strategies (for examples, see the
     # RubyFileScanner and FindFileScanner subclasses).
     class FileScanner < Scanner
-      # Errors
-      autoload :FileLimitExceeded,   'command-t/scanner/file_scanner/file_limit_exceeded'
-
       # Subclasses
       autoload :FindFileScanner,     'command-t/scanner/file_scanner/find_file_scanner'
       autoload :GitFileScanner,      'command-t/scanner/file_scanner/git_file_scanner'

data/ruby/command-t/scanner/file_scanner/find_file_scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2014 Greg Hurrell. All rights reserved.
+# Copyright 2014-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 require 'open3'

data/ruby/command-t/scanner/file_scanner/git_file_scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2014 Greg Hurrell. All rights reserved.
+# Copyright 2014-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT

data/ruby/command-t/scanner/file_scanner/ruby_file_scanner.rb

@@ -1,9 +1,11 @@
-# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Copyright 2010-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT
   class Scanner
     class FileScanner
+      FileLimitExceeded = Class.new(::RuntimeError)
+
       # Pure Ruby implementation of a file scanner.
       class RubyFileScanner < FileScanner
         def paths!

data/ruby/command-t/scanner/file_scanner/watchman_file_scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2014 Greg Hurrell. All rights reserved.
+# Copyright 2014-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 require 'pathname'

data/ruby/command-t/scanner/jump_scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Greg Hurrell. All rights reserved.
+# Copyright 2011-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT

data/ruby/command-t/scanner/mru_buffer_scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2014 Greg Hurrell. All rights reserved.
+# Copyright 2014-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT

data/ruby/command-t/scanner/tag_scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Greg Hurrell. All rights reserved.
+# Copyright 2011-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT

data/ruby/command-t/scm_utilities.rb

@@ -1,4 +1,4 @@
-# Copyright 2014 Greg Hurrell. All rights reserved.
+# Copyright 2014-present Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT