ver 2009.11.29 → 2009.12.14

data/lib/ver/methods/open.rb

@@ -37,7 +37,8 @@ module VER
         self.filename = path
 
         begin
-          self.value = read_file(filename)
+          clear
+          insert 1.0, read_file(filename)
           message "Opened #{short_filename}"
         rescue Errno::ENOENT
           delete '1.0', :end
@@ -81,6 +82,8 @@ module VER
         mark_set :insert, "#{line.to_i}.0"
         @pristine = false
 
+        @undoer = VER::Undo::Tree.new(self)
+
         bind('<Map>') do
           defer do
             setup_highlight
@@ -152,9 +155,6 @@ module VER
           options[option] = value
           yield(value) if block_given?
         end
-
-        require 'pp'
-        pp options
       end
 
       def set_filetype(type)
@@ -167,42 +167,3 @@ module VER
     end
   end
 end
-
-=begin
-There are two forms of modelines.  The first form:
-	[text]{white}{vi:|vim:|ex:}[white]{options}
-
-[text]		any text or empty
-{white}		at least one blank character (<Space> or <Tab>)
-{vi:|vim:|ex:}	the string "vi:", "vim:" or "ex:"
-[white]		optional white space
-{options}	a list of option settings, separated with white space or ':',
-		where each part between ':' is the argument for a ":set"
-		command (can be empty)
-
-Example:
-   vi:noai:sw=3 ts=6 ~
-
-The second form (this is compatible with some versions of Vi):
-
-	[text]{white}{vi:|vim:|ex:}[white]se[t] {options}:[text]
-
-[text]		any text or empty
-{white}		at least one blank character (<Space> or <Tab>)
-{vi:|vim:|ex:}	the string "vi:", "vim:" or "ex:"
-[white]		optional white space
-se[t]		the string "set " or "se " (note the space)
-{options}	a list of options, separated with white space, which is the
-		argument for a ":set" command
-:		a colon
-[text]		any text or empty
-
-Example:
-   /* vim: set ai tw=75: */ ~
-
-The white space before {vi:|vim:|ex:} is required.  This minimizes the chance
-that a normal word like "lex:" is caught.  There is one exception: "vi:" and
-"vim:" can also be at the start of the line (for compatibility with version
-3.0).  Using "ex:" at the start of the line will be ignored (this could be
-short for "example:").
-=end

data/lib/ver/methods/search.rb

@@ -7,40 +7,65 @@ module VER
       }
 
       def status_search_next
-        status_search_common('/') do
-          search_next
-        end
+        status_search_common('/'){ search_next }
       end
 
       def status_search_prev
-        status_search_common('?') do
-          search_prev
-        end
+        status_search_common('?'){ search_prev }
       end
 
       def status_search_common(question)
-        status_ask question do |term|
-          begin
-            needle = Regexp.new(term)
-          rescue RegexpError
-            needle = Regexp.escape(term)
-          end
+        status.bind('<<Modified>>') do
+          search_incremental(status.value)
+        end
 
-          tag_all_matching(:search, needle, SEARCH_HIGHLIGHT)
+        status_ask question do |term|
+          status.bind('<<Modified>>'){ }
+          search_incremental(term, force = true)
+          search_prev
           yield
         end
       end
 
-      def search_next
-        from, to = tag_nextrange('search', 'insert + 1 chars', 'end')
+      def search_incremental(term, force = false)
+        return if !term || term.empty?
+        return if !force && term.size <= options.search_incremental_min
+
+        begin
+          needle = Regexp.new(term)
+        rescue RegexpError, SyntaxError
+          needle = Regexp.escape(term)
+        end
+
+        tag_all_matching(:search, needle, SEARCH_HIGHLIGHT)
+        from, to = tag_nextrange('search', '1.0', 'end')
+        see(from) if from
+      end
+
+      def search_first
+        from, to = tag_nextrange('search', '1.0', 'end')
         mark_set(:insert, from) if from
       end
 
-      def search_prev
-        from, to = tag_prevrange('search', 'insert - 1 chars', '1.0')
+      def search_last
+        from, to = tag_prevrange('search', 'end', '1.0')
         mark_set(:insert, from) if from
       end
 
+      def search_next(count = 1)
+        count.times do
+          from, to = tag_nextrange('search', 'insert + 1 chars', 'end')
+          mark_set(:insert, from) if from
+        end
+      end
+
+      def search_prev(count = 1)
+        count.times do
+          from, to = tag_prevrange('search', 'insert - 1 chars', '1.0')
+          mark_set(:insert, from) if from
+        end
+      end
+
       def search_next_word_under_cursor
         word = get('insert wordstart', 'insert wordend')
         return if word.squeeze == ' ' # we don't want to match space
@@ -78,6 +103,10 @@ module VER
           end
         end
       end
+
+      def search_clear
+        tag_remove('search', '1.0', 'end')
+      end
     end
   end
 end

data/lib/ver/methods/select.rb

@@ -48,6 +48,7 @@ module VER
         end
       end
 
+      # Delete selection without copying it.
       def delete_selection
         queue = tag_ranges(:sel).flatten
         delete(*queue)
@@ -56,22 +57,32 @@ module VER
         finish_selection
       end
 
+      # Copy selection and delete it.
+      def kill_selection
+        queue = tag_ranges(:sel).flatten
+        kill(*queue)
+        mark_set(:insert, queue.first)
+
+        finish_selection
+      end
+
       def indent_selection
-        indent_size = VER.options.shiftwidth
+        indent_size = options.shiftwidth
         indent = ' ' * indent_size
 
-        each_selected_line do |y, fx, tx|
-          tx = fx + indent_size
-          next if get("#{y}.#{fx}", "#{y}.#{tx}").empty?
-          insert("#{y}.#{fx}", indent)
+        undo_record do |record|
+          each_selected_line do |y, fx, tx|
+            tx = fx + indent_size
+            next if get("#{y}.#{fx}", "#{y}.#{tx}").empty?
+            record.insert("#{y}.#{fx}", indent)
+          end
         end
 
-        edit_separator
         refresh_selection
       end
 
       def unindent_selection
-        indent_size = VER.options.shiftwidth
+        indent_size = options.shiftwidth
         indent = ' ' * indent_size
         queue = []
 
@@ -83,7 +94,6 @@ module VER
         end
 
         delete(*queue)
-        edit_separator
         refresh_selection
       end
 
@@ -113,20 +123,46 @@ module VER
       end
 
       def comment_selection
+        comment = "#{options.comment_line} "
+        indent = nil
+        lines = []
+
         each_selected_line do |y, fx, tx|
-          insert("#{y}.0 linestart", '# ')
+          lines << y
+
+          next if indent == 0 # can't get lower
+
+          line = get("#{y}.#{fx}", "#{y}.#{tx}")
+
+          next unless start = line =~ /\S/
+
+          indent ||= start
+          indent = start if start < indent
+        end
+
+        lines.each do |y|
+          insert("#{y}.#{indent}", comment)
         end
 
-        edit_separator
+        undo_separator
         refresh_selection
       end
 
       def uncomment_selection
-        each_selected_line do |y, fx, tx|
-          delete("#{y}.0 linestart", "#{y}.0 linestart + 2 chars")
+        comment = "#{options.comment_line} "
+        regex = /#{Regexp.escape(comment)}/
+
+        undo_record do |record|
+          each_selected_line do |y, fx, tx|
+            from, to = "#{y}.#{fx}", "#{y}.#{tx}"
+            line = get(from, to)
+
+            if line.sub!(regex, '')
+              record.replace(from, to, line)
+            end
+          end
         end
 
-        edit_separator
         refresh_selection
       end
 
@@ -152,30 +188,52 @@ module VER
         end
       end
 
+      def replace_selection_with_clipboard
+        string = clipboard_get
+        ranges = tag_ranges(:sel)
+        from, to = ranges.first.first, ranges.last.last
+        replace(from, to, string)
+        finish_selection
+        mark_set :insert, from
+      end
+
+      def refresh_selection
+        return unless start = selection_start
+
+        tag_remove :sel, 1.0, :end
+
+        case selection_mode
+        when :select_char; refresh_selection_char(start)
+        when :select_line; refresh_selection_line(start)
+        when :select_block; refresh_selection_block(start)
+        end
+      end
+
       private
 
       # TODO: find better name for +full+
       def replace_selection_with(string, full)
         origin = index(:insert)
 
-        if full
-          each_selected_line do |y, fx, tx|
-            diff = tx - fx
-            replace("#{y}.#{fx}", "#{y}.#{tx}", string * diff)
-          end
-        else
-          string_size = string.size
-          each_selected_line do |y, fx, tx|
-            replace("#{y}.#{fx}", "#{y}.#{tx}", string)
+        undo_record do |record|
+          if full
+            each_selected_line do |y, fx, tx|
+              diff = tx - fx
+              record.replace("#{y}.#{fx}", "#{y}.#{tx}", string * diff)
+            end
+          else
+            string_size = string.size
+            each_selected_line do |y, fx, tx|
+              record.replace("#{y}.#{fx}", "#{y}.#{tx}", string)
+            end
           end
         end
 
-        edit_separator
         mark_set :insert, origin
       end
 
       def finish_selection(mode = nil)
-        edit_separator
+        undo_separator
         clear_selection
         mode ? self.mode = mode : keymap.use_previous_mode
         apply_mode_style(keymap.mode)
@@ -220,6 +278,45 @@ module VER
           insert(queue.first, output)
         end
       end
+
+      # FIXME: yes, i know i'm calling `tag add` for every line, which makes
+      #        things slower, but it seems like there is a bug in the text widget.
+      #        So we aggregate the information into a single eval.
+      def refresh_selection_block(start)
+        ly, lx, ry, rx =
+          if compare('insert', '>', start)
+            [*index('insert').split, *start.split]
+          else
+            [*start.split, *index('insert').split]
+          end
+
+        from_y, to_y = [ly, ry].sort
+        from_x, to_x = [lx, rx].sort
+
+        code = [%(set win "#{tk_pathname}")]
+
+        from_y.upto to_y do |y|
+          code << "$win tag add sel #{y}.#{from_x} #{y}.#{to_x + 1}"
+        end
+
+        Tk.execute_only(Tk::TclString.new(code.join("\n")))
+      end
+
+      def refresh_selection_char(start)
+        if compare('insert', '>', start)
+          tag_add :sel, start, "insert + 1 chars"
+        else
+          tag_add :sel, "insert", "#{start} + 1 chars"
+        end
+      end
+
+      def refresh_selection_line(start)
+        if compare('insert', '>', start)
+          tag_add :sel, "#{start} linestart", 'insert lineend'
+        else
+          tag_add :sel, 'insert linestart', "#{start} lineend"
+        end
+      end
     end
   end
 end

data/lib/ver/methods/undo.rb

@@ -0,0 +1,23 @@
+module VER
+  module Methods
+    module Undo
+      def redo
+        undoer.redo
+      end
+
+      def undo
+        undoer.undo
+      end
+
+      private
+
+      def undo_record(&block)
+        undoer.record_multi(&block)
+      end
+
+      def undo_separator
+        undoer.separate!
+      end
+    end
+  end
+end

data/lib/ver/methods/views.rb

@@ -1,6 +1,11 @@
 module VER
   module Methods
     module Views
+      def view_focus(index = 0)
+        return unless found = layout.views[index - 1]
+        found.push_top
+      end
+
       def view_find_or_create(file)
         view.find_or_create(file)
       end

data/lib/ver/mode.rb

@@ -20,7 +20,7 @@ module VER
       @map = {}
       @ancestors = []
       @missing = nil
-      @arguments = true
+      @arguments = callback.arguments
     end
 
     def inherits(*others)
@@ -58,7 +58,7 @@ module VER
         bind(keychain.flatten, sym)
       end
     end
-    alias to map
+    alias key map
 
     def bind(keychain, action_name = nil, &block)
       keychain = keychain.dup
@@ -137,23 +137,24 @@ module VER
 
           case executable
           when nil
+            return false unless previous.respond_to?(:find)
+
             # FIXME: this allows only one mode
-            if found = previous.find{|prev_key, prev_value| prev_key.is_a?(Mode) }
-              mode, action = found
-              looked = mode.attempt_execute([key, *stack], true)
-
-              case looked
-              when false
-                return false
-              when nil
-                return nil
-              else
-                cmd, cmd_arg = looked
-                return nil if cmd.is_a?(Hash)
-                return execute(action, cmd, arg)
-              end
-            else
+            found = previous.find{|prev_key, prev_value| prev_key.is_a?(Mode) }
+            return false unless found
+
+            mode, action = found
+            looked = mode.attempt_execute([key, *stack], true)
+
+            case looked
+            when false
               return false
+            when nil
+              return nil
+            else
+              cmd, cmd_arg = looked
+              return nil if cmd.is_a?(Hash)
+              return execute(action, cmd, arg)
             end
           end
         end