command-t 3.0.2 → 4.0

data/ruby/command-t.rb

@@ -8,16 +8,17 @@ module CommandT
     require 'command-t/metadata/fallback'
   end
 
-  autoload :Controller,    'command-t/controller'
-  autoload :Finder,        'command-t/finder'
-  autoload :MRU,           'command-t/mru'
-  autoload :MatchWindow,   'command-t/match_window'
+  autoload :Controller, 'command-t/controller'
+  autoload :Finder, 'command-t/finder'
+  autoload :MRU, 'command-t/mru'
+  autoload :MatchWindow, 'command-t/match_window'
   autoload :PathUtilities, 'command-t/path_utilities'
-  autoload :Prompt,        'command-t/prompt'
-  autoload :SCMUtilities,  'command-t/scm_utilities'
-  autoload :Scanner,       'command-t/scanner'
-  autoload :Settings,      'command-t/settings'
-  autoload :Stub,          'command-t/stub'
-  autoload :Util,          'command-t/util'
-  autoload :VIM,           'command-t/vim'
-end # module CommandT
+  autoload :ProgressReporter, 'command-t/progress_reporter'
+  autoload :Prompt, 'command-t/prompt'
+  autoload :SCMUtilities, 'command-t/scm_utilities'
+  autoload :Scanner, 'command-t/scanner'
+  autoload :Settings, 'command-t/settings'
+  autoload :Stub, 'command-t/stub'
+  autoload :Util, 'command-t/util'
+  autoload :VIM, 'command-t/vim'
+end

data/ruby/command-t/controller.rb

@@ -67,6 +67,27 @@ module CommandT
     end
     guard :show_buffer_finder
 
+    def show_command_finder
+      @path          = VIM::pwd
+      @active_finder = command_finder
+      show
+    end
+    guard :show_command_finder
+
+    def show_help_finder
+      @path          = VIM::pwd
+      @active_finder = help_finder
+      show
+    end
+    guard :show_help_finder
+
+    def show_history_finder
+      @path          = VIM::pwd
+      @active_finder = history_finder
+      show
+    end
+    guard :show_history_finder
+
     def show_jump_finder
       @path          = VIM::pwd
       @active_finder = jump_finder
@@ -74,6 +95,13 @@ module CommandT
     end
     guard :show_jump_finder
 
+    def show_line_finder
+      @path          = VIM::pwd
+      @active_finder = line_finder
+      show
+    end
+    guard :show_line_finder
+
     def show_mru_finder
       @path          = VIM::pwd
       @active_finder = mru_finder
@@ -81,6 +109,13 @@ module CommandT
     end
     guard :show_mru_finder
 
+    def show_search_finder
+      @path          = VIM::pwd
+      @active_finder = search_finder
+      show
+    end
+    guard :show_search_finder
+
     def show_tag_finder
       @path          = VIM::pwd
       @active_finder = tag_finder
@@ -161,7 +196,7 @@ module CommandT
       key = ::VIM::evaluate('a:arg').to_i.chr
       if @focus == prompt
         prompt.add! key
-        @needs_update = true
+        update
       else
         @match_window.find key
       end
@@ -171,7 +206,7 @@ module CommandT
     def backspace
       if @focus == prompt
         prompt.backspace!
-        @needs_update = true
+        update
       end
     end
     guard :backspace
@@ -179,7 +214,7 @@ module CommandT
     def delete
       if @focus == prompt
         prompt.delete!
-        @needs_update = true
+        update
       end
     end
     guard :delete
@@ -266,6 +301,9 @@ module CommandT
       )
       @match_window.matches = @matches
 
+      # Scanner may have overwritten prompt to show progress.
+      prompt.redraw
+
       @needs_update = false
     end
     guard :list_matches
@@ -284,6 +322,14 @@ module CommandT
 
   private
 
+    def update
+      if @debounce_interval > 0
+        @needs_update = true
+      else
+        list_matches!
+      end
+    end
+
     def prompt
       @prompt ||= Prompt.new(
         :cursor_color => VIM::get_string('g:CommandTCursorColor')
@@ -302,14 +348,16 @@ module CommandT
     end
 
     def show
-      @initial_window   = $curwin
-      @initial_buffer   = $curbuf
-      @match_window     = MatchWindow.new \
+      @initial_window = $curwin
+      @initial_buffer = $curbuf
+      @debounce_interval = VIM::get_number('g:CommandTInputDebounce') || 0
+      @match_window = MatchWindow.new \
+        :encoding             => VIM::get_string('g:CommandTEncoding'),
         :highlight_color      => VIM::get_string('g:CommandTHighlightColor'),
         :match_window_at_top  => VIM::get_bool('g:CommandTMatchWindowAtTop'),
         :match_window_reverse => VIM::get_bool('g:CommandTMatchWindowReverse', true),
         :min_height           => min_height,
-        :debounce_interval    => VIM::get_number('g:CommandTInputDebounce') || 50,
+        :debounce_interval    => @debounce_interval,
         :prompt               => prompt,
         :name                 => "Command-T [#{@active_finder.name}]"
       @focus            = prompt
@@ -422,8 +470,9 @@ module CommandT
       numbers     = ('0'..'9').to_a.join
       lowercase   = ('a'..'z').to_a.join
       uppercase   = lowercase.upcase
-      punctuation = '<>`@#~!"$%&/()=+*-_.,;:?\\\'{}[] ' # and space
-      (numbers + lowercase + uppercase + punctuation).each_byte do |b|
+      punctuation = '<>`@#~!"$%^&/()=+*-_.,;:?\\|\'{}[]'
+      space       = ' '
+      (numbers + lowercase + uppercase + punctuation + space).each_byte do |b|
         map "<Char-#{b}>", 'HandleKey', b
       end
 
@@ -463,10 +512,12 @@ module CommandT
     end
 
     def set_up_autocmds
-      ::VIM::command 'augroup CommandTController'
-      ::VIM::command 'autocmd!'
-      ::VIM::command 'autocmd CursorHold <buffer> :call commandt#private#ListMatches()'
-      ::VIM::command 'augroup END'
+      if @debounce_interval > 0
+        ::VIM::command 'augroup CommandTController'
+        ::VIM::command 'autocmd!'
+        ::VIM::command 'autocmd CursorHold <buffer> :call commandt#private#ListMatches()'
+        ::VIM::command 'augroup END'
+      end
     end
 
     # Returns the desired maximum number of matches, based on available vertical
@@ -485,6 +536,10 @@ module CommandT
       @buffer_finder ||= CommandT::Finder::BufferFinder.new
     end
 
+    def command_finder
+      @command_finder ||= CommandT::Finder::CommandFinder.new
+    end
+
     def mru_finder
       @mru_finder ||= CommandT::Finder::MRUBufferFinder.new
     end
@@ -502,13 +557,29 @@ module CommandT
         :git_scan_submodules    => VIM::get_bool('g:CommandTGitScanSubmodules')
     end
 
+    def help_finder
+      @jump_finder ||= CommandT::Finder::HelpFinder.new
+    end
+
+    def history_finder
+      CommandT::Finder::HistoryFinder.new(:history_type => ':')
+    end
+
     def jump_finder
       @jump_finder ||= CommandT::Finder::JumpFinder.new
     end
 
+    def line_finder
+      CommandT::Finder::LineFinder.new
+    end
+
+    def search_finder
+      CommandT::Finder::HistoryFinder.new(:history_type => '/')
+    end
+
     def tag_finder
       @tag_finder ||= CommandT::Finder::TagFinder.new \
         :include_filenames => VIM::get_bool('g:CommandTTagIncludeFilenames')
     end
-  end # class Controller
-end # module CommandT
+  end
+end

data/ruby/command-t/depend

@@ -2,3 +2,7 @@
 # Licensed under the terms of the BSD 2-clause license.
 
 CFLAGS += -Wall -Wextra -Wno-unused-parameter
+
+ifdef DEBUG
+CFLAGS += -DDEBUG
+endif

data/ruby/command-t/ext.h

@@ -13,5 +13,12 @@ extern VALUE mCommandTWatchmanUtils; // module CommandT::Watchman::Utils
 // raised if it is not nil and not a hash.
 VALUE CommandT_option_from_hash(const char *option, VALUE hash);
 
-// Debugging macro.
-#define ruby_inspect(obj) rb_funcall(rb_mKernel, rb_intern("p"), 1, obj)
+// Debugging macros.
+#define L(...) { \
+    fprintf(stdout, __VA_ARGS__); \
+    fflush(stdout); \
+} while (0)
+#define RUBY_INSPECT(obj) do { \
+    rb_funcall(rb_mKernel, rb_intern("p"), 1, obj); \
+    fflush(stdout); \
+} while (0)

data/ruby/command-t/extconf.rb

@@ -60,7 +60,7 @@ basedir = Pathname.new(__FILE__).dirname
           defined?(RUBY_PATCHLEVEL) ? RUBY_PATCHLEVEL.inspect : nil.inspect
         }
         UNKNOWN = false
-      end # module Metadata
-    end # module CommandT
+      end
+    end
   END
 end

data/ruby/command-t/finder.rb

@@ -12,8 +12,12 @@ module CommandT
   # different kinds of search (files, buffers).
   class Finder
     autoload :BufferFinder,    'command-t/finder/buffer_finder'
+    autoload :CommandFinder,   'command-t/finder/command_finder'
     autoload :FileFinder,      'command-t/finder/file_finder'
+    autoload :HelpFinder,      'command-t/finder/help_finder'
+    autoload :HistoryFinder,   'command-t/finder/history_finder'
     autoload :JumpFinder,      'command-t/finder/jump_finder'
+    autoload :LineFinder,      'command-t/finder/line_finder'
     autoload :MRUBufferFinder, 'command-t/finder/mru_buffer_finder'
     autoload :TagFinder,       'command-t/finder/tag_finder'
 
@@ -42,5 +46,5 @@ module CommandT
     def path=(path)
       @scanner.path = path
     end
-  end # class Finder
-end # CommandT
+  end
+end

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

@@ -12,6 +12,6 @@ module CommandT
       def name
         'Buffers'
       end
-    end # class BufferFinder
-  end # class Finder
-end # CommandT
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# Copyright 2011-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  class Finder
+    class CommandFinder < Finder
+      def initialize(options = {})
+        @scanner = Scanner::CommandScanner.new
+        @matcher = Matcher.new @scanner, :always_show_dot_files => true
+      end
+
+      def open_selection(command, selection, options = {})
+        ::VIM::command "call feedkeys(':#{selection} ', 'nt')"
+      end
+
+      def flush; end
+
+      def name
+        'Commands'
+      end
+    end
+  end
+end

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

@@ -28,6 +28,6 @@ module CommandT
       def name
         'Files'
       end
-    end # class FileFinder
-  end # class Finder
-end # module CommandT
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# Copyright 2011-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  class Finder
+    class HelpFinder < Finder
+      def initialize(options = {})
+        @scanner = Scanner::HelpScanner.new
+        @matcher = Matcher.new @scanner, :always_show_dot_files => true
+      end
+
+      def open_selection(command, selection, options = {})
+        ::VIM::command "help #{selection}"
+      end
+
+      def flush
+        @scanner.flush
+      end
+
+      def name
+        'Help'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# Copyright 2011-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  class Finder
+    class HistoryFinder < Finder
+      def initialize(options = {})
+        @history_type = options[:history_type] # / or :
+        @scanner = Scanner::HistoryScanner.new("silent history #{@history_type}")
+        @matcher = Matcher.new @scanner, :always_show_dot_files => true
+      end
+
+      def open_selection(command, selection, options = {})
+        # Need to unescape to reverse the work done by `#sanitize_path_string`.
+        unescaped = selection.gsub(/\\(.)/, '\1')
+        escaped = VIM.escape_for_single_quotes unescaped
+        ::VIM::command "call feedkeys('#{@history_type}#{escaped} ', 'nt')"
+      end
+
+      def flush; end
+
+      def name
+        @history_type == ':' ? 'History' : 'Searches'
+      end
+    end
+  end
+end

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

@@ -12,6 +12,6 @@ module CommandT
       def name
         'Jumps'
       end
-    end # class JumpFinder
-  end # class Finder
-end # module CommandT
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# Copyright 2011-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  class Finder
+    class LineFinder < Finder
+      def initialize(options = {})
+        @scanner = Scanner::LineScanner.new
+        @matcher = Matcher.new @scanner, :always_show_dot_files => true
+      end
+
+      def open_selection(command, selection, options = {})
+        ::VIM::command "#{selection.sub(/.+:(\d+)$/, '\1')}"
+      end
+
+      def flush; end
+
+      def name
+        'Lines'
+      end
+    end
+  end
+end

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

@@ -27,6 +27,6 @@ module CommandT
       def name
         'Recent'
       end
-    end # class MRUBufferFinder
-  end # class Finder
-end # CommandT
+    end
+  end
+end

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

@@ -25,6 +25,6 @@ module CommandT
       def name
         'Tags'
       end
-    end # class TagFinder
-  end # class Finder
-end # module CommandT
+    end
+  end
+end

data/ruby/command-t/heap.c

@@ -0,0 +1,146 @@
+// Copyright 2016-present Greg Hurrell. All rights reserved.
+// Licensed under the terms of the BSD 2-clause license.
+
+#include <stdlib.h> /* for free(), malloc(), NULL */
+
+#include "heap.h"
+
+#define HEAP_PARENT(index) ((index - 1) / 2)
+#define HEAP_LEFT(index) (2 * index + 1)
+#define HEAP_RIGHT(index) (2 * index + 2)
+
+/**
+ * Returns a new heap, or NULL on failure.
+ */
+heap_t *heap_new(long capacity, heap_compare_entries comparator) {
+    heap_t *heap = malloc(sizeof(heap_t));
+    if (!heap) {
+        return NULL;
+    }
+    heap->capacity = capacity;
+    heap->comparator = comparator;
+    heap->count = 0;
+
+    heap->entries = malloc(capacity * sizeof(void *));
+    if (!heap->entries) {
+        free(heap);
+        return NULL;
+    }
+    return heap;
+}
+
+/**
+ * Frees a previously created heap.
+ */
+void heap_free(heap_t *heap) {
+    free(heap->entries);
+    free(heap);
+}
+
+/**
+ * @internal
+ *
+ * Compare values at indices `a_idx` and `b_idx` using the heap's comparator
+ * function.
+ */
+int heap_compare(heap_t *heap, long a_idx, long b_idx) {
+    const void *a = heap->entries[a_idx];
+    const void *b = heap->entries[b_idx];
+    return heap->comparator(a, b);
+}
+
+/**
+ * @internal
+ *
+ * Returns 1 if the heap property holds (ie. parent < child).
+ */
+int heap_property(heap_t *heap, long parent_idx, long child_idx) {
+    return heap_compare(heap, parent_idx, child_idx) > 0;
+}
+
+/**
+ * @internal
+ *
+ * Swaps the values at indexes `a` and `b` within `heap`.
+ */
+void heap_swap(heap_t *heap, long a, long b) {
+    void *tmp = heap->entries[a];
+    heap->entries[a] = heap->entries[b];
+    heap->entries[b] = tmp;
+}
+
+/**
+ * Inserts `value` into `heap`.
+ */
+void heap_insert(heap_t *heap, void *value) {
+    long idx, parent_idx;
+
+    // If at capacity, ignore.
+    if (heap->count == heap->capacity) {
+        return;
+    }
+
+    // Insert into first empty slot.
+    idx = heap->count;
+    heap->entries[idx] = value;
+    heap->count++;
+
+    // Bubble upwards until heap property is restored.
+    parent_idx = HEAP_PARENT(idx);
+    while (idx && !heap_property(heap, parent_idx, idx)) {
+        heap_swap(heap, idx, parent_idx);
+        idx = parent_idx;
+        parent_idx = HEAP_PARENT(idx);
+    }
+}
+
+/**
+ * @internal
+ *
+ * Restores the heap property starting at `idx`.
+ */
+void heap_heapify(heap_t *heap, long idx) {
+    long left_idx = HEAP_LEFT(idx);
+    long right_idx = HEAP_RIGHT(idx);
+    long smallest_idx =
+        right_idx < heap->count ?
+
+        // Right (and therefore left) child exists.
+        (heap_compare(heap, left_idx, right_idx) > 0 ? left_idx : right_idx) :
+
+        left_idx < heap->count ?
+
+        // Only left child exists.
+        left_idx :
+
+        // No children exist.
+        idx;
+
+    if (
+        smallest_idx != idx &&
+        !heap_property(heap, idx, smallest_idx)
+    ) {
+        // Swap with smallest_idx child.
+        heap_swap(heap, idx, smallest_idx);
+        heap_heapify(heap, smallest_idx);
+    }
+}
+
+/**
+ * Extracts the minimum value from `heap`.
+ */
+void *heap_extract(heap_t *heap) {
+    void *extracted = NULL;
+    if (heap->count) {
+        // Grab root value.
+        extracted = heap->entries[0];
+
+        // Move last item to root.
+        heap->entries[0] = heap->entries[heap->count - 1];
+        heap->count--;
+
+        // Restore heap property.
+        heap_heapify(heap, 0);
+    }
+    return extracted;
+}