redcar 0.8.1 → 0.9.0

data/plugins/document_search/lib/document_search/replace_all_command.rb

@@ -0,0 +1,27 @@
+module DocumentSearch
+  class ReplaceAllCommand < ReplaceCommand
+    def execute
+      startoff, endoff = nil
+      text = doc.get_all_text
+      count = 0
+      sc = StringScanner.new(text)
+      while sc.scan_until(query)
+        count += 1
+
+        startoff = sc.pos - sc.matched_size
+        replacement_text = text.slice(startoff, sc.matched_size).gsub(query, replace)
+        endoff = startoff + replacement_text.length
+
+        text[startoff...sc.pos] = replacement_text
+        sc.string = text
+        sc.pos = startoff + replacement_text.length
+      end
+      if count > 0
+        doc.text = text
+        doc.set_selection_range(startoff + replacement_text.length, startoff)
+        doc.scroll_to_line(doc.line_at_offset(startoff))
+      end
+      count
+    end
+  end
+end

data/plugins/document_search/lib/document_search/replace_command.rb

@@ -0,0 +1,38 @@
+module DocumentSearch
+  class ReplaceCommand < Redcar::DocumentCommand
+    attr_reader :query, :replace
+
+    def initialize(query, replace, search_method)
+      @replace = replace
+      @query   = send(search_method, query)
+    end
+
+    # An instance of a search type method: Regular expression
+    def regex_search_query(query)
+      /#{query}/
+    end
+
+    # An instance of a search type method: Plain text search
+    def plain_search_query(query)
+      regex_search_query(Regexp.escape(query))
+    end
+
+    # An instance of a search type method: Glob text search
+    # Converts a glob pattern (* or ?) into a regex pattern
+    def glob_search_query(query)
+      # convert the glob pattern to a regex pattern
+      new_query = ""
+      query.each_char do |c|
+        case c
+        when "*"
+          new_query << ".*"
+        when "?"
+          new_query << "."
+        else
+          new_query << Regexp.escape(c)
+        end
+      end
+      regex_search_query(new_query)
+    end
+  end
+end

data/plugins/document_search/lib/document_search/replace_next_command.rb

@@ -0,0 +1,27 @@
+module DocumentSearch
+  class ReplaceNextCommand < ReplaceCommand
+    # The current selection is usually not used for the next replacement, unless
+    # it matches the query string, in which case we assume that the user meant replace it, too
+    def start_position
+      offsets = [doc.cursor_offset, doc.selection_offset]
+      return offsets.min if query == doc.selected_text
+      offsets.max
+    end
+
+    def execute
+      sc = StringScanner.new(doc.get_all_text)
+      sc.pos = start_position
+      sc.scan_until(query) || sc.reset && sc.scan_until(query)
+
+      return 0 unless sc.matched?
+      startoff = sc.pos - sc.matched_size
+
+      text = doc.get_range(startoff, sc.matched_size)
+      replacement_text = text.gsub(query, replace)
+      doc.replace(sc.pos - sc.matched_size, sc.matched_size, replacement_text)
+      doc.set_selection_range(startoff + replacement_text.length, startoff)
+      doc.scroll_to_line(doc.line_at_offset(startoff))
+      1
+    end
+  end
+end

data/plugins/document_search/lib/document_search/search_and_replace.rb

@@ -16,44 +16,47 @@ module DocumentSearch
       self.search_type.value = SearchAndReplaceSpeedbar.previous_search_type
       self.query.edit_view.document.select_all
     end
-    
+
     label :label_search, "Search:"
     textbox :query
-    
+
     label :label_replace, "Replace:"
     textbox :replace
-    
+
     combo :search_type, ["Regex", "Plain", "Glob"], "RegEx" do |v|
       SearchAndReplaceSpeedbar.previous_search_type = v
     end
-    
+
     button :single_replace, "Replace", "Return" do
       SearchAndReplaceSpeedbar.previous_query = query.value
       SearchAndReplaceSpeedbar.previous_replace = replace.value
       SearchAndReplaceSpeedbar.previous_search_type = search_type.value || "Regex" # Hack to work around fact that default value not being picked up
       success = SearchAndReplaceSpeedbar.search_replace
     end
-    
+
     button :all_replace, "Replace All", nil do
       SearchAndReplaceSpeedbar.previous_query = query.value
       SearchAndReplaceSpeedbar.previous_replace = replace.value
       SearchAndReplaceSpeedbar.previous_search_type = search_type.value || "Regex" # Hack to work around fact that default value not being picked up
       success = SearchAndReplaceSpeedbar.search_replace_all
     end
-    
-    def self.search_replace
-      current_query = @previous_query
-      current_replace = @previous_replace
+
+    def self.search_method
       case @previous_search_type
       when "Regex"
-        search_method = :regex_search_method
+        search_method = :regex_search_query
       when "Plain"
-        search_method = :plain_search_method
+        search_method = :plain_search_query
       when "Glob"
-        search_method = :glob_search_method
+        search_method = :glob_search_query
       else
-        search_method = :regex_search_method
+        search_method = :regex_search_query
       end
+    end
+
+    def self.search_replace
+      current_query = @previous_query
+      current_replace = @previous_replace
       adoc = Redcar.app.focussed_notebook_tab.document
       cmd = ReplaceNextCommand.new(current_query, current_replace, search_method)
       count = cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
@@ -61,20 +64,10 @@ module DocumentSearch
         Redcar::Application::Dialog.message_box("No instance of the search string were found", {:type => :info, :buttons => :ok})
       end
     end
-    
+
     def self.search_replace_all
       current_query = @previous_query
       current_replace = @previous_replace
-      case @previous_search_type
-      when "Regex"
-        search_method = :regex_search_method
-      when "Plain"
-        search_method = :plain_search_method
-      when "Glob"
-        search_method = :glob_search_method
-      else
-        search_method = :regex_search_method
-      end
       cmd = ReplaceAllCommand.new(current_query, current_replace, search_method)
       count = cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
       if count == 0 or count > 1

data/plugins/edit_view/features/step_definitions/editing_steps.rb

@@ -143,7 +143,7 @@ Then /^the selection should be on line (.*)$/ do |line_num|
   doc.line_at_offset(r.begin).should == line_num
   doc.line_at_offset(r.end).should == line_num
 end
- 
+
 Then /^there should not be any text selected$/ do
   doc = Redcar::EditView.focussed_edit_view_document
   doc.selected_text.should == ""
@@ -151,7 +151,7 @@ end
 
 Then /^the selected text should be "([^"]*)"$/ do |selected_text|
   doc = Redcar::EditView.focussed_edit_view_document
-  doc.selected_text.should == selected_text
+  doc.selected_text.should == unescape_text(selected_text)
 end
 
 Then /the line delimiter should be "(.*)"/ do |delim|
@@ -234,8 +234,8 @@ Given /^the contents? is:$/ do |string|
   selection_index = string.index('<s>')
   string = string.gsub('<s>', '').gsub('<c>', '')
   When %{I replace the contents with "#{string}"}
-  
-  if cursor_index and selection_index 
+
+  if cursor_index and selection_index
     if cursor_index < selection_index
       selection_index -= 3
     else

data/plugins/edit_view/features/step_definitions/tab_steps.rb

@@ -93,3 +93,12 @@ Then /^my active tab should have an "([^"]*)" icon$/ do |arg1|
   focussed_tab.icon.should == :"#{arg1}"
 end
 
+Then /^the tab should (not )?have annotations$/ do |negated|
+  annotations = focussed_tab.controller.edit_view.annotations
+  negated ? (annotations.should be_empty) : (annotations.should_not be_empty)
+end
+
+Then /^the tab should (not )?have an annotation on line (\d+)$/ do |negated, num|
+  annotations = focussed_tab.controller.edit_view.annotations(:line => num.to_i)
+  negated ? (annotations.should be_empty) : (annotations.should_not be_empty)
+end

data/plugins/edit_view/features/step_definitions/window_steps.rb

@@ -25,18 +25,6 @@ When /I open a new window(?: with title "(.*)")?/ do |title|
   Redcar::Top::NewWindowCommand.new(title).run
 end
 
-class FakeEvent
-  def initialize(event_type, widget)
-    untyped_event = Swt::Widgets::Event.new.tap do |e|
-      e.display = Swt.display
-      e.widget = widget
-      e.x = 0
-      e.y = 0
-    end
-    widget.notify_listeners(event_type, untyped_event)
-  end
-end
-                                                                                                                                             
 When /^I maximize the window size$/ do
   Redcar.app.focussed_window.controller.shell.maximized = true
 end

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

@@ -82,6 +82,8 @@ module Redcar
         @mirror.commit(to_s)
         @edit_view.reset_last_checked
         set_modified(false)
+        notify_listeners(:mirror_committed,@mirror)
+        Redcar.app.repeat_event(:mirror_committed) if Redcar.app
       end
     end
 

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

@@ -1,25 +1,25 @@
 module Redcar
-  class DocumentCommand < Command
+  class DocumentCommand < TabCommand
     sensitize :edit_view_focussed
-    
+
     def _finished
-      edit_view.history.record(self)
+      edit_view.history.record(self) if edit_view
     end
-    
+
     def run_in_focussed_tab_edit_view
       if edit_view = Redcar::EditView.focussed_tab_edit_view
         run(:env => {:edit_view => edit_view})
       end
     end
-    
+
     private
-    
+
     def edit_view
       env[:edit_view] || EditView.focussed_edit_view
     end
-    
+
     def doc
       edit_view.document
     end
   end
-end
+end

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

@@ -8,17 +8,31 @@ module Redcar
       create_edit_view
     end
 
-    def update_for_file_changes
-      old_icon = @icon
+    def icon
+      i = DEFAULT_ICON
       doc = @edit_view.document
       if doc and doc.path
-        if File.exists?(doc.path)
-          @icon = :file if icon == :exclamation
-        else
-          @icon = :exclamation
+        unless doc.mirror.adapter.is_a?(Redcar::Project::Adapters::Remote)
+          if File.exists?(doc.path)
+            if File.writable?(doc.path)
+              i = DEFAULT_ICON
+            else
+              i = NO_WRITE_ICON
+            end
+          else
+            i = MISSING_ICON
+          end
         end
       end
-      notify_listeners(:changed_icon, @icon) if old_icon != @icon
+      i
+    end
+
+    def update_for_file_changes
+      new_icon = icon
+      if new_icon and new_icon != @icon
+        @icon = new_icon
+        notify_listeners(:changed_icon, @icon)
+      end
     end
 
     def create_edit_view

data/plugins/edit_view/lib/edit_view/select_font_dialog.rb

@@ -34,6 +34,12 @@ module Redcar
         end
       end
 
+      def moved_to(text, ix)
+        if @last_list
+          Redcar::EditView.font = text
+        end
+      end
+
     end
   end
 end

data/plugins/edit_view/lib/edit_view/select_theme_dialog.rb

@@ -31,6 +31,12 @@ module Redcar
         end
       end
 
+      def moved_to(text, ix)
+        if @last_list
+          Redcar::EditView.theme = text
+        end
+      end
+
     end
   end
 end

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -28,7 +28,7 @@ module Redcar
       :WINDOW_START           => 17039365,
       :WINDOW_END             => 17039366
     }
-    
+
     SELECTION_COMMANDS = {
       :SELECT_ALL             => 262209,
       :SELECT_LINE_UP         => 16908289,
@@ -46,7 +46,7 @@ module Redcar
       :SELECT_WINDOW_START    => 17170437,
       :SELECT_WINDOW_END      => 17170438
     }
-    
+
     MODIFICATION_COMMANDS = {
       :CUT                    => 131199,
       :COPY                   => 17039369,
@@ -56,7 +56,7 @@ module Redcar
       :DELETE_WORD_PREVIOUS   => 262152,
       :DELETE_WORD_NEXT       => 262271
     }
-    
+
     ALL_ACTIONS = NAVIGATION_COMMANDS.merge(SELECTION_COMMANDS).merge(MODIFICATION_COMMANDS)
 
     include Redcar::Observable
@@ -107,42 +107,42 @@ module Redcar
       mate_text.add_grammar_listener do |new_grammar|
         @model.set_grammar(new_grammar)
       end
-      
+
       create_model_listeners
     end
-
+    
     def create_mate_text
       @mate_text = JavaMateView::MateText.new(@parent, !!@options[:single_line])
       @mate_text.set_font(EditView.font, EditView.font_size)
 
       @model.controller = self
-      
+
       add_styled_text_command_key_listeners
     end
-    
+
     class CommandKeyListener
-      
+
       attr_reader :st
-      
+
       def initialize(styled_text, edit_view)
         @edit_view = edit_view
         @st = styled_text
       end
-      
+
       def key_pressed(event)
       end
-      
+
       def key_released(event)
         record_action(event)
       end
-      
+
       # This pile of crap is copied from StyledText#handleKey. Wouldn't
       # it be great if this logic was accessible on StyledText somehow?
       def record_action(event)
         if (event.keyCode != 0)
           # special key pressed (e.g., F1)
           action = st.getKeyBinding(event.keyCode | event.stateMask)
-        else 
+        else
           # character key pressed
           action = st.getKeyBinding(event.character | event.stateMask)
           if (action == Swt::SWT::NULL)
@@ -155,31 +155,31 @@ module Redcar
             end
           end
         end
-        
+
         if (action == Swt::SWT::NULL)
 		      ignore = false
-		
+
           if (Redcar.platform == :osx)
-            # Ignore accelerator key combinations (we do not want to 
-            # insert a character in the text in this instance). Do not  
+            # Ignore accelerator key combinations (we do not want to
+            # insert a character in the text in this instance). Do not
             # ignore COMMAND+ALT combinations since that key sequence
             # produces characters on the mac.
             ignore = (event.stateMask & Swt::SWT::COMMAND) != 0 ||
               (event.stateMask & Swt::SWT::CTRL) != 0
           else
-    			  # Ignore accelerator key combinations (we do not want to 
-            # insert a character in the text in this instance). Don't  
-            # ignore CTRL+ALT combinations since that is the Alt Gr 
-            # key on some keyboards.  See bug 20953. 
-            ignore = (event.stateMask ^ Swt::SWT::ALT) == 0 || 
+    			  # Ignore accelerator key combinations (we do not want to
+            # insert a character in the text in this instance). Don't
+            # ignore CTRL+ALT combinations since that is the Alt Gr
+            # key on some keyboards.  See bug 20953.
+            ignore = (event.stateMask ^ Swt::SWT::ALT) == 0 ||
               (event.stateMask ^ Swt::SWT::CTRL) == 0 ||
               (event.stateMask ^ (Swt::SWT::ALT | Swt::SWT::SHIFT)) == 0 ||
               (event.stateMask ^ (Swt::SWT::CTRL | Swt::SWT::SHIFT)) == 0
           end
           # -ignore anything below SPACE except for line delimiter keys and tab.
-          # -ignore DEL 
-          if (!ignore && event.character > 31 && event.character != Swt::SWT::DEL || 
-            event.character == Swt::SWT::CR || event.character == Swt::SWT::LF || 
+          # -ignore DEL
+          if (!ignore && event.character > 31 && event.character != Swt::SWT::DEL ||
+            event.character == Swt::SWT::CR || event.character == Swt::SWT::LF ||
                 event.character == Swt::SWT::TAB)
             @edit_view.history.record(event.character)
           end
@@ -188,7 +188,7 @@ module Redcar
         end
       end
     end
-    
+
     def add_styled_text_command_key_listeners
       st = @mate_text.get_text_widget
       st.add_key_listener(CommandKeyListener.new(st, @model))
@@ -210,7 +210,7 @@ module Redcar
 
     def undoable?
       # The override malarky is because the JFace::TextViewerUndoManager doesn't
-      # recognize that typing while in Block Selection mode makes the edit view 
+      # recognize that typing while in Block Selection mode makes the edit view
       # undoable. (Even though it faithfully records the actions, and responds
       # correctly to "undo".) So we override the undo manager for this case.
       @undoable_override || @undo_manager.undoable
@@ -248,7 +248,7 @@ module Redcar
     def annotations(options = nil)
       return @mate_text.annotations unless options
       if options[:line]
-        @mate_text.annotationsOnLine(line + 1)
+        @mate_text.annotationsOnLine(options[:line] - 1)
       elsif options[:type]
         annotations_of_type(options[:type])
       end
@@ -278,6 +278,32 @@ module Redcar
       end
     end
 
+    def reset_right_margin
+      return if @options[:single_line]
+      if @model.word_wrap?
+        size = @mate_text.get_text_widget.get_size
+        width = size.x
+        @mate_text.get_text_widget.right_margin = width - char_width*(@model.margin_column||0) - 3*char_width
+      else
+        @mate_text.get_text_widget.right_margin = 0
+      end
+    end
+    
+    def char_width
+      return 0 if !!@options[:single_line]
+      @char_width ||= begin
+        gc = Swt::Graphics::GC.new(@mate_text.get_text_widget)
+        fm = gc.getFontMetrics
+        width = fm.getAverageCharWidth
+        gc.dispose
+        width
+      end
+    end
+    
+    def clear_char_width
+      @char_width = nil
+    end
+    
     def create_document
       @document = EditViewSWT::Document.new(@model.document, @mate_text.mate_document)
       @model.document.controller = @document
@@ -291,21 +317,17 @@ module Redcar
       h5 = @model.add_listener(:invisibles_changed) do |new_bool|
         @mate_text.showInvisibles(new_bool)
       end
-      h6 = @model.add_listener(:word_wrap_changed) do |new_bool|
-        @mate_text.set_word_wrap(new_bool)
-      end
-      h7 = @model.add_listener(:font_changed) do
-        @mate_text.set_font(EditView.font, EditView.font_size)
-      end
-      h8 = @model.add_listener(:theme_changed) do
-        @mate_text.set_theme_by_name(EditView.theme)
-      end
-      h9 = @model.add_listener(:line_number_visibility_changed) do |new_bool|
-        @mate_text.set_line_numbers_visible(new_bool)
+      
+      h6 = @model.add_listener(:word_wrap_changed) do |should_word_wrap|
+        @mate_text.set_word_wrap(should_word_wrap)
+        reset_right_margin
       end
+      
       h11 = @model.add_listener(:margin_column_changed) do |new_column|
         @mate_text.set_margin_column(new_column)
+        reset_right_margin
       end
+      
       h12 = @model.add_listener(:show_margin_changed) do |new_bool|
         if new_bool
           @mate_text.set_margin_column(@model.margin_column)
@@ -313,6 +335,19 @@ module Redcar
           @mate_text.set_margin_column(-1)
         end
       end
+      
+      h7 = @model.add_listener(:font_changed) do
+        @mate_text.set_font(EditView.font, EditView.font_size)
+        clear_char_width
+        reset_right_margin
+      end
+      
+      h8 = @model.add_listener(:theme_changed) do
+        @mate_text.set_theme_by_name(EditView.theme)
+      end
+      h9 = @model.add_listener(:line_number_visibility_changed) do |new_bool|
+        @mate_text.set_line_numbers_visible(new_bool)
+      end
       h13 = @model.document.add_listener(:changed) do
         @undoable_override = true
       end
@@ -336,19 +371,19 @@ module Redcar
         end
       end
     end
-    
+
     def type_character(character)
       mate_text.get_text_widget.doContent(character)
       mate_text.get_text_widget.update
     end
-    
+
     model_listener :type_character
-    
+
     def invoke_action(action_symbol)
       const = EditViewSWT::ALL_ACTIONS[action_symbol]
       mate_text.get_text_widget.invokeAction(const)
     end
-    
+
     model_listener :invoke_action
 
     class VerifyKeyListener
@@ -430,6 +465,20 @@ module Redcar
       # h = @document.add_listener(:set_text, &method(:reparse))
       # @handlers << [@document, h]
       @mate_text.get_text_widget.add_word_movement_listener(WordMoveListener.new(self))
+      @mate_text.get_text_widget.add_control_listener(ControlListener.new(self))
+    end
+    
+    class ControlListener
+      def initialize(edit_view_swt)
+        @edit_view_swt = edit_view_swt
+      end
+      
+      def controlMoved(*_)
+      end
+      
+      def controlResized(e)
+        @edit_view_swt.reset_right_margin
+      end
     end
 
     def reparse