redcar 0.5 → 0.5.1dev

data/plugins/declarations/spec/spec_helper.rb

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

data/plugins/document_search/features/replace.feature

@@ -16,11 +16,11 @@ Feature: Replace in file
     And I move the cursor to 4
     And I run the command DocumentSearch::SearchAndReplaceCommand
     And I type "Rab" into the "Search" field in the speedbar
-    And I type "RABBIT" into the "Replace" field in the speedbar
+    And I type "RAB" into the "Replace" field in the speedbar
     And I press "Replace" in the speedbar
-    Then the contents should be "Foo\nBar RABBIT Rab\nBaz"
-    And the selected text should be "RABBIT"
-    And the selection range should be from 8 to 14 
+    Then the contents should be "Foo\nBar RAB Rab\nBaz"
+    And the selected text should be "RAB"
+    And the selection range should be from 8 to 11 
 
   Scenario: Replace next occurrence on the same line twice
     When I replace the contents with "Foo\nBar Rab Rab\nBaz"
@@ -120,17 +120,4 @@ Feature: Replace in file
     And I press "Replace" in the speedbar
     Then the contents should be "Curry beef"
 
-  Scenario: Replace should move past the current replacement if the query is a substring of the replacement
-    When I replace the contents with "foo\nfoo\nfoo"
-    And I move the cursor to 0
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "foo" into the "Search" field in the speedbar
-    And I type "foobar" into the "Replace" field in the speedbar
-    And I press "Replace" in the speedbar
-    And I press "Replace" in the speedbar
-    And I press "Replace" in the speedbar
-    Then the contents should be "foobar\nfoobar\nfoobar"
-    And the selection range should be from 14 to 20
-  
-  
   

data/plugins/document_search/lib/document_search/replace.rb

@@ -5,11 +5,9 @@ module DocumentSearch
     end
     
     def replace_next(query, replace, &body)
-      # Get the current line and then get the line segment from the cursor or selection to the end of the line
-      latest_point = [@doc.cursor_offset, @doc.selection_offset].max
-      curr_line_number = @doc.line_at_offset(latest_point)
-      cursor_line_offset = latest_point - @doc.offset_at_line(curr_line_number)
-      curr_line = @doc.get_line(curr_line_number)
+      # Get the current line and then get the line segment from the cursor to the end of the line
+      curr_line = @doc.get_line(@doc.cursor_line)
+      cursor_line_offset = @doc.cursor_offset - @doc.offset_at_line(@doc.cursor_line)
       line_seg = curr_line[cursor_line_offset..-1]
       
       # Call the search method passed by the caller

data/plugins/document_search/lib/document_search/search.rb

@@ -2,26 +2,27 @@ module DocumentSearch
   class Search
     # An instance of a search type method: Regular expression
     def self.regex_search_method(line, query, replace)
-      re = /#{query}/
-      if match_data = line.match(re)
-        new_text = match_data.to_s.sub(re, replace)
-        new_line = match_data.pre_match + new_text + match_data.post_match
+      new_line = line.sub(/#{query}/, replace)
+
+      if match = $~
+        startoff = match.pre_match.length
+        endoff   = (startoff + match[0].length) - 1
         
-        startoff = match_data.pre_match.length
-        endoff   = startoff + new_text.length
-          
-        return new_line, startoff, endoff
+        return new_line, startoff, startoff + match[0].length
       end
+      return nil
     end
 
     # An instance of a search type method: Plain text search
     def self.plain_search_method(line, query, replace)
-      if i = line.index(query)
+      i = line.index(query)
+      if i
         startoff = i
         endoff   = i + query.length - 1
         line[startoff..endoff] = replace
         return line, startoff, startoff + replace.length
       end
+      return nil
     end
     
     # An instance of a search type method: Glob text search

data/plugins/edit_view/features/cut_and_paste.feature

@@ -1,23 +1,23 @@
 Feature: Cut and Paste
 
-  Background: 
-    When I open a new edit tab
-
   Scenario: Cut removes the text
-    When I replace the contents with "Frank"
+    When I open a new edit tab
+    And I replace the contents with "Frank"
     And I select from 0 to 3
     And I cut text
     Then I should not see "Fra" in the edit tab  
     And I should see "nk" in the edit tab  
 
   Scenario: Copy leaves the text
-    When I replace the contents with "Frank"
+    When I open a new edit tab
+    And I replace the contents with "Frank"
     And I select from 0 to 3
     And I copy text
     Then I should see "Frank" in the edit tab  
 
   Scenario: Paste inserts the cut text
-    When I replace the contents with "Frank"
+    When I open a new edit tab
+    And I replace the contents with "Frank"
     And I select from 0 to 3
     And I cut text
     And I move the cursor to 2
@@ -25,7 +25,8 @@ Feature: Cut and Paste
     Then the contents should be "nkFra<c>"
 
   Scenario: Paste inserts the copied text
-    When I replace the contents with "Frank"
+    When I open a new edit tab
+    And I replace the contents with "Frank"
     And I select from 0 to 3
     And I copy text
     And I move the cursor to 2
@@ -34,7 +35,8 @@ Feature: Cut and Paste
     Then the contents should be "FrFra<c>ank"
 
   Scenario: Paste pastes the most recent copy
-    When I replace the contents with "Frank"
+    When I open a new edit tab
+    And I replace the contents with "Frank"
     And I select from 0 to 3
     And I copy text
     And I select from 3 to 5

data/plugins/edit_view/lib/edit_view.rb

@@ -24,7 +24,7 @@ module Redcar
     include Redcar::Model
     extend Redcar::Observable
     include Redcar::Observable
-
+    
     extend Forwardable
 
     module Handler
@@ -33,21 +33,21 @@ module Redcar
       def handle(edit_view, modifiers)
       end
     end
-
+    
     class << self
       attr_reader :undo_sensitivity, :redo_sensitivity
       attr_reader :focussed_edit_view
     end
-
+    
     def self.tab_settings
       @tab_settings ||= TabSettings.new
     end
 
-    # unused?
+    # unused?      
     def self.storage
       @storage ||= Plugin::Storage.new('edit_view_plugin')
     end
-
+    
     def self.menus
       Menu::Builder.build do
         sub_menu "Edit" do
@@ -68,29 +68,6 @@ module Redcar
       end
     end
 
-    def self.edit_view_context_menus
-      Menu::Builder.build do
-        group(:priority => :first) do
-          item ("Cut"  ) { Redcar::Top::CutCommand.new.run  }
-          item ("Copy" ) { Redcar::Top::CopyCommand.new.run }
-          item ("Paste") { Redcar::Top::PasteCommand.new.run}
-        end
-        group(:priority => 20) do
-          separator
-          sub_menu "Convert Text" do
-            item ("to Uppercase")     {EditView::UpcaseTextCommand.new.run}
-            item ("to Lowercase")     {EditView::DowncaseTextCommand.new.run}
-            item ("to Titlecase")     {EditView::TitlizeTextCommand.new.run}
-            item ("to Opposite Case") {EditView::OppositeCaseTextCommand.new.run}
-            separator
-            item ("to CamelCase")                           {EditView::CamelCaseTextCommand.new.run}
-            item ("to snake_case")                          {EditView::UnderscoreTextCommand.new.run}
-            item ("Toggle PascalCase-underscore-camelCase") {EditView::CamelSnakePascalRotateTextCommand.new.run}
-          end
-        end
-      end
-    end
-
     def self.all_handlers(type)
       result = []
       method_name = :"#{type}_handlers"
@@ -103,31 +80,31 @@ module Redcar
     def self.arrow_left_handlers
       [Actions::ArrowLeftHandler]
     end
-
+    
     def self.arrow_right_handlers
       [Actions::ArrowRightHandler]
     end
-
+    
     def self.tab_handlers
       [Actions::IndentTabHandler]
     end
-
+    
     def self.backspace_handlers
       [Actions::BackspaceHandler]
     end
-
+    
     def self.delete_handlers
       [Actions::DeleteHandler]
     end
-
+    
     def self.esc_handlers
       [Actions::EscapeHandler]
     end
-
+    
     def self.all_tab_handlers
       all_handlers(:tab)
     end
-
+    
     def self.all_esc_handlers
       all_handlers(:esc)
     end
@@ -163,27 +140,27 @@ module Redcar
     def tab_pressed(modifiers)
       handle_key(EditView.all_tab_handlers, modifiers)
     end
-
+    
     def esc_pressed(modifiers)
       handle_key(EditView.all_esc_handlers, modifiers)
     end
-
+    
     def left_pressed(modifiers)
       handle_key(EditView.all_arrow_left_handlers, modifiers)
     end
-
+    
     def right_pressed(modifiers)
       handle_key(EditView.all_arrow_right_handlers, modifiers)
     end
-
+    
     def delete_pressed(modifiers)
       handle_key(EditView.all_delete_handlers, modifiers)
     end
-
+    
     def backspace_pressed(modifiers)
       handle_key(EditView.all_backspace_handlers, modifiers)
     end
-
+    
     # Called by the GUI whenever an EditView is focussed or
     # loses focus. Sends :focussed_edit_view event.
     #
@@ -197,14 +174,14 @@ module Redcar
       edit_view.check_for_updated_document if edit_view
       notify_listeners(:focussed_edit_view, edit_view)
     end
-
+    
     def self.current
       tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
       if tab.is_a?(Redcar::EditTab)
         tab.edit_view
       end
     end
-
+    
     def self.sensitivities
       [
         Sensitivity.new(:edit_tab_focussed, Redcar.app, false, [:tab_focussed]) do |tab|
@@ -219,12 +196,12 @@ module Redcar
             tab and tab.is_a?(EditTab) and tab.edit_view.document.selection?
           end
         end,
-        @undo_sensitivity =
+        @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 =
+        @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?
@@ -246,36 +223,36 @@ module Redcar
         default_font = "Courier New"
         default_font_size = 9
       end
-      [ EditView.storage["font"] || default_font,
+      [ EditView.storage["font"] || default_font, 
         EditView.storage["font-size"] || default_font_size ]
     end
-
+    
     def self.font
       font_info[0]
     end
-
+    
     def self.font_size
       font_info[1]
     end
-
+    
     def self.font=(font)
       EditView.storage["font"] = font
       all_edit_views.each {|ev| ev.refresh_font }
-    end
-
-    def refresh_font
+    end    
+    
+    def refresh_font      
       notify_listeners(:font_changed)
     end
-
+    
     def self.font_size=(size)
       EditView.storage["font-size"] = size
       all_edit_views.each {|ev| ev.refresh_font }
     end
-
+    
     def self.theme
       EditView.storage["theme"] || "Twilight"
     end
-
+    
     def self.theme=(theme)
       theme.gsub!(/ \(Current\)$/, '')
       EditView.storage["theme"] = theme
@@ -288,55 +265,55 @@ module Redcar
     def self.themes
       @themes ||= []
     end
-
+    
     def refresh_theme
       notify_listeners(:theme_changed)
     end
-
+    
     def self.focussed_tab_edit_view
       Redcar.app.focussed_notebook_tab.edit_view if Redcar.app.focussed_notebook_tab and Redcar.app.focussed_notebook_tab.edit_tab?
     end
-
+    
     def self.focussed_edit_view_document
       focussed_tab_edit_view.document if focussed_tab_edit_view
     end
-
+    
     def self.focussed_document_mirror
       focussed_edit_view_document.mirror if focussed_edit_view_document
     end
-
+    
     def self.all_edit_views
       Redcar.app.windows.map {|w| w.notebooks.map {|n| n.tabs}.flatten }.flatten.select {|t| t.is_a?(EditTab)}.map {|t| t.edit_view}
     end
-
+    
     attr_reader :document
-
+    
     def initialize
       create_document
       @grammar = nil
       @focussed = nil
     end
-
+    
     def create_document
       @document = Redcar::Document.new(self)
     end
-
+    
     def_delegators :controller, :undo,      :redo,
                                 :undoable?, :redoable?,
                                 :reset_undo,
                                 :cursor_offset, :cursor_offset=,
                                 :scroll_to_line, :compound,
                                 :begin_compound, :end_compound
-
+    
     def grammar
       @grammar
     end
-
+    
     def grammar=(name)
       set_grammar(name)
       notify_listeners(:grammar_changed, name)
     end
-
+    
     def set_grammar(name)
       @grammar = name
       self.tab_width     = EditView.tab_settings.width_for(name)
@@ -348,11 +325,11 @@ module Redcar
       refresh_show_line_numbers
       refresh_show_annotations
     end
-
+    
     def focus
       notify_listeners(:focussed)
     end
-
+    
     def exists?
       controller.exists?
     end
@@ -360,57 +337,57 @@ module Redcar
     def tab_width
       @tab_width
     end
-
+    
     def tab_width=(val)
       @tab_width = val
       EditView.tab_settings.set_width_for(grammar, val)
       notify_listeners(:tab_width_changed, val)
     end
-
+    
     def set_tab_width(val)
       @tab_width = val
     end
-
+    
     def soft_tabs?
       @soft_tabs
     end
-
+    
     def soft_tabs=(bool)
       @soft_tabs = bool
       EditView.tab_settings.set_softness_for(grammar, bool)
       notify_listeners(:softness_changed, bool)
     end
-
+    
     def show_margin?
       @show_margin
     end
-
+    
     def show_margin=(bool)
       @show_margin = bool
       EditView.tab_settings.set_show_margin_for(grammar, bool)
       notify_listeners(:show_margin_changed, bool)
     end
-
+    
     def word_wrap?
       @word_wrap
     end
-
+    
     def word_wrap=(bool)
       @word_wrap = bool
       EditView.tab_settings.set_word_wrap_for(grammar, bool)
       notify_listeners(:word_wrap_changed, bool)
     end
-
+    
     def margin_column
       @margin_column
     end
-
+    
     def margin_column=(val)
       @margin_column = val
       EditView.tab_settings.set_margin_column_for(grammar, val)
       notify_listeners(:margin_column_changed, val)
     end
-
+    
     def show_invisibles?
       @show_invisibles
     end
@@ -423,7 +400,7 @@ module Redcar
       EditView.tab_settings.set_show_invisibles(bool)
       all_edit_views.each {|ev| ev.refresh_show_invisibles }
     end
-
+    
     def refresh_show_invisibles
       @show_invisibles = EditView.tab_settings.show_invisibles?
       notify_listeners(:invisibles_changed, @show_invisibles)
@@ -441,7 +418,7 @@ module Redcar
       EditView.tab_settings.set_show_line_numbers(bool)
       all_edit_views.each {|ev| ev.refresh_show_line_numbers }
     end
-
+    
     def refresh_show_line_numbers
       @show_line_numbers = EditView.tab_settings.show_line_numbers?
       notify_listeners(:line_number_visibility_changed, @show_line_numbers)
@@ -459,7 +436,7 @@ module Redcar
       EditView.tab_settings.set_show_annotations(bool)
       all_edit_views.each {|ev| ev.refresh_show_annotations }
     end
-
+    
     def refresh_show_annotations
       @show_annotations = EditView.tab_settings.show_annotations?
       notify_listeners(:annotations_visibility_changed, @show_annotations)
@@ -474,30 +451,30 @@ module Redcar
         :cursor_offset => cursor_offset,
         :grammar       => grammar         }
     end
-
+    
     def deserialize(data)
       self.grammar       = data[:grammar]
       document.text      = data[:contents]
       self.cursor_offset = data[:cursor_offset]
     end
-
+    
     def delay_parsing
       controller.delay_parsing { yield }
     end
-
+    
     def reset_last_checked
       @last_checked = Time.now
     end
-
+    
     def check_for_updated_document
       # awful forward dependency on the Project plugin here....
-      if document and
-            document.mirror and
-            document.mirror.is_a?(Project::FileMirror) and
+      if document and 
+            document.mirror and 
+            document.mirror.is_a?(Project::FileMirror) and 
             document.mirror.changed_since?(@last_checked)
         if document.modified?
           result = Application::Dialog.message_box(
-                     "This file has been changed on disc, and you have unsaved changes in Redcar.\n\n" +
+                     "This file has been changed on disc, and you have unsaved changes in Redcar.\n\n" + 
                      "Revert to version on disc (and lose your changes)?",
                      :buttons => :yes_no
                     )
@@ -512,4 +489,5 @@ module Redcar
       @last_checked = Time.now
     end
   end
-end
+end
+