redcar 0.3.0dev → 0.3.1dev

data/plugins/edit_view/lib/edit_view.rb

@@ -10,12 +10,28 @@ module Redcar
     include Redcar::Model
     include Redcar::Observable
     
+    extend Forwardable
+
+    class << self
+      attr_reader :undo_sensitivity, :redo_sensitivity
+    end
+    
     def self.start
       Sensitivity.new(:edit_tab_focussed, Redcar.app, false, [:tab_focussed]) do |tab|
         tab and tab.is_a?(EditTab)
       end
+      @undo_sensitivity = 
+        Sensitivity.new(:undoable, Redcar.app, false, [:focussed_tab_changed, :tab_focussed]) do
+          tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
+          tab and tab.is_a?(EditTab) and tab.edit_view.undoable?
+        end
+      @redo_sensitivity = 
+        Sensitivity.new(:redoable, Redcar.app, false, [:focussed_tab_changed, :tab_focussed]) do
+          tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
+          tab and tab.is_a?(EditTab) and tab.edit_view.redoable?
+        end
     end
-    
+
     attr_reader :document
     
     def initialize(tab)
@@ -33,17 +49,11 @@ module Redcar
       @tab.title = title
     end
     
-    def cursor_offset=(offset)
-      controller.cursor_offset = offset
-    end
-    
-    def cursor_offset
-      controller.cursor_offset
-    end
-    
-    def scroll_to_line(line_index)
-      controller.scroll_to_line(line_index)
-    end
+    def_delegators :controller, :undo,      :redo,
+                                :undoable?, :redoable?,
+                                :reset_undo,
+                                :cursor_offset, :cursor_offset=,
+                                :scroll_to_line
     
     def grammar
       @grammar

data/plugins/edit_view/lib/edit_view/command.rb

@@ -2,5 +2,11 @@ module Redcar
   class EditTabCommand < TabCommand
 
     sensitize :edit_tab_focussed
+    
+    private
+    
+    def doc
+      tab.edit_view.document
+    end
   end
 end

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

@@ -13,7 +13,8 @@ module Redcar
     def_delegators :controller, 
                       :length, :line_count, :to_s, :text=,
                       :line_at_offset, :get_line, :offset_at_line,
-                      :insert, :cursor_offset, :cursor_offset=
+                      :cursor_offset, :cursor_offset=,
+                      :selection_range, :replace, :set_selection_range
     
     def self.register_controller_type(controller_type)
       unless controller_type.ancestors.include?(Document::Controller)
@@ -50,6 +51,7 @@ module Redcar
     
     def save!
       @mirror.commit(to_s)
+      set_modified(false)
     end
     
     def title
@@ -65,31 +67,90 @@ module Redcar
         update_from_mirror
       end
     end
-    
+
     def verify_text(start_offset, end_offset, text)
-      @change = [start_offset, end_offset, text]
+      @change = [start_offset, end_offset, text]    
       @controllers[Controller::ModificationCallbacks].each do |controller|
         controller.before_modify(start_offset, end_offset, text)
       end
     end
-    
+
     def modify_text
+      start_offset, end_offset, text = *@change
+      set_modified(true)
       @controllers[Controller::ModificationCallbacks].each do |controller|
         controller.after_modify
       end
       @controllers[Controller::NewlineCallback].each do |controller|
-        if @change[2] == "\n"
-          controller.after_newline(line_at_offset(@change[1]) + 1)
+        if text == "\n"
+          controller.after_newline(line_at_offset(start_offset) + 1)
         end
       end
-      @change = nil
+      @change = nil      
+      notify_listeners(:changed)
+    end                  
+    
+    def about_to_be_changed(start_offset, length, text)
+    end
+    
+    def changed(start_offset, length, text)
+      notify_listeners(:changed)
+    end
+    
+    def cursor_line
+      line_at_offset(cursor_offset)
+    end
+    
+    def selection?
+      selection_range.count > 0
+    end
+      
+    def insert(offset, text)
+      replace(offset, 0, text)
+    end
+      
+    def delete(offset, length)
+      replace(offset, length, "")
+    end
+    
+    def replace_line(line_ix, text=nil)
+      text ||= yield(get_line(line_ix))
+      start_offset = offset_at_line(line_ix)
+      end_offset   = offset_at_inner_end_of_line(line_ix)
+      replace(start_offset, end_offset - start_offset, text)
+    end
+    
+    def offset_at_inner_end_of_line(line_ix)
+      if line_ix == line_count - 1
+        length
+      else
+        offset_at_line(line_ix + 1) - 1
+      end
     end
     
     private
     
     def update_from_mirror
       self.text        = mirror.read
-      @edit_view.title = mirror.title
+      @modified = false
+      @edit_view.title = title_with_star
+    end
+    
+    def set_modified(boolean)
+      @modified = boolean
+      @edit_view.title = title_with_star
+    end
+    
+    def title_with_star
+      if mirror
+        if @modified
+          "*" + mirror.title
+        else
+          mirror.title
+        end
+      else
+        "untitled"
+      end
     end
   end
 end

data/plugins/edit_view/lib/edit_view/edit_tab.rb

@@ -12,10 +12,11 @@ module Redcar
     def create_edit_view
       @edit_view = Redcar::EditView.new(self)
       @edit_view.add_listener(:focussed, &method(:edit_view_focussed))
+      @edit_view.document.add_listener(:changed) { notify_listeners(:changed, self) }
     end
     
     def edit_view_focussed
-      notify_listeners(:focussed)
+      notify_listeners(:focus)
     end
     
     def serialize

data/plugins/edit_view/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
-Redcar.require
+Redcar.boot
+Redcar.require_files

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -21,7 +21,7 @@ module Redcar
     def self.load_textmate_assets
       JavaMateView::Bundle.load_bundles(Redcar::ROOT + "/textmate/")
       JavaMateView::ThemeManager.load_themes(Redcar::ROOT + "/textmate/")
-      end
+    end
     
     attr_reader :mate_text, :widget
 
@@ -38,6 +38,8 @@ module Redcar
       end
       @mate_text.set_grammar_by_name "Plain Text"
       @mate_text.set_theme_by_name(ARGV.option("theme") || "Twilight")
+      create_undo_manager
+      @document.attach_modification_listeners # comes after undo manager
     end
     
     def create_mate_text
@@ -52,7 +54,7 @@ module Redcar
         default_font_size = 15
       elsif Core.platform == :linux
         default_font = "Monospace"
-        default_font_size = 14
+        default_font_size = 11
       elsif Core.platform == :windows
         default_font = "FixedSys"
         default_font_size = 15
@@ -72,11 +74,40 @@ module Redcar
       @model.controller = self
     end
     
+    def create_undo_manager
+      @undo_manager = JFace::Text::TextViewerUndoManager.new(100)
+      @undo_manager.connect(@mate_text.viewer)
+    end
+    
+    def undo
+      @undo_manager.undo
+      EditView.undo_sensitivity.recompute
+      EditView.redo_sensitivity.recompute
+    end
+    
+    def undoable?
+      @undo_manager.undoable
+    end
+    
+    def redo
+      @undo_manager.redo
+      EditView.undo_sensitivity.recompute
+      EditView.redo_sensitivity.recompute
+    end
+    
+    def redoable?
+      @undo_manager.redoable
+    end
+    
+    def reset_undo
+      @undo_manager.reset
+    end
+    
     def create_grammar_selector
       @combo = Swt::Widgets::Combo.new @widget, Swt::SWT::READ_ONLY
       bundles  = JavaMateView::Bundle.bundles.to_a
-      grammars = bundles.map{|b| b.grammars.to_a}.flatten
-      items    = grammars.map{|g| g.name}
+      grammars = bundles.map {|b| b.grammars.to_a}.flatten
+      items    = grammars.map {|g| g.name}.sort_by {|name| name.downcase }
       @combo.items = items.to_java(:string)
       
       @mate_text.add_grammar_listener do |new_grammar|
@@ -84,7 +115,6 @@ module Redcar
       end
       
       @combo.add_selection_listener do |event|
-        puts "selected #{@combo.text}"
         @mate_text.set_grammar_by_name(@combo.text)
       end
       
@@ -104,7 +134,6 @@ module Redcar
     end
     
     def swt_focus_gained
-      # p [:swt_focus_gained, self.class]
       @model.gained_focus
     end
     
@@ -184,7 +213,7 @@ module Redcar
         @document, @obj = document, obj
       end
       
-      def modify_text(_)
+      def modify_text(e)
         @document.modify_text
       end
     end

data/plugins/edit_view_swt/lib/edit_view_swt/document.rb

@@ -6,10 +6,14 @@ module Redcar
       attr_reader :swt_document
       
       def initialize(model, swt_document)
-        @model = model
+        @model        = model
         @swt_document = swt_document
       end
       
+      def attach_modification_listeners
+        jface.add_document_listener(DocumentListener.new(@model))
+      end
+      
       def to_s
         @swt_document.get
       end
@@ -35,8 +39,17 @@ module Redcar
         jface.get(line_info.offset, line_info.length)
       end
       
-      def insert(offset, text)
-        jface.replace(offset, 0, text)
+      def replace(offset, length, text)
+        @model.verify_text(offset, offset+length, text)
+        jface.replace(offset, length, text)
+        @model.modify_text
+      end
+      
+      def text=(text)
+        @model.verify_text(0, length, text)
+        jface.set(text)
+        @model.modify_text
+        notify_listeners(:set_text)
       end
       
       def cursor_offset
@@ -47,14 +60,36 @@ module Redcar
         @swt_document.styledText.set_caret_offset(offset)
       end
       
+      # Returns the offset range selected in the document. The start of the range is always
+      # before the end of the range, even if the selection is right-to-left
+      #
+      # @return [Range<Integer>] offset range
+      def selection_range
+        range = @swt_document.styledText.get_selection_range
+        range.x...(range.x + range.y)
+      end
+      
+      def set_selection_range(start, _end)
+        @swt_document.styledText.set_selection(start, _end)
+      end
+      
       def jface
         @swt_document.getJFaceDocument
       end
       
-      def text=(text)
-        @swt_document.set(text)
-        notify_listeners(:set_text)
+      class DocumentListener
+        def initialize(model)
+          @model = model
+        end
+        
+        def document_about_to_be_changed(e)
+          @model.about_to_be_changed(e.offset, e.length, e.text)
+        end
+        
+        def document_changed(e)
+          @model.changed(e.offset, e.length, e.text)
+        end
       end
     end
   end
-end
+end

data/plugins/project/features/open_and_save_files.feature

@@ -5,6 +5,15 @@ Feature: Open and save files
     When I open a file
     Then there should be one edit tab
     And I should see "Wintersmith" in the edit tab
+
+  Scenario: Opening an already open file focusses the edit tab
+    Given I will choose "plugins/project/features/fixtures/winter.txt" from the "open_file" dialog
+    When I open a file
+    And I open a new edit tab
+    And I replace the contents with "Jenny Green Eyes"
+    And I open a file
+    Then there should be 2 edit tabs
+    And I should see "Wintersmith" in the edit tab
   
   Scenario: Save a file
     Given I have opened "plugins/project/features/fixtures/winter.txt"

data/plugins/project/features/refresh_directory_tree.feature

@@ -0,0 +1,37 @@
+Feature: Refresh directory tree
+
+  Scenario: Does not refresh instantly
+    Given I will choose "." from the "open_directory" dialog
+    When I open a directory
+    Then I should see "bin,config,lib,plugins" in the tree
+    And I should not see "testyfile.txt" in the tree
+    When I touch the file "./testyfile.txt"
+    Then I should not see "testyfile.txt" in the tree
+
+  Scenario: I can manually refresh the tree
+    Given I will choose "." from the "open_directory" dialog
+    When I open a directory
+    Then I should see "bin,config,lib,plugins" in the tree
+    And I should not see "testyfile.txt" in the tree
+    When I touch the file "./testyfile.txt"
+    And I refresh the directory tree
+    Then I should see "bin,config,lib,plugins,testyfile.txt" in the tree
+    
+  Scenario: Changing windows refreshed the tree
+    Given I will choose "." from the "open_directory" dialog
+    When I open a directory
+    Then I should see "bin,config,lib,plugins" in the tree
+    And I should not see "testyfile.txt" in the tree
+    When I touch the file "./testyfile.txt"
+    When I open a new window
+    And I focus the window "Redcar" through the gui
+    Then I should see "bin,config,lib,plugins,testyfile.txt" in the tree
+    
+  Scenario: Refreshing the tree leaves rows expanded as they were before
+    Given I will choose "." from the "open_directory" dialog
+    When I open a directory
+    And I expand the tree row "lib"
+    Then I should see "bin,config,lib,freebase2,plugins" in the tree
+    And I refresh the directory tree
+    Then I should see "bin,config,lib,freebase2,plugins" in the tree
+  

data/plugins/project/features/step_definitions/directory_steps.rb

@@ -1,4 +1,8 @@
 
 When /I open a directory/ do
   Redcar::Project::DirectoryOpenCommand.new.run
-end
+end
+
+When /^I refresh the directory tree$/ do
+  Redcar::Project.refresh_tree(Redcar.app.focussed_window)
+end

data/plugins/project/features/step_definitions/file_steps.rb

@@ -15,6 +15,11 @@ When /^I save the tab$/ do
   Redcar::Project::FileSaveCommand.new.run
 end
 
+When /^I touch the file "([^\"]*)"$/ do |fn|
+  FileUtils.touch(fn)
+  add_test_file(fn)
+end
+
 When /^I save the tab as$/ do
   Redcar::Project::FileSaveAsCommand.new.run
 end
@@ -22,3 +27,15 @@ end
 Then /^the file "([^\"]*)" should contain "([^\"]*)"$/ do |arg1, arg2|
   File.read(arg1).should == arg2
 end
+
+def add_test_file(fn)
+  (@test_files ||= []) << File.expand_path(fn)
+end
+
+def remove_test_files
+  (@test_files||[]).each { |fn| FileUtils.rm_f(fn) }
+end
+
+After do
+  remove_test_files
+end