command-t 1.13 → 2.0

data/plugin/command-t.vim

@@ -1,23 +1,32 @@
-" 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.
 
-if exists('g:command_t_loaded') || &cp
+if exists('g:command_t_loaded') || &compatible
   finish
 endif
 let g:command_t_loaded = 1
 
-command! CommandTBuffer call commandt#CommandTShowBufferFinder()
-command! CommandTJump call commandt#CommandTShowJumpFinder()
-command! CommandTMRU call commandt#CommandTShowMRUFinder()
-command! CommandTTag call commandt#CommandTShowTagFinder()
-command! -nargs=? -complete=dir CommandT call commandt#CommandTShowFileFinder(<q-args>)
-command! CommandTFlush call commandt#CommandTFlush()
-command! CommandTLoad call commandt#CommandTLoad()
+command! CommandTBuffer call commandt#BufferFinder()
+command! CommandTJump call commandt#JumpFinder()
+command! CommandTMRU call commandt#MRUFinder()
+command! CommandTTag call commandt#TagFinder()
+command! -nargs=? -complete=dir CommandT call commandt#FileFinder(<q-args>)
+command! CommandTFlush call commandt#Flush()
+command! CommandTLoad call commandt#Load()
 
-if !hasmapto(':CommandT<CR>') && maparg('<Leader>t', 'n') ==# ''
-  silent! nnoremap <unique> <silent> <Leader>t :CommandT<CR>
+if !hasmapto('<Plug>(CommandT)') && maparg('<Leader>t', 'n') ==# ''
+  nmap <unique> <Leader>t <Plug>(CommandT)
 endif
+nnoremap <silent> <Plug>(CommandT) :CommandT<CR>
 
-if !hasmapto(':CommandTBuffer<CR>') && maparg('<Leader>b', 'n') ==# ''
-  silent! nnoremap <unique> <silent> <Leader>b :CommandTBuffer<CR>
+if !hasmapto('<Plug>(CommandTBuffer)') && maparg('<Leader>b', 'n') ==# ''
+  nmap <unique> <Leader>b <Plug>(CommandTBuffer)
+endif
+nnoremap <silent> <Plug>(CommandTBuffer) :CommandTBuffer<CR>
+
+if has('jumplist')
+  if !hasmapto('<Plug>(CommandTJump)') && maparg('<Leader>j', 'n') ==# ''
+    nmap <unique> <Leader>j <Plug>(CommandTJump)
+  endif
+  nnoremap <silent> <Plug>(CommandTJump) :CommandTJump<CR>
 endif

data/ruby/command-t.rb

@@ -1,10 +1,15 @@
-# Copyright 2014-2015 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
+  begin
+    require 'command-t/metadata'
+  rescue LoadError
+    require 'command-t/metadata/fallback'
+  end
+
   autoload :Controller,    'command-t/controller'
   autoload :Finder,        'command-t/finder'
-  autoload :Metadata,      'command-t/metadata'
   autoload :MRU,           'command-t/mru'
   autoload :MatchWindow,   'command-t/match_window'
   autoload :PathUtilities, 'command-t/path_utilities'

data/ruby/command-t/Makefile

@@ -11,12 +11,12 @@ ECHO = $(ECHO1:0=@echo)
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /Users/glh/.rbenv/versions/2.0.0-p481/include/ruby-2.0.0
+topdir = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0
 hdrdir = $(topdir)
-arch_hdrdir = /Users/glh/.rbenv/versions/2.0.0-p481/include/ruby-2.0.0/x86_64-darwin14.0.0
+arch_hdrdir = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/universal-darwin15
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = /Users/glh/.rbenv/versions/2.0.0-p481
+prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
@@ -32,7 +32,7 @@ vendorlibdir = $(vendordir)/$(ruby_version)
 vendordir = $(rubylibprefix)/vendor_ruby
 sitearchdir = $(sitelibdir)/$(sitearch)
 sitelibdir = $(sitedir)/$(ruby_version)
-sitedir = $(rubylibprefix)/site_ruby
+sitedir = $(DESTDIR)/Library/Ruby/Site
 rubyarchdir = $(rubylibdir)/$(arch)
 rubylibdir = $(rubylibprefix)/$(ruby_version)
 sitearchincludedir = $(includedir)/$(sitearch)
@@ -40,20 +40,20 @@ archincludedir = $(includedir)/$(arch)
 sitearchlibdir = $(libdir)/$(sitearch)
 archlibdir = $(libdir)/$(arch)
 ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(datarootdir)/man
+mandir = $(DESTDIR)/usr/share/man
 localedir = $(datarootdir)/locale
 libdir = $(exec_prefix)/lib
 psdir = $(docdir)
 pdfdir = $(docdir)
 dvidir = $(docdir)
 htmldir = $(docdir)
-infodir = $(datarootdir)/info
+infodir = $(DESTDIR)/usr/share/info
 docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = /usr/include
-includedir = $(prefix)/include
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(DESTDIR)/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk$(prefix)/include
 localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
-sysconfdir = $(prefix)/etc
+sysconfdir = $(DESTDIR)/Library/Ruby/Site
 datadir = $(datarootdir)
 datarootdir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec
@@ -62,11 +62,11 @@ bindir = $(exec_prefix)/bin
 archdir = $(rubyarchdir)
 
 
-CC = clang
-CXX = clang++
-LIBRUBY = $(LIBRUBY_A)
+CC = xcrun clang
+CXX = xcrun clang++
+LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = 
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 empty =
 OUTFLAG = -o $(empty)
@@ -74,18 +74,18 @@ COUTFLAG = -o $(empty)
 
 RUBY_EXTCONF_H = 
 cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = -O3 -fno-fast-math
-debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
-CCDLFLAGS = -fno-common
-CFLAGS   = $(CCDLFLAGS)  -O3 -Wno-error=shorten-64-to-32  -pipe $(ARCH_FLAG)
+optflags = 
+debugflags = -g
+warnflags = 
+CCDLFLAGS = 
+CFLAGS   = $(CCDLFLAGS)  -g -Os -pipe -DHAVE_GCC_SYNC_BUILTINS $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     =  -DWATCHMAN_BUILD
-CPPFLAGS = -DHAVE_FCNTL_H -DHAVE_STDINT_H -DHAVE_SYS_ERRNO_H -DHAVE_SYS_SOCKET_H -DHAVE_RUBY_ST_H -DHAVE_ST_H -I/Users/glh/.rbenv/versions/2.0.0-p481/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG)
-ldflags  = -L. -L/Users/glh/.rbenv/versions/2.0.0-p481/lib 
+CPPFLAGS = -DHAVE_FCNTL_H -DHAVE_STDINT_H -DHAVE_SYS_ERRNO_H -DHAVE_SYS_SOCKET_H -DHAVE_RUBY_ST_H -DHAVE_ST_H -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
+CXXFLAGS = $(CCDLFLAGS) $(ARCH_FLAG) -g -Os -pipe  $(ARCH_FLAG)
+ldflags  = -L. -L/usr/local/lib
 dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress 
-ARCH_FLAG = 
+ARCH_FLAG =  -arch i386 -arch x86_64
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = $(CC) -dynamic -bundle
 LDSHAREDXX = $(CXX) -dynamic -bundle
@@ -93,13 +93,13 @@ AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
+RUBY_SO_NAME = ruby.2.0.0
 RUBYW_INSTALL_NAME = 
 RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
 RUBYW_BASE_NAME = rubyw
 RUBY_BASE_NAME = ruby
 
-arch = x86_64-darwin14.0.0
+arch = universal-darwin15
 sitearch = $(arch)
 ruby_version = 2.0.0
 ruby = $(bindir)/ruby
@@ -132,7 +132,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS =  -lpthread  -lpthread -ldl -lobjc 
+LIBS = $(LIBRUBYARG_SHARED) -lpthread  -lpthread -ldl -lobjc 
 ORIG_SRCS = ext.c match.c matcher.c watchman.c
 SRCS = $(ORIG_SRCS) 
 OBJS = ext.o match.o matcher.o watchman.o
@@ -144,12 +144,12 @@ DLLIB = $(TARGET).bundle
 EXTSTATIC = 
 STATIC_LIB = 
 
-BINDIR        = $(DESTDIR)$(bindir)
-RUBYCOMMONDIR = $(DESTDIR)$(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(DESTDIR)$(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(DESTDIR)$(sitearchdir)$(target_prefix)
-HDRDIR        = $(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
 CLEANLIBS     = $(TARGET).bundle 
@@ -236,7 +236,7 @@ $(DLLIB): $(OBJS) Makefile
 
 
 ###
-# 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.
 
 CFLAGS += -Wall -Wextra -Wno-unused-parameter

data/ruby/command-t/controller.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.
 
 module CommandT
@@ -25,8 +25,6 @@ module CommandT
     end
 
     def initialize
-      @prompt = Prompt.new
-
       encoding = VIM::get_string('g:CommandTEncoding')
       if encoding
         begin
@@ -151,17 +149,18 @@ module CommandT
     guard :refresh
 
     def flush
+      @file_finder  = nil
       @max_height   = nil
       @min_height   = nil
-      @file_finder  = nil
+      @prompt       = nil
       @tag_finder   = nil
     end
     guard :flush
 
     def handle_key
       key = ::VIM::evaluate('a:arg').to_i.chr
-      if @focus == @prompt
-        @prompt.add! key
+      if @focus == prompt
+        prompt.add! key
         @needs_update = true
       else
         @match_window.find key
@@ -170,16 +169,16 @@ module CommandT
     guard :handle_key
 
     def backspace
-      if @focus == @prompt
-        @prompt.backspace!
+      if @focus == prompt
+        prompt.backspace!
         @needs_update = true
       end
     end
     guard :backspace
 
     def delete
-      if @focus == @prompt
-        @prompt.delete!
+      if @focus == prompt
+        prompt.delete!
         @needs_update = true
       end
     end
@@ -194,7 +193,7 @@ module CommandT
 
     def toggle_focus
       @focus.unfocus # old focus
-      @focus = @focus == @prompt ? @match_window : @prompt
+      @focus = @focus == prompt ? @match_window : prompt
       @focus.focus # new focus
     end
     guard :toggle_focus
@@ -215,34 +214,34 @@ module CommandT
     guard :select_prev
 
     def clear
-      @prompt.clear!
+      prompt.clear!
       list_matches!
     end
     guard :clear
 
     def clear_prev_word
-      @prompt.clear_prev_word!
+      prompt.clear_prev_word!
       list_matches!
     end
     guard :clear_prev_word
 
     def cursor_left
-      @prompt.cursor_left if @focus == @prompt
+      prompt.cursor_left if @focus == prompt
     end
     guard :cursor_left
 
     def cursor_right
-      @prompt.cursor_right if @focus == @prompt
+      prompt.cursor_right if @focus == prompt
     end
     guard :cursor_right
 
     def cursor_end
-      @prompt.cursor_end if @focus == @prompt
+      prompt.cursor_end if @focus == prompt
     end
     guard :cursor_end
 
     def cursor_start
-      @prompt.cursor_start if @focus == @prompt
+      prompt.cursor_start if @focus == prompt
     end
     guard :cursor_start
 
@@ -258,10 +257,12 @@ module CommandT
       return unless @needs_update || options[:force]
 
       @matches = @active_finder.sorted_matches_for(
-        @prompt.abbrev,
+        prompt.abbrev,
         :case_sensitive => case_sensitive?,
         :limit          => match_limit,
-        :threads        => CommandT::Util.processor_count
+        :threads        => CommandT::Util.processor_count,
+        :ignore_spaces  => VIM::get_bool('g:CommandTIgnoreSpaces'),
+        :recurse        => VIM::get_bool('g:CommandTRecursiveMatch', true),
       )
       @match_window.matches = @matches
 
@@ -283,6 +284,12 @@ module CommandT
 
   private
 
+    def prompt
+      @prompt ||= Prompt.new(
+        :cursor_color => VIM::get_string('g:CommandTCursorColor')
+      )
+    end
+
     def scm_markers
       markers = VIM::get_string('g:CommandTSCMDirectories')
       markers = markers && markers.split(/\s*,\s*/)
@@ -303,9 +310,10 @@ module CommandT
         :match_window_reverse => VIM::get_bool('g:CommandTMatchWindowReverse'),
         :min_height           => min_height,
         :debounce_interval    => VIM::get_number('g:CommandTInputDebounce') || 50,
-        :prompt               => @prompt
-      @focus            = @prompt
-      @prompt.focus
+        :prompt               => prompt,
+        :name                 => "Command-T [#{@active_finder.name}]"
+      @focus            = prompt
+      prompt.focus
       register_for_key_presses
       set_up_autocmds
       clear # clears prompt and lists matches
@@ -324,7 +332,7 @@ module CommandT
     end
 
     def case_sensitive?
-      if @prompt.abbrev.match(/[A-Z]/)
+      if prompt.abbrev.match(/[A-Z]/)
         if VIM::exists?('g:CommandTSmartCase')
           smart_case = VIM::get_bool('g:CommandTSmartCase')
         else
@@ -402,7 +410,7 @@ module CommandT
 
     def map(key, function, param = nil)
       ::VIM::command "noremap <silent> <buffer> #{key} " \
-        ":call CommandT#{function}(#{param})<CR>"
+        ":call commandt#private##{function}(#{param})<CR>"
     end
 
     def term
@@ -457,7 +465,7 @@ module CommandT
     def set_up_autocmds
       ::VIM::command 'augroup CommandTController'
       ::VIM::command 'autocmd!'
-      ::VIM::command 'autocmd CursorHold <buffer> :call CommandTListMatches()'
+      ::VIM::command 'autocmd CursorHold <buffer> :call commandt#private#ListMatches()'
       ::VIM::command 'augroup END'
     end
 

data/ruby/command-t/depend

@@ -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.
 
 CFLAGS += -Wall -Wextra -Wno-unused-parameter

data/ruby/command-t/ext.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 "matcher.h"

data/ruby/command-t/ext.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/extconf.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 'pathname'

data/ruby/command-t/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.
 
 require 'command-t/ext' # CommandT::Matcher, CommandT::Watchman::Utils
@@ -23,6 +23,12 @@ module CommandT
       raise RuntimeError, 'Subclass responsibility'
     end
 
+    # Returns a human-readable name describing the finder, for display in the
+    # statusline attached to the MatchWindow buffer.
+    def name
+      raise RuntimeError, 'Subclass responsibility'
+    end
+
     # Options:
     #   :limit (integer): limit the number of returned matches
     def sorted_matches_for(str, options = {})

data/ruby/command-t/finder/buffer_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
@@ -8,6 +8,10 @@ module CommandT
         @scanner = Scanner::BufferScanner.new
         @matcher = Matcher.new @scanner, :always_show_dot_files => true
       end
+
+      def name
+        'Buffers'
+      end
     end # class BufferFinder
   end # class Finder
 end # CommandT