redcar 0.3.4.3 → 0.3.5

data/plugins/edit_view/lib/edit_view/actions/arrow_keys.rb

@@ -27,6 +27,10 @@ module Redcar
           end
           real_ix + offset - imaginary_ix
         end
+        
+        def self.ensure_cursor_in_view(edit_view)
+          edit_view.document.ensure_visible(edit_view.document.cursor_offset)
+        end
       end
       
       class ArrowLeftHandler < ArrowHandler
@@ -40,6 +44,8 @@ module Redcar
           else
             doc.cursor_offset = move_left_offset(edit_view)
           end
+          ArrowHandler.ensure_cursor_in_view(edit_view)
+          true
         end
         
         def self.move_left_offset(edit_view)
@@ -85,6 +91,8 @@ module Redcar
           else
             doc.cursor_offset = move_right_offset(edit_view)
           end
+          ArrowHandler.ensure_cursor_in_view(edit_view)
+          true
         end
         
         def self.move_right_offset(edit_view)
@@ -95,6 +103,10 @@ module Redcar
         def self.move_right_offset1(edit_view)
           doc = edit_view.document
           return doc.length if doc.cursor_offset == doc.length - 1
+          if doc.length >= doc.cursor_offset + doc.delim.length and 
+              doc.get_range(doc.cursor_offset, doc.delim.length) == doc.delim
+            return doc.cursor_offset + doc.delim.length
+          end
           if edit_view.soft_tabs?
             line = doc.get_line(doc.cursor_line)
             width = edit_view.tab_width
@@ -106,15 +118,19 @@ module Redcar
               if match = after_line.match(/^\s+/)
                 doc.cursor_offset + match[0].length
               else
-                doc.cursor_offset + 1
+                incremented_offset(doc)
               end
             else
-              doc.cursor_offset + 1
+              incremented_offset(doc)
             end
           else
-            doc.cursor_offset + 1
+            incremented_offset(doc)
           end
         end
+        
+        def self.incremented_offset(doc)
+          doc.cursor_offset + 1
+        end
       end
     end
   end

data/plugins/edit_view/lib/edit_view/document.rb

@@ -10,10 +10,8 @@ module Redcar
     
     def self.all_document_controller_types
       result = []
-      Redcar.plugin_manager.loaded_plugins.each do |plugin|
-        if plugin.object.respond_to?(:document_controller_types)
-          result += plugin.object.document_controller_types
-        end
+      Redcar.plugin_manager.objects_implementing(:document_controller_types).each do |object|
+        result += object.document_controller_types
       end
       result
     end
@@ -52,9 +50,14 @@ module Redcar
     
     def save!
       @mirror.commit(to_s)
+      @edit_view.reset_last_checked
       set_modified(false)
     end
     
+    def modified?
+      @modified
+    end
+    
     def title
       @mirror ? @mirror.title : nil
     end
@@ -77,6 +80,10 @@ module Redcar
         update_from_mirror
       end
     end
+    
+    def mirror_changed?
+      mirror and mirror.changed?
+    end
 
     def verify_text(start_offset, end_offset, text)
       @change = [start_offset, end_offset, text]    
@@ -289,6 +296,10 @@ module Redcar
       controller.selection_offset
     end
     
+    def selection_line
+      line_at_offset(selection_offset)
+    end
+    
     # Set the range of text selected by the user. 
     #
     # @param [Integer] cursor_offset
@@ -418,6 +429,10 @@ module Redcar
       @edit_view.controller.biggest_visible_line
     end
 
+    def ensure_visible(offset)
+      @edit_view.controller.ensure_visible(offset)
+    end
+
     def num_lines_visible
       biggest_visible_line - smallest_visible_line
     end
@@ -436,20 +451,40 @@ module Redcar
     def delete_mark(mark)
       controller.delete_mark(mark)
     end
-
-    private
     
-    def update_from_mirror
-      self.text        = mirror.read
-      @modified = false
-      @edit_view.title = title_with_star
+    # Everything within the block will be treated as a single action
+    # for the purposes of Undo.
+    #
+    #     doc.compound { first_thing; second_thing }
+    def compound
+      @edit_view.controller.compound { yield }
     end
     
+    def update_from_mirror
+      previous_line      = cursor_line
+      top_line           = smallest_visible_line
+      
+      self.text          = mirror.read
+      
+      @modified          = false
+      @edit_view.title   = title_with_star
+      if line_count > previous_line
+        self.cursor_offset = offset_at_line(previous_line)
+        scroll_to_line_at_top(top_line)
+      end
+    end
+       
     def set_modified(boolean)
       @modified = boolean
       @edit_view.title = title_with_star
     end
-    
+ 
+    def indentation
+      Document::Indentation.new(self, @edit_view.tab_width, @edit_view.soft_tabs?)
+    end
+ 
+    private 
+   
     def title_with_star
       if mirror
         if @modified

data/plugins/edit_view/lib/edit_view/document/indentation.rb

@@ -0,0 +1,35 @@
+
+module Redcar
+  class Document
+    class Indentation
+      def initialize(doc, tab_width, soft_tabs)
+        @doc, @tab_width, @soft_tabs = doc, tab_width, soft_tabs
+      end
+      
+      def get_level(ix)
+        whitespace_prefix(ix).scan(indent_consuming_regex).length
+      end
+      
+      def whitespace_prefix(ix)
+        line = @doc.get_line(ix)
+        line.match(/^(\s*)([^\s]|$)/)[1].chomp
+      end
+      
+      def set_level(ix, level)
+        offset = @doc.offset_at_line(ix)
+        prefix = whitespace_prefix(ix)
+        if @soft_tabs
+          @doc.replace(offset, prefix.length, " "*@tab_width*level)
+        else
+          @doc.replace(offset, prefix.length, "\t"*level)
+        end
+      end
+      
+      private
+      
+      def indent_consuming_regex
+        /( {0,#{@tab_width - 1}}\t| {#{@tab_width}})/
+      end
+    end
+  end
+end

data/plugins/edit_view/lib/edit_view/modified_tabs_checker.rb

@@ -0,0 +1,35 @@
+module Redcar
+  class EditView
+    class ModifiedTabsChecker
+      def initialize(tabs, message, options)
+        @tabs, @message, @options = tabs, message, options
+      end
+      
+      def check
+        modified_edit_tabs = @tabs.select {|t| t.edit_view.document.modified? }
+        if modified_edit_tabs.any?
+          result = Application::Dialog.message_box(
+            "You have #{modified_edit_tabs.length} modified tabs.\n\n" + 
+            @message,
+            :buttons => :yes_no_cancel
+          )
+          case result
+          when :yes
+            modified_edit_tabs.each do |t|
+              t.focus
+              Project::FileSaveCommand.new(t).run
+            end
+            @options[:continue] ? @options[:continue].call : nil
+          when :no
+            @options[:continue] ? @options[:continue].call : nil
+          when :cancel
+            @options[:cancel] ? @options[:cancel].call : nil
+          end
+        else
+          @options[:none] ? @options[:none].call : nil
+        end
+      end
+    end
+  end
+end
+    

data/plugins/edit_view/lib/edit_view/tab_settings.rb

@@ -5,11 +5,12 @@ module Redcar
       DEFAULT_TAB_WIDTH = 2
       TAB_WIDTHS        = %w(2 3 4 5 6 8)
       
-      attr_reader :tab_widths, :softnesses
+      attr_reader :tab_widths, :softnesses, :show_invisibles
     
       def initialize
-        @tab_widths = EditView.storage['tab_widths'] || {}
-        @softnesses = EditView.storage['softnesses'] || {}
+        @tab_widths      = EditView.storage['tab_widths'] || {}
+        @softnesses      = EditView.storage['softnesses'] || {}
+        @show_invisibles = !!EditView.storage['show_invisibles']
       end
       
       def width_for(grammar_name)
@@ -35,6 +36,15 @@ module Redcar
           EditView.storage['softnesses'] = softnesses
         end
       end
+      
+      def show_invisibles?
+        show_invisibles
+      end
+      
+      def set_show_invisibles(bool)
+        @show_invisibles = bool
+        EditView.storage['show_invisibles'] = bool
+      end
     end
   end
 end

data/plugins/edit_view/spec/edit_view/document/indentation_spec.rb

@@ -0,0 +1,112 @@
+
+require File.join(File.dirname(__FILE__), %w".. .. spec_helper")
+
+describe Redcar::Document::Indentation do
+  class MockDoc
+    def initialize(string)
+      @string = string
+    end
+    
+    def get_line(ix)
+      lines[ix] + "\n"
+    end
+    
+    def offset_at_line(ix)
+      return 0 if ix == 0
+      lines[0..(ix - 1)].join("\n").length + 1
+    end
+    
+    def delim
+      "\n"
+    end
+    
+    private
+    
+    def lines
+      @string.split("\n")
+    end
+  end
+  
+  describe "#get_level" do
+    it "should report indent correctly" do
+      ind = Redcar::Document::Indentation.new(MockDoc.new(<<RUBY), 4, false)
+def foo
+	p :foo
+    p :bar
+  	p :baz
+  		p :qux
+  	  	p :qux
+  	   
+RUBY
+      ind.get_level(0).should == 0
+      ind.get_level(1).should == 1
+      ind.get_level(2).should == 1
+      ind.get_level(3).should == 1
+      ind.get_level(4).should == 2
+      ind.get_level(5).should == 2
+      ind.get_level(6).should == 1
+    end
+  end
+  
+  describe "#set_level" do
+    describe "with soft tabs" do
+      it "should set indent correctly from no indent" do
+        @doc = MockDoc.new(<<RUBY)
+def foo
+RUBY
+        ind = Redcar::Document::Indentation.new(@doc, 4, true)
+        @doc.should_receive(:replace).with(0, 0, "    ")
+        ind.set_level(0, 1)
+      end
+  
+      it "should set indent correctly from no indent (2)" do
+        @doc = MockDoc.new(<<RUBY)
+def foo
+RUBY
+        ind = Redcar::Document::Indentation.new(@doc, 4, true)
+        @doc.should_receive(:replace).with(0, 0, "        ")
+        ind.set_level(0, 2)
+      end
+  
+      it "should set indent correctly resetting previous indent" do
+        @doc = MockDoc.new(<<RUBY)
+        def foo
+RUBY
+        ind = Redcar::Document::Indentation.new(@doc, 4, true)
+        @doc.should_receive(:replace).with(0, 8, "    ")
+        ind.set_level(0, 1)
+      end
+    end
+    
+    describe "with hard tabs" do
+      it "should set indent correctly from no indent" do
+        @doc = MockDoc.new(<<RUBY)
+def foo
+RUBY
+        ind = Redcar::Document::Indentation.new(@doc, 4, false)
+        @doc.should_receive(:replace).with(0, 0, "\t")
+        ind.set_level(0, 1)
+      end
+  
+      it "should set indent correctly resetting previous indent" do
+        @doc = MockDoc.new(<<RUBY)
+		def foo
+RUBY
+        ind = Redcar::Document::Indentation.new(@doc, 4, false)
+        @doc.should_receive(:replace).with(0, 2, "\t")
+        ind.set_level(0, 1)
+      end
+      
+      it "should set indent correctly (2) from no indent" do
+        @doc = MockDoc.new(<<RUBY)
+def foo
+RUBY
+        ind = Redcar::Document::Indentation.new(@doc, 4, false)
+        @doc.should_receive(:replace).with(0, 0, "\t\t")
+        ind.set_level(0, 2)
+      end
+    end
+    
+  end
+end
+

data/plugins/edit_view/spec/edit_view/document_spec.rb

@@ -3,6 +3,16 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper")
 describe Redcar::Document do
   class TestEditView
     attr_accessor :title
+    
+    def reset_last_checked
+    end
+    
+    def controller
+      o = Object.new
+      def o.method_missing(*_)
+      end
+      o
+    end
   end
     
   class TestDocumentController
@@ -21,6 +31,18 @@ describe Redcar::Document do
     def get_range(from_here, to_here)
      @text[from_here, to_here]
     end
+    
+    def cursor_offset
+      0
+    end
+    
+    def line_at_offset(_)
+      0
+    end
+    
+    def line_count
+      0
+    end
   end
   
   class TestMirror

data/plugins/edit_view/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
+Redcar.environment = :test
 Redcar.load

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -25,7 +25,7 @@ module Redcar
     end
     
     attr_reader :mate_text, :widget, :model
-      
+
     def initialize(model, parent, options={})
       @options = options
       @model = model
@@ -81,6 +81,20 @@ module Redcar
       @undo_manager.reset
     end
     
+    def compound
+      begin_compound
+      yield
+      end_compound
+    end
+    
+    def begin_compound
+      @undo_manager.begin_compound_change
+    end
+    
+    def end_compound
+      @undo_manager.end_compound_change
+    end
+    
     def create_document
       @document = EditViewSWT::Document.new(@model.document, @mate_text.mate_document)
       @model.document.controller = @document
@@ -91,11 +105,15 @@ module Redcar
       h4 = @model.add_listener(:tab_width_changed) do |new_tab_width|
         @mate_text.get_control.set_tabs(new_tab_width)
       end
+      h5 = @model.add_listener(:invisibles_changed) do |new_bool|
+        @mate_text.showInvisibles(new_bool)
+      end
       @mate_text.getTextWidget.addFocusListener(FocusListener.new(self))
       @mate_text.getTextWidget.addVerifyListener(VerifyListener.new(@model.document, self))
       @mate_text.getTextWidget.addModifyListener(ModifyListener.new(@model.document, self))
       @mate_text.get_control.add_verify_key_listener(VerifyKeyListener.new(self))
-      @handlers << [@model.document, h1] << [@model, h2] << [@model, h3] << [@model, h4]
+      @mate_text.get_control.add_key_listener(KeyListener.new(self))
+      @handlers << [@model.document, h1] << [@model, h2] << [@model, h3] << [@model, h4] << [@model, h5]
     end
     
     class VerifyKeyListener
@@ -104,6 +122,9 @@ module Redcar
       end
       
       def verify_key(key_event)
+        if @edit_view_swt.model.document.block_selection_mode?
+          @edit_view_swt.begin_compound
+        end
         if key_event.character == Swt::SWT::TAB
           key_event.doit = !@edit_view_swt.model.tab_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
         elsif key_event.character == Swt::SWT::ESC
@@ -120,6 +141,22 @@ module Redcar
       end
     end
     
+    class KeyListener
+      def initialize(edit_view_swt)
+        @edit_view_swt = edit_view_swt
+      end
+      
+      def key_pressed(_)
+        @was_in_block_selection = @edit_view_swt.model.document.block_selection_mode?
+      end
+      
+      def key_released(_)
+        if @was_in_block_selection
+          @edit_view_swt.end_compound
+        end
+      end
+    end
+    
     def delay_parsing
       mate_text.delay_parsing { yield }
     end
@@ -161,7 +198,7 @@ module Redcar
     end
     
     def scroll_to_line(line_index)
-      @mate_text.parser.last_visible_line_changed(line_index + 100)
+      @mate_text.parser.parserScheduler.last_visible_line_changed(line_index + 100)
       @mate_text.viewer.set_top_index(line_index)
     end
     
@@ -177,14 +214,29 @@ module Redcar
       @mate_text.viewer.get_bottom_index
     end
     
+    def ensure_visible(offset)
+      line = @document.line_at_offset(offset)
+      line_start_offset = @document.offset_at_line(line)
+      if offset == line_start_offset
+        # This doesn't work. Bug in JFace.SourceViewer?
+        @mate_text.viewer.reveal_range(offset, 1)
+        # so we do this too:
+        @mate_text.get_control.set_horizontal_pixel(0)
+      else
+        @mate_text.viewer.reveal_range(offset, 1)
+      end
+    end
+    
     def update_grammar(new_mirror)
       title = new_mirror.title
-      return if @mate_text.set_grammar_by_filename(title)
       contents = new_mirror.read
       first_line = contents.to_s.split("\n").first
-      grammar = @mate_text.set_grammar_by_first_line(first_line) if first_line
-      grammar ||= "Plain Text"
-      @model.set_grammar(grammar)
+      grammar_name = @mate_text.set_grammar_by_first_line(first_line) if first_line
+      unless grammar_name
+        grammar_name = @mate_text.set_grammar_by_filename(title)
+      end
+      grammar_name ||= "Plain Text"
+      @model.set_grammar(grammar_name)
     end
     
     STRIP_KEYS = {