ver 2009.11.29 → 2009.12.14

data/lib/ver/hover_completion.rb

@@ -65,7 +65,7 @@ module VER
 
     def update
       self.from, self.to, self.choices = completer.call
-      # @longest_choice = choices.map{|choice| choice.size }.max
+      @longest_choice = choices.map{|choice| choice.size }.max
 
       if choices && choices.size > 0
         list.value = choices
@@ -91,10 +91,9 @@ module VER
       x, y, caret_height =
         parent.tk_caret.values_at(:x, :y, :height)
 
-      height, width= parent.winfo_height, parent.winfo_width
+      height, width = parent.winfo_height, parent.winfo_width
       height -= parent.status.winfo_height
 
-
       # use side with most space, east or west
       if x > (width / 2)
         side = 'e'
@@ -115,10 +114,18 @@ module VER
         height -= (height - y)
       end
 
-      list.configure height: -1 # fit as many into the list as possible
-
-      # let's place it so we can see how big it is.
-      list.place x: x, y: y, height: height, in: parent, anchor: "#{hemisphere}#{side}"
+      list.configure width: @longest_choice + 2, height: -1
+      height = [height, list.winfo_reqheight].min
+      width = [width, list.winfo_reqwidth].min
+
+      list.place(
+        x: x,
+        y: y,
+        height: height,
+        width: width,
+        in: parent,
+        anchor: "#{hemisphere}#{side}"
+      )
     end
 
     def cancel

data/lib/ver/keymap.rb

@@ -20,7 +20,8 @@ module VER
       end
     end
 
-    attr_accessor :modes, :callback, :widget, :tag, :previous_mode
+    attr_accessor :modes, :callback, :widget, :tag, :previous_mode, :last_send,
+                  :ignore_sends, :accumulate_sends, :history, :arguments
     attr_reader :mode
 
     def initialize(options)
@@ -28,6 +29,11 @@ module VER
       self.widget = options.fetch(:widget, callback)
       self.previous_mode = nil
       self.modes = {}
+      self.history = SizedArray.new(50)
+      self.last_send = nil
+      self.ignore_sends ||= []
+      self.accumulate_sends ||= []
+      self.arguments = true
 
       prepare_tag
       prepare_default_binds
@@ -39,13 +45,32 @@ module VER
 
     def send(*args)
       callback.send(*args)
+    ensure
+      name = args.first
+
+      if accumulate_sends.include?(name)
+        if last_send && last_send.first == name
+          arg = (last_send[1..-1] + args[1..-1]).join
+          self.last_send = [name, arg]
+        else
+          self.last_send = args
+        end
+      else
+        if ignore_sends.include?(name)
+          # self.last_send = nil
+        else
+          self.last_send = args
+        end
+      end
     end
 
     def enter_key(key)
+      @history << key
       modes[mode].enter_key key
     end
 
     def enter_missing(key)
+      @history << key
       modes[mode].enter_missing key
     end
 
@@ -112,6 +137,10 @@ module VER
       mode
     end
 
+    def in_mode(name, &block)
+      add_mode(name){|mode| mode.instance_eval(&block) }
+    end
+
     def use_previous_mode
       return unless mode = previous_mode
       self.mode = previous_mode

data/lib/ver/layout.rb

@@ -1,13 +1,17 @@
 module VER
   class Layout < Tk::Tile::Frame
-    attr_reader :strategy, :views, :options
+    attr_reader :strategy, :views, :stack, :options
 
     def initialize(parent, options = {})
       super
 
       pack(fill: :both, expand: true)
 
-      @views = []
+      # These two have to be kept in sync
+      # @views contains the views in the order they were opened
+      # @stack contains the views in the order they are displayed
+      @views, @stack = [], []
+
       @options = {}
       self.strategy = Layout::VerticalTiling
     end
@@ -20,14 +24,16 @@ module VER
     def create_view
       view = View.new(self)
       yield view
-      @views.unshift view
+      @views.push(view)
+      @stack.unshift(view)
 
       apply
       view.focus
     end
 
     def close_view(view)
-      @views.delete view
+      @views.delete(view)
+      @stack.delete(view)
       view.destroy
 
       if previous = @views.first
@@ -62,10 +68,10 @@ module VER
     # |     |  3  | > |     |  2  | > |     |  2  | > |     |  2  |
     # +-----+-----+ > +-----+-----+ > +-----+-----+ > +-----+-----+
     def push_up(current)
-      return unless index = @views.index(current)
-      previous = @views[index - 1]
+      return unless index = @stack.index(current)
+      previous = @stack[index - 1]
       current.raise(previous)
-      @views[index - 1], @views[index] = current, previous
+      @stack[index - 1], @stack[index] = current, previous
 
       apply
     end
@@ -77,21 +83,21 @@ module VER
     # |     |  3  | > |     |  2  | > |     |  2  | > |     |  3  |
     # +-----+-----+ > +-----+-----+ > +-----+-----+ > +-----+-----+
     def push_down(current)
-      return unless index = @views.index(current)
-      following = @views[index + 1] || @views[0]
+      return unless index = @stack.index(current)
+      following = @stack[index + 1] || @stack[0]
       current.raise(following)
-      @views[@views.index(following)], @views[index] = current, following
+      @stack[@stack.index(following)], @stack[index] = current, following
 
       apply
     end
 
     def push_top(current)
-      @views.unshift(@views.delete(current))
+      @stack.unshift(@stack.delete(current))
       apply
     end
 
     def push_bottom(view)
-      @views.push(@views.delete(view))
+      @stack.push(@stack.delete(view))
       apply
     end
 
@@ -109,7 +115,7 @@ module VER
       DEFAULT = { master: 1, stacking: 3 }
 
       def prepare(layout, options)
-        slaves = layout.views
+        slaves = layout.stack
         master, stacking = DEFAULT.merge(options).values_at(:master, :stacking)
         options.merge! master: master, stacking: stacking
         head, tail, hidden = slaves[0...master], slaves[master..stacking], slaves[stacking..-1]
@@ -168,4 +174,4 @@ module VER
       end
     end
   end
-end
+end

data/lib/ver/methods.rb

@@ -1,5 +1,6 @@
-require 'ver/methods/completion'
+require 'ver/methods/bookmark'
 require 'ver/methods/clipboard'
+require 'ver/methods/completion'
 require 'ver/methods/control'
 require 'ver/methods/ctags'
 require 'ver/methods/delete'
@@ -11,25 +12,15 @@ require 'ver/methods/preview'
 require 'ver/methods/save'
 require 'ver/methods/search'
 require 'ver/methods/select'
+require 'ver/methods/undo'
 require 'ver/methods/views'
 require 'ver/methods/shortcuts'
 
 module VER
   module Methods
-    include Completion
-    include Control
-    include Ctags
-    include Delete
-    include Help
-    include Insert
-    include Move
-    include Open
-    include Preview
-    include Save
-    include Search
-    include Select
+    include(Completion, Control, Ctags, Delete, Help, Insert, Move, Open,
+            Preview, Save, Search, Select, Clipboard, Bookmarks::Methods,
+            Views, Undo)
     include Shortcuts
-    include Clipboard
-    include Views
   end
 end

data/lib/ver/methods/bookmark.rb

@@ -0,0 +1,189 @@
+module VER
+  class Bookmarks
+    include Enumerable
+
+    def initialize
+      @bm = []
+      @idx = nil
+    end
+
+    def each(&block)
+      @bm.each(&block)
+    end
+
+    def add_named(name, value)
+      if value.is_a?(Bookmark)
+        bm = value.dup
+      else
+        bm = Bookmark.new(name, *value.to_a)
+      end
+
+      @bm << bm
+      @bm.uniq!
+      @bm.sort!
+      bm
+    end
+    alias []= add_named
+
+    def add_unnamed(value)
+      if value.is_a?(Bookmark)
+        bm = value
+      else
+        bm = Bookmark.new(nil, *value.to_a)
+      end
+
+      @bm << bm
+      @bm.uniq!
+      @bm.sort!
+      bm
+    end
+
+    def <<(value)
+      add_unnamed(value)
+      self
+    end
+
+    def [](name)
+      @bm.find{|bm| bm.name == name }
+    end
+
+    def key?(name)
+      @bm.any?{|bm| bm.name == name }
+    end
+
+    def delete(name)
+      if found = @bm.find{|bm| bm.name == name }
+        @bm.delete(found)
+      end
+    end
+
+    def next_from(pos)
+      needle = Bookmark.new(nil, *pos)
+      @bm.find{|bm| bm > needle }
+    end
+
+    def prev_from(pos)
+      needle = Bookmark.new(nil, *pos)
+      @bm.reverse.find{|bm| needle > bm }
+    end
+
+    def at(pos)
+      needle = Bookmark.new(nil, *pos)
+      @bm.find{|bm| needle == bm }
+    end
+
+    class Bookmark < Struct.new(:name, :file, :index)
+      include Comparable
+
+      def <=>(other)
+        [file, index] <=> [other.file, other.index]
+      end
+
+      def to_a
+        [name, file, index.y, index.x]
+      end
+    end
+
+    module Methods
+      def char_bookmark_visit(name = nil)
+        if name
+          named_bookmark_visit(name)
+        else
+          status_ask 'Bookmark name: ', take: 1 do |bm_name|
+            named_bookmark_visit(bm_name)
+          end
+        end
+      end
+
+      def char_bookmark_add(name = nil)
+        if name
+          named_bookmark_add(name)
+        else
+          status_ask 'Bookmark name: ', take: 1 do |bm_name|
+            named_bookmark_add(bm_name)
+          end
+        end
+      end
+
+      def named_bookmark_add(name = nil)
+        if name
+          bm = bookmarks.add_named(name, bookmark_value)
+          message("Added bookmark [%s|%s:%d,%d]." % bm.to_a)
+        else
+          status_ask 'Bookmark name: ' do |bm_name|
+            named_bookmark_add(bm_name)
+          end
+        end
+      end
+
+      def named_bookmark_remove(name = nil)
+        if name
+          if bm = bookmarks.delete(name)
+            message("Removed bookmark [%s|%s:%d,%d]." % bm.to_a)
+          else
+            message("No Bookmark named %p." % [name])
+          end
+        else
+          status_ask 'Bookmark name: ' do |bm_name|
+            named_bookmark_remove(bm_name)
+          end
+        end
+      end
+
+      def named_bookmark_visit(name = nil)
+        if name
+          if bm = bookmarks[name]
+            bookmark_open(bm)
+          else
+            message("No Bookmark named %p." % [name])
+          end
+        else
+          status_ask 'Bookmark name: ' do |bm_name|
+            named_bookmark_visit(bm_name)
+          end
+        end
+      end
+
+      def bookmark_toggle
+        pos = bookmark_value
+
+        if bm = bookmarks.at(pos)
+          bookmarks.delete(bm)
+          message("Removed bookmark [%s|%s:%d,%d]." % bm.to_a)
+        else
+          bm = bookmarks.add_unnamed(bookmark_value)
+          message("Added bookmark [%s|%s:%d,%d]." % bm.to_a)
+        end
+      rescue => ex
+        VER.error(ex)
+      end
+
+      def next_bookmark
+        bookmark_open(bookmarks.next_from(bookmark_value))
+      end
+
+      def prev_bookmark
+        bookmark_open(bookmarks.prev_from(bookmark_value))
+      end
+
+      private
+
+      def bookmarks
+        VER.bookmarks
+      end
+
+      def bookmark_value
+        [filename, index(:insert)]
+      end
+
+      def bookmark_open(bookmark, use_x = true)
+        return unless bookmark.respond_to?(:file) && bookmark.respond_to?(:index)
+
+        view.find_or_create(bookmark.file) do |view|
+          y, x = use_x ? bookmark.index.split : [bookmark.index.y, 0]
+          view.text.mark_set(:insert, "#{y}.#{x}")
+        end
+      end
+    end
+  end
+end

data/lib/ver/methods/completion.rb

@@ -13,7 +13,7 @@ module VER
             complete_word
           end
         else
-          indent = ' ' * VER.options.shiftwidth
+          indent = ' ' * options.shiftwidth
           insert :insert, indent
         end
       end
@@ -183,7 +183,7 @@ module VER
       end
 
       def complete(options = {}, &block)
-        edit_separator
+        undo_separator
         HoverCompletion.new(self, options, &block)
       end
     end

data/lib/ver/methods/control.rb

@@ -1,6 +1,84 @@
 module VER
   module Methods
     module Control
+      def repeat_command(count = 1)
+        return unless command = keymap.last_send
+        return if command.first == __method__
+        count.times{ send(*command) }
+        keymap.last_send = command
+      end
+
+      # Assigns env variables used in the given command.
+      # - $f: The current buffer's filename
+      # - $d: The current buffer's directory
+      # - $F: A space-separated list of all buffer filenames
+      # - $i: A string acquired from the user with a prompt
+      # - $c: The current clipboard text
+      # - $s: The currently selected text
+      #
+      # @param [String] command
+      #   The string containing the command executed
+      def prepare_exec(command)
+        prepare_exec_f if command =~ /\$f/
+        prepare_exec_d if command =~ /\$d/
+        prepare_exec_F if command =~ /\$F/
+        prepare_exec_i if command =~ /\$i/
+        prepare_exec_c if command =~ /\$c/
+        prepare_exec_s if command =~ /\$s/
+      end
+
+      def prepare_exec_f
+        p f: (ENV['f'] = filename.to_s)
+      end
+
+      def prepare_exec_d
+        p d: (ENV['d'] = filename.directory.to_s)
+      end
+
+      def prepare_exec_F
+        p F: (ENV['F'] = layout.views.map{|v| v.text.filename }.join(' '))
+      end
+
+      def prepare_exec_i
+        raise NotImplementedError
+      end
+
+      def prepare_exec_c
+        p c: (ENV['c'] = clipboard_get)
+      end
+
+      def prepare_exec_s
+        content = []
+
+        each_selected_line do |y, fx, tx|
+          content << get("#{y}.#{fx}", "#{y}.#{tx}")
+        end
+
+        ENV['s'] = content.join("\n")
+      end
+
+      def exec_into_new(command = nil)
+        if command
+          target = options.home_conf_dir/'shell-result.txt'
+          prepare_exec(command)
+          p command
+          system(command)
+          target.open('w+'){|io| io.write(`#{command}`) }
+          view.find_or_create(target)
+        else
+          status_ask 'Command: ' do |command|
+            exec_into_new(command)
+          end
+        end
+      end
+
+      def exec_into_void
+        status_ask 'Command: ' do |command|
+          system(command)
+          message("Exit code: #{$?}")
+        end
+      end
+
       def tags_at(index = :insert)
         index = index(index)
         tags = tag_names(index)
@@ -47,6 +125,20 @@ module VER
         end
       end
 
+      def grep_buffer
+        View::List::Grep.new self, filename do |file, line|
+          view.find_or_create(file, line)
+        end
+      end
+
+      def grep_buffers
+        glob = '{' << layout.views.map{|v| v.text.filename }.join(',') << '}'
+
+        View::List::Grep.new self, glob do |file, line|
+          view.find_or_create(file, line)
+        end
+      end
+
       def open_method_list
         View::List::Methods.new self do |file, line|
           view.find_or_create(file, line)
@@ -224,28 +316,33 @@ module VER
         end
       end
 
-      def indent_line
-        insert('insert linestart', '  ')
+      def indent_line(count = 1)
+        indent = (' ' * options[:shiftwidth] * count)
+        insert('insert linestart', indent)
       end
 
-      def unindent_line
-       line = get('insert linestart', 'insert lineend')
+      def unindent_line(count = 1)
+        indent = ' ' * options[:shiftwidth]
+        replace_from = 'insert linestart'
+        replace_to = "insert linestart + #{indent.size} chars"
 
-       return unless line =~ /^(\s\s?)/
+        undo_record do |record|
+          count.times do
+            line = get('insert linestart', 'insert lineend')
 
-       replace(
-         'insert linestart',
-         "insert linestart + #{$1.size} chars",
-         ''
-       )
+            return unless line.start_with?(indent)
+
+            record.replace(replace_from, replace_to, '')
+          end
+        end
       end
 
-      def clean_line(index)
+      def clean_line(index, record = self)
         index = index(index)
         from, to = index.linestart, index.lineend
         line = get(from, to)
         bare = line.rstrip
-        replace(from, to, bare) if bare.empty?
+        record.replace(from, to, bare) if bare.empty?
       end
 
       def start_insert_mode
@@ -257,20 +354,6 @@ module VER
         self.mode = :control
       end
 
-      def undo
-        edit_undo
-        touch!
-      rescue RuntimeError => ex
-        status.value = ex.message
-      end
-
-      def redo
-        edit_redo
-        touch!
-      rescue RuntimeError => ex
-        status.value = ex.message
-      end
-
       private
 
       def wrap_lines_of(text, wrap = 80)