redcar 0.9.2 → 0.10

data/plugins/document_search/lib/document_search/find_and_replace_speedbar.rb

@@ -0,0 +1,142 @@
+module DocumentSearch
+  class FindAndReplaceSpeedbar < Redcar::Speedbar
+    NotFoundMessage = 'Not found!'
+
+    class << self
+      attr_accessor :previous_replace
+    end
+    @@previous_replace = ''
+
+    attr_accessor :initial_query
+
+    def doc
+      win = Redcar.app.focussed_window
+      tab = win.focussed_notebook_tab
+      tab.document if tab
+    end
+
+    ### UI ###
+
+    # Override num_columns to control number of rows.
+    def num_columns
+      return 7
+    end
+
+    label :label_find, "Find:"
+    textbox :query do
+      if doc
+        update_options_from_ui
+        FindSpeedbar.find_incremental
+      end
+    end
+
+    combo :query_type, ["Plain", "Regex", "Glob"], "Plain" do |val|
+      FindSpeedbar.previous_options.query_type = QueryOptions.query_type_to_symbol(val)
+      update_options_from_ui
+      FindSpeedbar.find_incremental
+    end
+
+    toggle :match_case, 'Match case', nil, false do |val|
+      FindSpeedbar.previous_options.match_case = val
+      update_options_from_ui
+      FindSpeedbar.find_incremental
+    end
+
+    toggle :wrap_around, 'Wrap around', nil, true do |val|
+      FindSpeedbar.previous_options.wrap_around = val
+      update_options_from_ui
+      FindSpeedbar.find_incremental
+    end
+
+    label :label_not_found, NotFoundMessage   # Hack: Set label for sizing, clear in after_draw
+    label :label_space_end_row1, ""
+    label :label_spacer_start_row2, ""
+
+    label :label_replace, "Replace:"
+    textbox :replace
+
+    button :replace_find, 'Replace && Find', "Return" do      
+      update_options_from_ui
+      FindAndReplaceSpeedbar.replace_and_find(
+          FindSpeedbar.previous_query, FindAndReplaceSpeedbar.previous_replace, FindSpeedbar.previous_options) or not_found
+    end
+
+    button :replace_all, "Replace All", nil do      
+      update_options_from_ui
+      FindAndReplaceSpeedbar.replace_all(
+          FindSpeedbar.previous_query, FindAndReplaceSpeedbar.previous_replace, FindSpeedbar.previous_options) or not_found
+    end
+
+    label :label_spacer_mid_row2, ""
+
+    button :find_previous, "Previous", nil do
+      update_options_from_ui
+      FindSpeedbar.find_previous or not_found
+    end
+
+    button :find_next, "Next", nil do
+      update_options_from_ui
+      FindSpeedbar.find_next or not_found
+    end
+
+    # Initializes UI elements.
+    def after_draw
+      clear_not_found
+      self.query.value = @initial_query || FindSpeedbar.previous_query
+      self.replace.value = FindAndReplaceSpeedbar.previous_replace || ""
+      self.query_type.value = QueryOptions.query_type_to_text(FindSpeedbar.previous_options.query_type)
+      self.match_case.value = FindSpeedbar.previous_options.match_case
+      self.wrap_around.value = FindSpeedbar.previous_options.wrap_around
+      self.query.edit_view.document.select_all
+    end    
+
+    # Store options specified in the UI, to be called before executing a command.
+    def update_options_from_ui
+      clear_not_found
+      FindSpeedbar.previous_query = query.value
+      FindAndReplaceSpeedbar.previous_replace = replace.value
+      FindSpeedbar.previous_options.query_type = QueryOptions.query_type_to_symbol(query_type.value)
+      FindSpeedbar.previous_options.match_case = match_case.value
+      FindSpeedbar.previous_options.wrap_around = wrap_around.value
+    end
+
+    # Sets the "Not found" label message, invoking the system beep.
+    def not_found
+      Swt::Widgets::Display.get_current.beep
+      self.label_not_found.text = NotFoundMessage
+    end
+
+    # Clears the "Not found" label message.
+    def clear_not_found
+      self.label_not_found.text = ''
+    end
+
+    ### COMMANDS ###    
+
+    def self.repeat_find_next
+      find_next(FindSpeedbar.previous_query, FindSpeedbar.previous_options) or not_found
+    end
+
+    def self.repeat_find_previous
+      find_previous(FindSpeedbar.previous_query, FindSpeedbar.previous_options) or not_found
+    end
+    
+    def self.replace_and_find(query, replace, options)
+      cmd = ReplaceAndFindCommand.new(query, replace, options)
+      cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+    end
+
+    def self.replace_all(query, replace, options)
+      cmd = ReplaceAllCommand.new(query, replace, options)
+      cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+    end
+
+    def self.use_selection_for_replace(doc, active_speedbar=nil)
+      return unless doc.selection?
+      FindAndReplaceSpeedbar.previous_replace = doc.selected_text
+      if active_speedbar && (active_speedbar.instance_of? FindAndReplaceSpeedbar)
+        active_speedbar.replace.value = FindAndReplaceSpeedbar.previous_replace
+      end
+    end
+  end
+end

data/plugins/document_search/lib/document_search/find_speedbar.rb

@@ -0,0 +1,102 @@
+module DocumentSearch
+  class FindSpeedbar < Redcar::Speedbar
+    class << self
+      attr_accessor :previous_query, :previous_options
+    end
+    @previous_query = ''
+    @previous_options = QueryOptions.new
+
+    attr_accessor :initial_query
+
+    def doc
+      win = Redcar.app.focussed_window
+      tab = win.focussed_notebook_tab
+      tab.document if tab
+    end
+
+    def after_draw
+      FindSpeedbar.previous_query ||= ""
+      self.query.value = @initial_query || FindSpeedbar.previous_query
+      self.query_type.value = QueryOptions.query_type_to_text(
+          FindSpeedbar.previous_options.query_type)
+      self.match_case.value = FindSpeedbar.previous_options.match_case
+      self.wrap_around.value = FindSpeedbar.previous_options.wrap_around
+      self.query.edit_view.document.select_all
+    end
+
+    label :label, "Find:"
+    textbox :query do |value|
+      if doc
+        update_options_from_ui
+        FindSpeedbar.find_incremental
+      end
+    end
+
+    combo :query_type, ["Plain", "Regex", "Glob"], "Plain" do |val|
+      FindSpeedbar.previous_options.query_type = QueryOptions.query_type_to_symbol(val)
+      update_options_from_ui
+      FindSpeedbar.find_incremental
+    end
+
+    toggle :match_case, 'Match case', nil, false do |val|
+      FindSpeedbar.previous_options.match_case = val
+      update_options_from_ui
+      FindSpeedbar.find_incremental
+    end
+
+    toggle :wrap_around, 'Wrap around', nil, true do |val|
+      FindSpeedbar.previous_options.wrap_around = val
+      update_options_from_ui
+      FindSpeedbar.find_incremental
+    end
+
+    button :previous, "Previous", "Alt+Return" do
+      if doc
+        update_options_from_ui
+        FindSpeedbar.find_previous
+      end
+    end
+
+    button :next, "Next", "Return" do
+      if doc
+        update_options_from_ui
+        FindSpeedbar.find_next
+      end
+    end
+
+    def update_options_from_ui
+      if doc and self.query.value and self.query.value != ""
+        FindSpeedbar.previous_query = self.query.value
+        FindSpeedbar.previous_options.query_type =
+            QueryOptions.query_type_to_symbol(self.query_type.value)
+        FindSpeedbar.previous_options.match_case = self.match_case.value
+        FindSpeedbar.previous_options.wrap_around = self.wrap_around.value
+      end
+    end
+
+    def self.find_incremental
+      cmd = FindIncrementalCommand.new(FindSpeedbar.previous_query, FindSpeedbar.previous_options)
+      cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+    end
+
+    def self.find_next
+      cmd = FindNextCommand.new(FindSpeedbar.previous_query, FindSpeedbar.previous_options)
+      cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+    end
+
+    def self.find_previous
+      cmd = FindPreviousCommand.new(FindSpeedbar.previous_query, FindSpeedbar.previous_options)
+      cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+    end
+
+    # Note: The assumption that we set find only from selected text means we don't have to update
+    # search.
+    def self.use_selection_for_find(doc, active_speedbar=nil)
+      return unless doc.selection?
+      FindSpeedbar.previous_query = doc.selected_text
+      if active_speedbar
+        active_speedbar.query.value = FindSpeedbar.previous_query
+      end
+    end
+  end
+end

data/plugins/document_search/lib/document_search/query_options.rb

@@ -0,0 +1,45 @@
+module DocumentSearch
+  # Encapsulates options for search queries.
+  class QueryOptions
+    attr_accessor :query_type
+    attr_accessor :match_case
+    attr_accessor :wrap_around
+
+    # Initializes with default options.
+    def initialize
+      @query_type = :query_plain
+      @match_case = false
+      @wrap_around = true
+    end
+
+    ### UTILITY ###
+
+    # Maps a search type combo box value to the corresponding search type symbol.
+    def self.query_type_to_symbol(query_type_text)
+      case query_type_text
+      when "Plain"
+        :query_plain
+      when "Regex"
+        :query_regex
+      when "Glob"
+        :query_glob
+      else
+        raise "Invalid query type: #{query_type_text}"
+      end
+    end
+
+    # Maps a search type symbol to a text value for the search type combo box.
+    def self.query_type_to_text(query_type_symbol)
+      case query_type_symbol
+      when :query_plain
+        'Plain'
+      when :query_regex
+        'Regex'
+      when :query_glob
+        'Glob'
+      else
+        raise "Invalid query type symbol: #{query_type_symbol}"
+      end
+    end
+  end
+end

data/plugins/edit_view/features/case_change.feature

@@ -32,25 +32,29 @@ Feature: Change Case
     And I select from 0 to 13
     And I run the command Redcar::EditView::TitlizeTextCommand
     Then the contents should be "<s>Curry Chicken<c>"
-  
+    When I replace the contents with "CURRY CHICKEN"
+    And I select from 0 to 13
+    And I run the command Redcar::EditView::TitlizeTextCommand
+    Then the contents should be "<s>Curry Chicken<c>"
+
   Scenario: Opposite case
     When I replace the contents with "Curry Chicken"
     And I select from 0 to 13
     And I run the command Redcar::EditView::OppositeCaseTextCommand
     Then the contents should be "<s>cURRY cHICKEN<c>"
-  
+
   Scenario: Camel case
     When I replace the contents with "curry_chicken"
     And I move the cursor to 13
     And I run the command Redcar::EditView::CamelCaseTextCommand
     Then the contents should be "CurryChicken<c>"
-  
+
   Scenario: Underscore
     When I replace the contents with "CurryChicken"
     And I move the cursor to 12
     And I run the command Redcar::EditView::UnderscoreTextCommand
     Then the contents should be "curry_chicke<c>n"
-    
+
   Scenario: Pascal to Underscore to Camel Case rotation
     When I replace the contents with "CurryChicken"
     And I move the cursor to 12
@@ -60,4 +64,4 @@ Feature: Change Case
     Then the contents should be "curryChicken<c>"
     When I run the command Redcar::EditView::CamelSnakePascalRotateTextCommand
     Then the contents should be "CurryChicken<c>"
-  
+

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

@@ -37,6 +37,11 @@ When /^I move the cursor to (\d+)$/ do |offset|
   doc.cursor_offset = offset.to_i
 end
 
+When /^I move the cursor to the end of the document$/ do
+  doc = Redcar.app.focussed_window.focussed_notebook.focussed_tab.edit_view.document
+  doc.cursor_offset = doc.length
+end
+
 Then /^the cursor should be at (\d+)$/ do |offset|
   doc = Redcar::EditView.focussed_tab_edit_view.document
   doc.cursor_offset.should == offset.to_i
@@ -184,6 +189,13 @@ When /^I replace the contents with 100 lines of "([^"]*)" then "([^"]*)"$/ do |c
   doc.text = (contents1 + "\n")*100 + contents2
 end
 
+When /^I replace the contents with (\d+) "([^"]*)" then "([^"]*)"$/ do |count, contents1, contents2|
+  contents1 = unescape_text(contents1)
+  contents2 = unescape_text(contents2)
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.text = (contents1)*count.to_i + contents2
+end
+
 When /^I scroll to the top of the document$/ do
   doc = Redcar::EditView.focussed_edit_view_document
   doc.scroll_to_line(0)
@@ -196,6 +208,13 @@ Then /^line number (\d+) should be visible$/ do |line_num|
   (doc.smallest_visible_line <= line_num).should be_true
 end
 
+Then /^horizontal offset (\d+) should be visible$/ do |offset|
+  offset = offset.to_i
+  doc    = Redcar::EditView.focussed_edit_view_document
+  (doc.largest_visible_horizontal_index  >= offset).should be_true
+  (doc.smallest_visible_horizontal_index <= offset).should be_true
+end
+
 When /^I select the word (right of|left of|around|at) (\d+)$/ do |direction, offset|
   offset = offset.to_i
   doc = Redcar::EditView.focussed_edit_view_document

data/plugins/edit_view/lib/edit_view.rb

@@ -63,7 +63,10 @@ module Redcar
       :DELETE_WORD_PREVIOUS,
       :DELETE_WORD_NEXT
     ]
-    
+
+    MAX_FONT_SIZE = 25
+    MIN_FONT_SIZE = 1
+
     include Redcar::Model
     extend Redcar::Observable
     include Redcar::Observable
@@ -110,7 +113,7 @@ module Redcar
         end
       end
     end
-    
+
     def self.toolbars
       ToolBar::Builder.build do
         item "Cut", :command => Redcar::Top::CutCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "scissors-blue.png"), :barname => :edit
@@ -174,7 +177,7 @@ module Redcar
     def self.esc_handlers
       [Actions::EscapeHandler]
     end
-    
+
     def self.cmd_enter_handlers
       [Actions::CmdEnterHandler]
     end
@@ -202,7 +205,7 @@ module Redcar
     def self.all_backspace_handlers
       all_handlers(:backspace)
     end
-    
+
     def self.all_cmd_enter_handlers
       all_handlers(:cmd_enter)
     end
@@ -242,7 +245,7 @@ module Redcar
     def backspace_pressed(modifiers)
       handle_key(EditView.all_backspace_handlers, modifiers)
     end
-    
+
     def cmd_enter_pressed(modifiers)
       handle_key(EditView.all_cmd_enter_handlers, modifiers)
     end
@@ -380,7 +383,7 @@ module Redcar
       @focussed = nil
       create_history
     end
-    
+
     def create_history
       @history = Document::History.new(500)
       @history.subscribe do |action|
@@ -574,25 +577,25 @@ module Redcar
       end
       @last_checked = Time.now
     end
-    
+
     # This characters have custom Redcar behaviour.
     OVERRIDDEN_CHARACTERS = {
       9 => [:tab_pressed, []]
     }
-    
+
     def type_character(character)
       unless custom_character_handle(character)
         notify_listeners(:type_character, character)
       end
       history.record(character)
     end
-    
+
     def custom_character_handle(character)
       if method_call = OVERRIDDEN_CHARACTERS[character]
         send(*method_call)
       end
     end
-    
+
     # These actions have custom Redcar implementations that
     # override the default StyledText implementation. (Mainly for
     # soft tabs purposes.)
@@ -604,13 +607,13 @@ module Redcar
       :DELETE_PREVIOUS        => Actions::BackspaceHandler,
       :DELETE_NEXT            => Actions::DeleteHandler
     }
-    
+
     def invoke_overridden_action(action_symbol)
       if handler = OVERRIDDEN_ACTIONS[action_symbol]
         handler.send(action_symbol.to_s.downcase, self)
       end
     end
-    
+
     def invoke_action(action_symbol)
       unless invoke_overridden_action(action_symbol)
         notify_listeners(:invoke_action, action_symbol)