redcar 0.9.2 → 0.10

data/plugins/document_search/features/replace.feature

@@ -8,73 +8,71 @@ Feature: Replace in file
   Scenario: Open replace speedbar
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    Then the DocumentSearch::SearchAndReplaceSpeedbar speedbar should be open
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    Then the DocumentSearch::FindAndReplaceSpeedbar speedbar should be open
 
   Scenario: Replace next occurrence on the same line
     When I replace the contents with "Foo\nBar Rab Rab\nBaz"
     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 run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "Rab" into the "Find" field in the speedbar
     And I type "RABBIT" into the "Replace" field in the speedbar
-    And I press "Replace" in the speedbar
+    And I press "Replace && Find" 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 
+    And the selected text should be "Rab"
+    And the selection range should be from 15 to 18
 
   Scenario: Replace next occurrence on the same line twice
     When I replace the contents with "Foo\nBar Rab Rab\nBaz"
     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 run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "Rab" into the "Find" field in the speedbar
     And I type "RAB" 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 && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nBar RAB RAB\nBaz"
     And the selected text should be "RAB"
-    And the selection range should be from 12 to 15
+    And the selection range should be from 8 to 11
 
   Scenario: Replace next occurrence
     When I replace the contents with "Foo\nBar\nBaz\nBar\nQux"
     And I move the cursor to 0
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "Bar" into the "Search" field in the speedbar
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
-    And I press "Replace" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nRab\nBaz\nBar\nQux"
-    And the selected text should be "Rab"
-    And the selection should be on line 1
+    And the selected text should be "Bar"
+    And the selection should be on line 3
 
   Scenario: Replace next occurrence twice
     When I replace the contents with "Foo\nBar\nBaz\nBar\nQux"
     And I move the cursor to 0
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "Bar" into the "Search" field in the speedbar
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
-    And I press "Replace" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nRab\nBaz\nBar\nQux"
-    When I press "Replace" in the speedbar
+    When I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nRab\nBaz\nRab\nQux"
-    And the selected text should be "Rab"
-    And the selection should be on line 3
+    And there should not be any text selected
 
   Scenario: Replace next occurrence wraps
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 8
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "Bar" into the "Search" field in the speedbar
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
-    When I press "Replace" in the speedbar
+    When I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nRab\nBaz"
-    And the selected text should be "Rab"
+    And there should not be any text selected
 
   Scenario: Replace all replaces one
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "Bar" into the "Search" field in the speedbar
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
-    Then I should see a message box containing "Replaced 1 occurrence"
     When I press "Replace All" in the speedbar
     Then the contents should be "Foo\nRab\nBaz"
     And the selected text should be "Rab"
@@ -83,10 +81,9 @@ Feature: Replace in file
   Scenario: Replace all replaces two
     When I replace the contents with "Foo\nBar\nBaz\nBar\nQux"
     And I move the cursor to 0
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "Bar" into the "Search" field in the speedbar
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "Bar" into the "Find" field in the speedbar
     And I type "Rab" into the "Replace" field in the speedbar
-    Then I should see a message box containing "Replaced 2 occurrences"
     When I press "Replace All" in the speedbar
     Then the contents should be "Foo\nRab\nBaz\nRab\nQux"
     And the selected text should be "Rab"
@@ -94,69 +91,79 @@ Feature: Replace in file
 
   Scenario: Replace all replaces two on the same line
     When I replace the contents with "abcabc"
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "bc" into the "Search" field in the speedbar
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "bc" into the "Find" field in the speedbar
     And I type "xx" into the "Replace" field in the speedbar
-    Then I should see a message box containing "Replaced 2 occurrences"
     When I press "Replace All" in the speedbar
     Then the contents should be "axxaxx"
 
   Scenario: Replace all replaces overlapping occurences on the same line
     When I replace the contents with "deedeedeed"
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "deed" into the "Search" field in the speedbar
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "deed" into the "Find" field in the speedbar
     And I type "misdeed" into the "Replace" field in the speedbar
-    Then I should see a message box containing "Replaced 2 occurrences"
     When I press "Replace All" in the speedbar
     Then the contents should be "misdeedeemisdeed"
 
+  Scenario: Replace all is a single undo action
+    When I replace the contents with "abcabc"
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "bc" into the "Find" field in the speedbar
+    And I type "xx" into the "Replace" field in the speedbar
+    When I press "Replace All" in the speedbar
+    Then the contents should be "axxaxx"
+    When I undo
+    Then the contents should be "abcabc"
+
   Scenario: Replace next occurrence test bug
     When I replace the contents with "the\n* Speedbars have access to the properties of the widgets in them."
     And I move the cursor to 0
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "the" into the "Search" field in the speedbar
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "the" into the "Find" field in the speedbar
     And I type "THE" into the "Replace" field in the speedbar
-    And I press "Replace" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "THE\n* Speedbars have access to the properties of the widgets in them."
-    And the selection range should be from 0 to 3
-    And I press "Replace" in the speedbar
-    Then the contents should be "THE\n* Speedbars have access to THE properties of the widgets in them."
     And the selection range should be from 31 to 34
-    And I press "Replace" in the speedbar
-    Then the contents should be "THE\n* Speedbars have access to THE properties of THE widgets in them."
+    And I press "Replace && Find" in the speedbar
+    Then the contents should be "THE\n* Speedbars have access to THE properties of the widgets in them."
     And the selection range should be from 49 to 52
-    And I press "Replace" in the speedbar
-    Then the contents should be "THE\n* Speedbars have access to THE properties of THE widgets in THEm."
+    And I press "Replace && Find" in the speedbar
+    Then the contents should be "THE\n* Speedbars have access to THE properties of THE widgets in them."
     And the selection range should be from 64 to 67
+    And I press "Replace && Find" in the speedbar
+    Then the contents should be "THE\n* Speedbars have access to THE properties of THE widgets in THEm."
+    And the selected text should be "THE"
+    And the selection should be on line 0
 
   Scenario: Replace regex with back-references
     When I replace the contents with "Curry chicken"
     And I move the cursor to 0
-    And I run the command DocumentSearch::SearchAndReplaceCommand
-    And I type "(\w+) chicken" into the "Search" field in the speedbar
+    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I choose "Regex" in the "query_type" field in the speedbar
+    And I type "(\w+) chicken" into the "Find" field in the speedbar
     And I type "\1 beef" into the "Replace" field in the speedbar
-    And I press "Replace" in the speedbar
+    And I press "Replace && Find" 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 run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I type "foo" into the "Find" 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
+    And I press "Replace && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "foobar\nfoobar\nfoobar"
-    And the selection range should be from 14 to 20
+    And the selected text should be "foo"
+    And the selection should be on line 0
 
   Scenario: The Search-and-Replace Speedbar should get initialized with the currently selected text
     When I replace the contents with "Foo\nBar\nFoo"
     And I select from 4 to 7
-    When I run the command DocumentSearch::SearchAndReplaceCommand
-    Then the "Search" field in the speedbar should have text "Bar"
+    When I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    Then the "Find" field in the speedbar should have text "Bar"
     When I type "Foo" into the "Replace" field in the speedbar
-    And I press "Replace" in the speedbar
+    And I press "Replace && Find" in the speedbar
     Then the contents should be "Foo\nFoo\nFoo"
 
-  

data/plugins/document_search/lib/document_search.rb

@@ -1,103 +1,113 @@
 require 'strscan'
-require "document_search/replace_command"
-require "document_search/replace_all_command"
-require "document_search/replace_next_command"
-require "document_search/search_and_replace"
+require "document_search/query_options"
+require "document_search/commands"
+require "document_search/find_speedbar"
+require "document_search/find_and_replace_speedbar"
 
 module DocumentSearch
   def self.menus
     Redcar::Menu::Builder.build do
       sub_menu "Edit" do
-        sub_menu "Search", :priority => 50 do
-          item "Document Search",    SearchForwardCommand
-          item "Repeat Last Search", RepeatPreviousSearchForwardCommand
-          item "Search and Replace", SearchAndReplaceCommand
+        sub_menu "Find", :priority => 50 do
+          item "Incremental Search", FindMenuCommand
+          item "Find...",            FindAndReplaceSpeedbarCommand
+          separator
+          item "Find Next",         FindNextMenuCommand
+          item "Find Previous",     FindPreviousMenuCommand
+          item "Replace and Find",    ReplaceAndFindMenuCommand
+          separator
+          item "Use Selection for Find", UseSelectionForFindMenuCommand
+          item "Use Selection for Replace", UseSelectionForReplaceMenuCommand
         end
         separator
       end
     end
   end
 
-  def self.toolbars
-    Redcar::ToolBar::Builder.build do
-      item "Search Document", :command => DocumentSearch::SearchForwardCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier.png"), :barname => :edit
-      item "Repeat Last Search", :command => DocumentSearch::RepeatPreviousSearchForwardCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier--arrow.png"), :barname => :edit
+  def self.keymaps
+    osx = Redcar::Keymap.build("main", :osx) do
+      link "Ctrl+S",      DocumentSearch::FindMenuCommand
+      link "Cmd+F",       DocumentSearch::FindAndReplaceSpeedbarCommand
+      link "Cmd+G",       DocumentSearch::FindNextMenuCommand
+      link "Cmd+Shift+G", DocumentSearch::FindPreviousMenuCommand
+      link "Cmd+Alt+F",   DocumentSearch::ReplaceAndFindMenuCommand
+      link "Cmd+E",       DocumentSearch::UseSelectionForFindMenuCommand
+      link "Cmd+Shift+E", DocumentSearch::UseSelectionForReplaceMenuCommand
     end
-  end
 
-  class SearchSpeedbar < Redcar::Speedbar
-    class << self
-      attr_accessor :previous_query
-      attr_accessor :previous_is_regex
-      attr_accessor :previous_match_case
+    linwin = Redcar::Keymap.build("main", [:linux, :windows]) do
+      link "Alt+S",        DocumentSearch::FindMenuCommand
+      link "Ctrl+F",       DocumentSearch::FindAndReplaceSpeedbarCommand
+      link "Ctrl+G",       DocumentSearch::FindNextMenuCommand
+      link "Ctrl+Shift+G", DocumentSearch::FindPreviousMenuCommand
+      link "Ctrl+E",       DocumentSearch::UseSelectionForFindMenuCommand
+      link "Alt+E",        DocumentSearch::UseSelectionForReplaceMenuCommand
     end
 
-    attr_accessor :initial_query
+    [linwin, osx]
+  end
 
-    def after_draw
-      SearchSpeedbar.previous_query ||= ""
-      self.query.value = @initial_query || SearchSpeedbar.previous_query
-      self.is_regex.value = SearchSpeedbar.previous_is_regex
-      self.match_case.value = SearchSpeedbar.previous_match_case
-      self.query.edit_view.document.select_all
+  def self.toolbars
+    Redcar::ToolBar::Builder.build do
+      item "Find", :command => DocumentSearch::FindMenuCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier.png"), :barname => :edit
+      item "Find Next", :command => DocumentSearch::FindNextMenuCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier--arrow.png"), :barname => :edit
     end
+  end
 
-    label :label, "Search:"
-    textbox :query
-
-    toggle :is_regex, 'Regex', nil, false do |v|
-      # v is true or false
-      SearchSpeedbar.previous_is_regex = v
+  class FindMenuCommand < Redcar::EditTabCommand
+    def execute
+      @speedbar = FindSpeedbar.new
+      if doc.selection?
+        @speedbar.initial_query = doc.selected_text
+      end
+      win.open_speedbar(@speedbar)
     end
+  end
 
-    toggle :match_case, 'Match case', nil, false do |v|
-      SearchSpeedbar.previous_match_case = v
+  class FindAndReplaceSpeedbarCommand < Redcar::EditTabCommand
+    def execute
+      @speedbar = FindAndReplaceSpeedbar.new
+      if doc.selection?
+        @speedbar.initial_query = doc.selected_text
+      end
+      win.open_speedbar(@speedbar)
     end
+  end
 
-    button :search, "Search", "Return" do
-      SearchSpeedbar.previous_query = query.value
-      SearchSpeedbar.previous_match_case = match_case.value
-      SearchSpeedbar.previous_is_regex = is_regex.value
-      success = SearchSpeedbar.repeat_query
+  class FindNextMenuCommand < Redcar::EditTabCommand
+    def execute
+      FindSpeedbar.find_next
     end
+  end
 
-    def self.repeat_query
-      current_query = @previous_query
-      if !@previous_is_regex
-        current_query = Regexp.escape(current_query)
-      end
-      cmd = FindNextRegex.new(Regexp.new(current_query, !@previous_match_case), true)
-      cmd.run_in_focussed_tab_edit_view
+  class FindPreviousMenuCommand < Redcar::EditTabCommand
+    def execute
+      FindSpeedbar.find_previous
     end
   end
 
-  class SearchForwardCommand < Redcar::EditTabCommand
-
+  class ReplaceAndFindMenuCommand < Redcar::EditTabCommand
     def execute
-      @speedbar = SearchSpeedbar.new
-      if doc.selection?
-        @speedbar.initial_query = doc.selected_text
-      end
-      win.open_speedbar(@speedbar)
+      FindAndReplaceSpeedbar.replace_and_find(
+        FindSpeedbar.previous_query,
+        FindAndReplaceSpeedbar.previous_replace,
+        FindSpeedbar.previous_options)
     end
   end
 
-  class RepeatPreviousSearchForwardCommand < Redcar::EditTabCommand
+  class UseSelectionForFindMenuCommand  < Redcar::EditTabCommand
     def execute
-      SearchSpeedbar.repeat_query
+      FindSpeedbar.use_selection_for_find(doc, win.speedbar)
     end
   end
 
-  class SearchAndReplaceCommand < Redcar::EditTabCommand
+  class UseSelectionForReplaceMenuCommand  < Redcar::EditTabCommand
     def execute
-      @speedbar = SearchAndReplaceSpeedbar.new
-      if doc.selection?
-        @speedbar.initial_query = doc.selected_text
-      end
-      win.open_speedbar(@speedbar)
+      FindAndReplaceSpeedbar.use_selection_for_replace(doc, win.speedbar)
     end
   end
 
+  # TODO(yozhipozhi): Figure out if this is still needed.
   class FindNextRegex < Redcar::DocumentCommand
     def initialize(re, wrap=nil)
       @re = re
@@ -110,8 +120,8 @@ module DocumentSearch
 
     def execute
       position = doc.cursor_offset
-      sc = StringScanner.new(doc.get_all_text)
-      sc.pos = position
+      sc       = StringScanner.new(doc.get_all_text)
+      sc.pos   = position
       sc.scan_until(@re)
 
       if @wrap and !sc.matched?
@@ -123,12 +133,19 @@ module DocumentSearch
       if sc.matched?
         endoff   = sc.pos
         startoff = sc.pos - sc.matched_size
+        line     = doc.line_at_offset(startoff)
+        lineoff  = startoff - doc.offset_at_line(line)
+        if lineoff < doc.smallest_visible_horizontal_index
+          horiz = lineoff
+        else
+          horiz = endoff - doc.offset_at_line(line)
+        end
         doc.set_selection_range(sc.pos, sc.pos - sc.matched_size)
-        doc.scroll_to_line(doc.line_at_offset(startoff))
+        doc.scroll_to_line(line)
+        doc.scroll_to_horizontal_offset(horiz) if horiz
         return true
       end
       false
     end
   end
-
 end

data/plugins/document_search/lib/document_search/commands.rb

@@ -0,0 +1,258 @@
+module DocumentSearch
+  # Utilities for extended search commands.
+  module FindCommandMixin
+    ### QUERY PATTERNS ###
+
+    # An instance of a search type method: Regular expression
+    def query_regex(query, options)
+      Regexp.new(query, !options.match_case)
+    end
+
+    # An instance of a search type method: Plain text search
+    def query_plain(query, options)
+      query_regex(Regexp.escape(query), options)
+    end
+
+    # An instance of a search type method: Glob text search
+    # Converts a glob pattern (* or ?) into a regex pattern
+    def query_glob(query, options)
+      # 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
+      query_regex(new_query, options)
+    end
+
+    ### SELECTION ###
+
+    # Selects the first match of query, starting from the start_pos.
+    def select_next_match(doc, start_pos, query, wrap_around)
+      scanner = StringScanner.new(doc.get_all_text)
+      scanner.pos = start_pos
+      if not scanner.scan_until(query)
+        if not wrap_around
+          return false
+        end
+
+        scanner.reset
+        if not scanner.scan_until(query)
+          return false
+        end
+      end
+
+      selection_pos = scanner.pos - scanner.matched_size
+      select_range(selection_pos, scanner.pos)
+      true
+    end
+
+    # Selects the match that first precedes the search position.
+    #
+    # The current implementation is brain-dead, but works: the document is scanned from the start
+    # up to the search position, retaining the most recent match. Many smarter, but more
+    # complicated strategies are possible; the best would be full reversal of the query regex, but
+    # that obviously has a lot of tricky aspects to it.
+    def select_previous_match(doc, search_pos, query, wrap_around)
+      previous_match = nil
+      scanner = StringScanner.new(doc.get_all_text)
+      scanner.pos = 0
+      while scanner.scan_until(query)
+        start_pos = scanner.pos - scanner.matched_size
+        if start_pos < search_pos
+          previous_match = [start_pos, scanner.pos]
+        elsif previous_match
+          select_range(*previous_match)
+          return true
+        elsif not wrap_around
+          return false
+        else
+          break
+        end
+      end
+
+      # Find the last match in the document.
+      while scanner.scan_until(query)
+        start_pos = scanner.pos - scanner.matched_size
+        previous_match = [start_pos, scanner.pos]
+      end
+
+      if previous_match
+        select_range(*previous_match)
+        return true
+      else
+        return false
+      end
+    end
+
+    # Replaces the current selection, if it matches the query completely.
+    def replace_selection_if_match(doc, start_pos, query, replace)
+      scanner = StringScanner.new(doc.selected_text)
+      scanner.check(query)
+      if (not scanner.matched?) || (scanner.matched_size != doc.selected_text.length)
+        return 0
+      end
+      matched_text = doc.get_range(start_pos, scanner.matched_size)
+      replacement_text = matched_text.gsub(query, replace)
+      doc.replace(start_pos, scanner.matched_size, replacement_text)
+      replacement_text.length
+    end
+
+    # Selects the specified range and scrolls to the start.
+    def select_range(start, stop)
+      line     = doc.line_at_offset(start)
+      lineoff  = start - doc.offset_at_line(line)
+      if lineoff < doc.smallest_visible_horizontal_index
+        horiz = lineoff
+      else
+        horiz = stop - doc.offset_at_line(line)
+      end
+      doc.set_selection_range(start, stop)
+      doc.scroll_to_line(line)
+      doc.scroll_to_horizontal_offset(horiz) if horiz
+    end
+  end
+
+
+  # Base class for find commands.
+  class FindCommandBase < Redcar::DocumentCommand
+    include FindCommandMixin
+
+    attr_reader :query
+
+    # description here
+    def initialize(query, options)
+      @options = options
+      @query = send(options.query_type, query, options)
+    end
+  end
+
+
+  # Finds the next match after the current location.
+  class FindIncrementalCommand < FindCommandBase
+    def execute
+      offsets = [doc.cursor_offset, doc.selection_offset]
+      start_pos = offsets.min
+      if select_next_match(doc, start_pos, query, @options.wrap_around)
+        true
+      else
+        # Clear selection as visual feedback that search failed.
+        doc.set_selection_range(start_pos, start_pos)
+        false
+      end
+    end
+  end
+
+
+  # Finds the next match after the current location.
+  class FindNextCommand < FindCommandBase
+    def execute
+      offsets = [doc.cursor_offset, doc.selection_offset]
+      start_pos = offsets.max
+      if select_next_match(doc, start_pos, query, @options.wrap_around)
+        true
+      else
+        # Clear selection as visual feedback that search failed.
+        doc.set_selection_range(start_pos, start_pos)
+        false
+      end
+    end
+  end
+
+
+  # Finds the previous match before the current location.
+  class FindPreviousCommand < FindCommandBase
+    def execute
+      offsets = [doc.cursor_offset, doc.selection_offset]
+      start_pos = offsets.min
+      if select_previous_match(doc, start_pos, query, @options.wrap_around)
+        true
+      else
+        # Clear selection as visual feedback that search failed.
+        doc.set_selection_range(start_pos, start_pos)
+        false
+      end
+    end
+  end
+
+
+  # Base class for replace commands.
+  class ReplaceCommandBase < Redcar::DocumentCommand
+    include FindCommandMixin
+
+    attr_reader :query, :replace
+
+    # description here
+    def initialize(query, replace, options)
+      @options = options
+      @query = send(options.query_type, query, options)
+      @replace = replace
+    end
+  end
+
+
+  # Replaces the currently selected text, if it matches the search criteria, then finds and
+  # selects the next match in the document.
+  #
+  # This command maintains the invariant that no text is replaced without first being selected, so
+  # the user always knows exactly what change is about to be made. A ramification of this policy
+  # is that, if no text is selected beforehand, or the selected text does not match the query,
+  # then "replace" portion of "replace and find" is essentially skipped, so that two button
+  # presses are required.
+  class ReplaceAndFindCommand < ReplaceCommandBase
+    def execute
+      offsets = [doc.cursor_offset, doc.selection_offset]
+      start_pos = offsets.min
+      if doc.selected_text.length > 0
+        chars_replaced = replace_selection_if_match(doc, start_pos, query, replace)
+        if chars_replaced > 0
+          start_pos += chars_replaced
+        else
+          start_pos = offsets.max
+        end
+      end
+      if select_next_match(doc, start_pos, query, @options.wrap_around)
+        true
+      else
+        # Clear selection as visual feedback that search failed.
+        doc.set_selection_range(start_pos, start_pos)
+        false
+      end
+    end
+  end
+
+
+  # Replaces all query matches.
+  class ReplaceAllCommand < ReplaceCommandBase
+    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
+        select_range(startoff + replacement_text.length, startoff)
+        true
+      else
+        false
+      end
+    end
+  end
+end