redcar 0.10 → 0.11.0dev

data/CHANGES

@@ -1,3 +1,17 @@
+Version 0.11 (TBA)
+==================
+
+Enhancements:
+
+ * Fuzzy file finder now recognizes directories "a/c/repocontr" (Tim Felgentreff)
+ * Recent project fuzzy finder (Benedikt Müller)
+ * Improved DocumentSearch, with UI refinements, added Replace All commands (Tom Murray)
+ * Raise/lower region behaves better when you select multiple lines (Benedikt Müller)
+ * Project search backed by Lucene (Dan Lucraft)
+
+Bugfixes:
+ * Fixed Unicode problems in DocumentSearch (Tom Murray)
+
 Version 0.10 (17 January 2011)
 ==============================
 

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.10" # also change in lib/redcar.rb!
+REDCAR_VERSION = "0.11.0dev" # also change in lib/redcar.rb!
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'
@@ -41,43 +41,82 @@ task :release_docs do
   sh "rsync -e 'ssh -p #{port}' -avz doc/ danlucraft.com:#{docs_dir}/latest/"
 end
 
-### CI
-COVERAGE_DATA = "coverage.data"
-task :ci do
-  FileUtils.rm COVERAGE_DATA if File.exist?(COVERAGE_DATA)
-  Rake::Task["specs_ci"].invoke
-  Rake::Task["cucumber_ci"].invoke
+def jruby_run(cmd)
+  opts = "-J-XstartOnFirstThread" if Config::CONFIG["host_os"] =~ /darwin/
+  sh("jruby --debug #{opts} -S #{cmd}; echo 'done'")
 end
 
-def find_ci_reporter(filename)
-  jruby_gem_path = %x[jruby -rubygems -e "p Gem.path.first"].gsub("\n", "").gsub('"', "")
-  result = Dir.glob("#{jruby_gem_path}/gems/ci_reporter-*/lib/ci/reporter/rake/#{filename}.rb").reverse.first
-  result || raise("Could not find ci_reporter gem in #{jruby_gem_path}")
-end
+### CI
+namespace :ci do
+  def rspec(options = "")
+    files = Dir['plugins/*/spec/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*/*_spec.rb']
+    rspec_opts = "#{options} -c #{files.join(" ")}"
+    "$GEM_HOME/bin/spec #{rspec_opts}"
+  end
 
-def rcov_run(cmd, opts)
-  cmd = %{rcov --aggregate #{COVERAGE_DATA} -x "jsignal_internal,(erb),features/,spec/,vendor/,openssl/,yaml/,json/,yaml,gems,file:,(eval),(__FORWARDABLE__)" #{cmd} -- #{opts}}
-  jruby_run(cmd)
-end
+  def cucumber(options = "")
+    "bin/cucumber #{options} plugins/*/features"
+  end
 
-def jruby_run(cmd)
-  opts = "-J-XstartOnFirstThread" if Config::CONFIG["host_os"] =~ /darwin/
-  sh("jruby --debug #{opts} -S #{cmd} && echo 'done'")
-end
+  namespace :rcov do
+    COVERAGE_DATA = "coverage.data"
 
-task :specs_ci do
-  rspec_loader = find_ci_reporter "rspec_loader"
-  files = Dir['plugins/*/spec/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*/*_spec.rb']
-  rspec_opts = "--require #{rspec_loader} --format CI::Reporter::RSpec -c #{files.join(" ")}"
-  rcov_run('"$GEM_HOME"/bin/spec', rspec_opts)
+    def rcov_run(cmd, opts)
+      excluded_files = "jsignal_internal,(erb),features/,spec/,vendor/,openssl/,yaml/,json/,yaml,gems,file:,(eval),(__FORWARDABLE__)"
+      cmd = %{rcov --aggregate #{COVERAGE_DATA} -x "#{excluded_files}" #{cmd} -- #{opts}}
+      jruby_run(cmd)
+    end
+
+    desc "Run the coverage task for specs"
+    task :specs do
+      cmd = rspec
+      cmd, opts = cmd.split.first, cmd.split[1..-1].join(" ")
+      rcov_run(cmd, opts)
+    end
+
+    desc "Run the coverage task for features"
+    task :cucumber do
+      cmd = cucumber
+      cmd, opts = cmd.split.first, cmd.split[1..-1].join(" ")
+      rcov_run(cmd, opts)
+    end
+  end
+
+  desc "Run the coverage task"
+  task :rcov do
+    FileUtils.rm COVERAGE_DATA if File.exist?(COVERAGE_DATA)
+    Rake::Task["ci:rcov:specs"].invoke
+    Rake::Task["ci:rcov:cucumber"].invoke
+  end
+  
+  def find_ci_reporter(filename)
+    jruby_gem_path = %x[jruby -rubygems -e "p Gem.path.first"].gsub("\n", "").gsub('"', "")
+    result = Dir.glob("#{jruby_gem_path}/gems/ci_reporter-*/lib/ci/reporter/rake/#{filename}.rb").reverse.first
+    result || raise("Could not find ci_reporter gem in #{jruby_gem_path}")
+  end
+
+  desc "Run the specs with JUnit output for the Hudson reporter"
+  task :specs do
+    rspec_loader = find_ci_reporter "rspec_loader"
+    rspec_opts = "--require #{rspec_loader} --format CI::Reporter::RSpec"
+    jruby_run(rspec(rspec_opts))
+  end
+  
+  desc "Run the features with JUnit output for the Hudson reporter"
+  task :cucumber do
+    reports_folder = "features/reports"
+    FileUtils.rm_rf reports_folder if File.exist? reports_folder
+    jruby_run(cucumber("-f progress -f junit --out #{reports_folder}"))
+  end
 end
 
-task :cucumber_ci do
-  reports_folder = "features/reports"
-  FileUtils.rm_rf reports_folder if File.exist? reports_folder
-  rcov_run("bin/cucumber", "-f progress -f junit --out #{reports_folder} plugins/*/features")
+desc "Run specs and features with JUnit output"
+task :ci do
+  Rake::Task["ci:specs"].invoke
+  Rake::Task["ci:cucumber"].invoke
 end
 
+
 ### TESTS
 
 desc "Run all specs and features"

data/lib/redcar.rb

@@ -51,9 +51,9 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.10' # also change in the Rakefile!
+  VERSION         = '0.11.0dev' # also change in the Rakefile!
   VERSION_MAJOR   = 0
-  VERSION_MINOR   = 10
+  VERSION_MINOR   = 11
   VERSION_RELEASE = 0
   
   ENVIRONMENTS = [:user, :debug, :test]

data/plugins/application/lib/application/dialogs/filter_list_dialog.rb

@@ -7,7 +7,7 @@ module Redcar
   class FilterListDialog
     include Redcar::Model
     include Redcar::Observable
-    
+  
     def initialize
       self.controller = Redcar.gui.controller_for(self).new(self)
     end
@@ -110,3 +110,4 @@ module Redcar
     end
   end
 end
+

data/plugins/application_swt/spec/application_swt/gradient_spec.rb

@@ -124,19 +124,10 @@ describe Redcar::ApplicationSWT::Gradient do
     subject { Redcar::ApplicationSWT::Gradient.new( "black" ) }
     
     it "should return the SWT system color corresponding to that name" do
+      Redcar::ApplicationSWT.instance_variable_set("@display", Swt::Widgets::Display.current) if Redcar::ApplicationSWT.display.nil?
       subject.swt_colors[0].should == Redcar::ApplicationSWT.display.get_system_color(Swt::SWT::COLOR_BLACK)
     end
     
   end
-  
-  context "when constructed with the color 'none'" do
-    
-    subject { Redcar::ApplicationSWT::Gradient.new( "none" ) }
-    
-    it "should return the SWT system color corresponding to that name" do
-      subject.swt_colors[0].should == Redcar::ApplicationSWT.display.get_system_color(Swt::SWT::NONE)
-    end
-    
-  end
-  
-end
+end
+

data/plugins/core/lib/core/resource.rb

@@ -3,6 +3,10 @@ module Redcar
   class Resource
     attr_reader :block, :task
     
+    class << self
+      attr_accessor :compute_synchronously
+    end
+    
     def self.task_queue
       Redcar.app.task_queue
     end
@@ -44,11 +48,15 @@ module Redcar
     end
     
     def compute
-      @mutex.synchronize do
-        unless @task and @task.pending?
-          @task = Resource::Task.new(self)
-          @task.description = @description
-          @future = Resource.task_queue.submit(@task)
+      if Resource.compute_synchronously
+        @value = block.call
+      else
+        @mutex.synchronize do
+          unless @task and @task.pending?
+            @task = Resource::Task.new(self)
+            @task.description = @description
+            @future = Resource.task_queue.submit(@task)
+          end
         end
       end
     end

data/plugins/document_search/features/find.feature

@@ -1,78 +1,50 @@
-# Note: Because settings persist, even after the speedbar is closed, any setting changed in a
-# scenario will affect subsequent scenarios. To mitigate the chance of error, please inset a
-# "Current Settings" comment line after each scenario that changes settings.
-#
-# Because the Find speedbar and the find operations of the Find and Replace speedbar are supposed to
-# function identically, all scenarios here should be copied to find_and_replace.feature, with the
-# references to FindMenuCommand and FindSpeedbar adjusted accordingly.
-
 @speedbar
 Feature: Find
 
   Background:
     Given I open a new edit tab
 
+  # Begin: Scenarios adapted from incremental_search.feature
+
   Scenario: Open Find speedbar
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    Then the DocumentSearch::FindSpeedbar speedbar should be open
-
-  Scenario: Change settings
-    When I run the command DocumentSearch::FindMenuCommand
-    And I choose "Plain" in the "query_type" field in the speedbar
-    And I uncheck "Match case" in the speedbar
-    And I check "Wrap around" in the speedbar
-    Then "Plain" should be chosen in the "query_type" field in the speedbar
-    And "Match case" should not be checked in the speedbar
-    And "Wrap around" should be checked in the speedbar
-
-  # Current Settings: Plain, No Match case, Wrap around
+    And I open the find speedbar
+    Then I should see the find speedbar
 
   Scenario: Search for a word should select next occurrence
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
+    And I open the find speedbar
     And I type "Bar" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selected text should be "Bar"
 
   Scenario: Search twice should move to the next occurrence
     When I replace the contents with "Foo\nBar\nFoo"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
+    And I open the find speedbar
     And I type "Foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selection should be on line 0
     When I press "Next" in the speedbar
     Then the selected text should be "Foo"
     And the selection should be on line 2
 
-  Scenario: Search should incrementally update
-    When I replace the contents with "Foo\nBaar\nBaaz"
-    And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I type "Ba" into the "Find" field in the speedbar
-    Then the selected text should be "Ba"
-    And the selection should be on line 1
-    When I type "Baa" into the "Find" field in the speedbar
-    And the selection should be on line 1
-    When I type "Baaz" into the "Find" field in the speedbar
-    Then the selected text should be "Baaz"
-    And the selection should be on line 2
-    When I type "Baa" into the "Find" field in the speedbar
-    Then the selection should be on line 2
-
   Scenario: Search for a word adjacent to cursor should select word
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
+    And I open the find speedbar
     And I type "Foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selected text should be "Foo"
 
   Scenario: Search for a word should find occurrence after the cursor
     When I replace the contents with "Foo\nBar\nBaz\nFoo"
     And I move the cursor to 1
-    And I run the command DocumentSearch::FindMenuCommand
+    And I open the find speedbar
     And I type "Foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selection should be on line 3
     And the selected text should be "Foo"
     When I press "Next" in the speedbar
@@ -81,145 +53,190 @@ Feature: Find
 
   Scenario: Search for a word should wrap to earlier occurrence if none left
     When I replace the contents with "Foo\nBar\nBaz"
-    And I move the cursor to 1
-    And I run the command DocumentSearch::FindMenuCommand
+    And I move the cursor to 3
+    And I open the find speedbar
     And I type "Foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selected text should be "Foo"
     And the selection should be on line 0
 
-  Scenario: Doesn't search for a regex
-    When I replace the contents with "Foo\nBar\nBaz"
+  Scenario: Should start searching after the selection if the query matches exactly
+    When I replace the contents with "Foobar\nBarfoo\nBazhmm\nFoobar"
+    And I select from 0 to 6
+    And I open the find speedbar
+    And I type "Foobar" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "Foobar"
+    And the selection should be on line 3
+
+  Scenario: Should start search within the selection if it matches the beginning of the query
+    When I replace the contents with "Foobar\nBarfoo\nBazhmm\nFoobar"
+    And I select from 0 to 3
+    And I open the find speedbar
+    And I type "Foobar" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "Foobar"
+    And the selection range should be from 0 to 6
+
+  Scenario: Should start search within the selection if the query matches partially
+    When I replace the contents with "Foobar\nBarfoo\nBazhmm\nFoobar"
+    And I select from 0 to 6
+    And I open the find speedbar
+    And I type "Foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "Foo"
+    And the selection range should be from 0 to 3
+
+  Scenario: Not thrown off by multi-byte characters
+    When I replace the contents with "Benedikt Müller"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I type "Ba." into the "Find" field in the speedbar
-    Then there should not be any text selected
+    And I open the find speedbar
+    And I type "ler" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "ler"
+    And the selection range should be from 12 to 15
 
-  Scenario: Search for a regex
-    When I replace the contents with "Foo\nBar\nBaz"
+  Scenario: Not thrown off by multi-byte characters 2
+    When I replace the contents with "Benedikt Müller\n foo "
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I type "Ba." into the "Find" field in the speedbar
-    And I choose "Regex" in the "query_type" field in the speedbar
-    Then the selected text should be "Bar"
-    When I press "Next" in the speedbar
-    Then the selected text should be "Baz"
+    And I open the find speedbar
+    And I type "foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "foo"
+    And the selection range should be from 17 to 20
 
-  # Current Settings: Regex, No Match case, Wrap around
+  Scenario: Not thrown off by multi-byte characters 3
+    When I replace the contents with "你好, 凯兰\nYou make my heart super happy."
+    And I move the cursor to 0
+    And I open the find speedbar
+    And I type "you" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "You"
+    And the selection range should be from 7 to 10
 
-  Scenario: Search for a regex matches a second time
-    When I replace the contents with "Foo\nBar\nBaz"
+  Scenario: Handles repeated search across by multi-byte characters
+    When I replace the contents with "Foo\n你好, 凯兰\nFoo\nBar\nFoo\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I type "Ba." into the "Find" field in the speedbar
-    Then the selected text should be "Bar"
+    And I open the find speedbar
+    And I type "foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "Foo"
+    And the selection should be on line 0
     When I press "Next" in the speedbar
-    Then the selected text should be "Baz"
+    Then the selected text should be "Foo"
+    And the selection should be on line 2
+    When I press "Next" in the speedbar
+    Then the selected text should be "Foo"
+    And the selection should be on line 4
+    When I press "Next" in the speedbar
+    Then the selected text should be "Foo"
+    And the selection should be on line 0
+    When I press "Next" in the speedbar
+    Then the selected text should be "Foo"
+    And the selection should be on line 2
+
+  Scenario: Should select multi-byte characters
+    When I replace the contents with "Benedikt Müller"
+    And I move the cursor to 0
+    And I open the find speedbar
+    And I type "mül" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "Mül"
+    And the selection range should be from 9 to 12
+
+  Scenario: Should select multi-byte characters
+    When I replace the contents with "Benedikt Müller"
+    And I move the cursor to 0
+    And I open the find speedbar
+    And I type "mül" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "Mül"
+    And the selection range should be from 9 to 12
+
+  Scenario: Should select multi-byte characters 2
+    When I replace the contents with "你好, 凯兰\nYou make my heart super happy."
+    And I move the cursor to 0
+    And I open the find speedbar
+    And I type "凯兰" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "凯兰"
+    And the selection range should be from 4 to 6
 
-  Scenario: Doesn't search for a glob
+  Scenario: Doesn't search for a regex
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I choose "Plain" in the "query_type" field in the speedbar
-    And I type "Ba*" into the "Find" field in the speedbar
+    And I open the find speedbar
+    And I type "Ba." into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then there should not be any text selected
 
-  Scenario: Search for a glob
-    When I replace the contents with "Foo\nBar none I said\nBaz"
+  Scenario: Search for a regex
+    When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I type "Ba*" into the "Find" field in the speedbar
-    And I choose "Glob" in the "query_type" field in the speedbar
-    Then the selected text should be "Bar none I said"
+    And I open the find speedbar
+    And I type "Ba." into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then there should not be any text selected
+    When I check "Regex" in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "Bar"
     When I press "Next" in the speedbar
     Then the selected text should be "Baz"
 
-  # Current Settings: Glob, No Match case, Wrap around
-
-  Scenario: Should not match case if unset
+  Scenario: Should not match case by default
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I choose "Plain" in the "query_type" field in the speedbar
+    And I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selected text should be "Foo"
 
-  # Current Settings: Plain, No Match case, Wrap around
-
-  Scenario: Should not match case if unset with regex
+  Scenario: Should not match case with regex by default
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I choose "Regex" in the "query_type" field in the speedbar
+    And I open the find speedbar
     And I type "fo." into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then there should not be any text selected
+    When I check "Regex" in the speedbar
+    And I press "Next" in the speedbar
     Then the selected text should be "Foo"
 
-  # Current Settings: Regex, No Match case, Wrap around
-
-  Scenario: Should not match case if unset with glob
-    When I replace the contents with "Foo\nBar\nBaz"
-    And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I choose "Glob" in the "query_type" field in the speedbar
-    And I type "fo*" into the "Find" field in the speedbar
-    Then the selected text should be "Foo"
-
-  # Current Settings: Glob, No Match case, Wrap around
-
   Scenario: Should match case if requested
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I choose "Plain" in the "query_type" field in the speedbar
-    And I uncheck "Match case" in the speedbar
+    And I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selected text should be "Foo"
     When I check "Match case" in the speedbar
+    And I move the cursor to 0
+    And I press "Next" in the speedbar
     Then there should not be any text selected
-
-  # Current Settings: Plain, Match case, Wrap around
+    When I type "Foo" into the "Find" field in the speedbar
+    And I move the cursor to 0
+    And I press "Next" in the speedbar
+    Then the selected text should be "Foo"
 
   Scenario: Should match case if requested with regex
     When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I choose "Regex" in the "query_type" field in the speedbar
-    And I uncheck "Match case" in the speedbar
+    And I open the find speedbar
+    And I check "Regex" in the speedbar
     And I type "fo." into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selected text should be "Foo"
     When I check "Match case" in the speedbar
-    Then there should not be any text selected
-
-  # Current Settings: Regex, Match case, Wrap around
-
-  Scenario: Should match case if requested with glob
-    When I replace the contents with "Foo\nBar\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I choose "Glob" in the "query_type" field in the speedbar
-    And I uncheck "Match case" in the speedbar
-    And I type "fo*" into the "Find" field in the speedbar
-    Then the selected text should be "Foo"
-    When I check "Match case" in the speedbar
+    And I press "Next" in the speedbar
     Then there should not be any text selected
 
-  # Current Settings: Glob, Match case, Wrap around
-
-  Scenario: Reset settings
-    When I run the command DocumentSearch::FindMenuCommand
-    And I choose "Plain" in the "query_type" field in the speedbar
-    And I uncheck "Match case" in the speedbar
-    And I check "Wrap around" in the speedbar
-    Then "Plain" should be chosen in the "query_type" field in the speedbar
-    And "Match case" should not be checked in the speedbar
-    And "Wrap around" should be checked in the speedbar
-
-  # Current Settings: Plain, No Match case, Wrap around
-
   Scenario: Find next with wrap around
     When I replace the contents with "Foo\nBar Foo\nHmm\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
+    And I open the find speedbar
     And I type "Foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the contents should be "Foo\nBar Foo\nHmm\nBaz"
     And the selected text should be "Foo"
     And the selection range should be from 0 to 3
@@ -235,9 +252,10 @@ Feature: Find
    Scenario: Find next without wrap around
     When I replace the contents with "Foo\nBar Foo\nHmm\nBaz"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I open the find speedbar
     And I uncheck "Wrap around" in the speedbar
-    And I type "Foo" into the "Find" field in the speedbar
+    And I type "foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the contents should be "Foo\nBar Foo\nHmm\nBaz"
     And the selected text should be "Foo"
     And the selection range should be from 0 to 3
@@ -249,35 +267,28 @@ Feature: Find
     Then the contents should be "Foo\nBar Foo\nHmm\nBaz"
     And there should not be any text selected
 
-  # Current Settings: Plain, No Match case, No Wrap around
-
-  Scenario: Find previous with wrap around
+  Scenario: Find previous with wrap around by default
     When I replace the contents with "Foo\nBar Foo\nHmm\nBaz"
     And I move the cursor to 18
-    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
-    And I type "Foo" into the "Find" field in the speedbar
-    Then the contents should be "Foo\nBar Foo\nHmm\nBaz"
-    And there should not be any text selected
+    And I open the find speedbar
+    And I type "foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
+    Then the selected text should be "Foo"
+    And the selection range should be from 0 to 3
     When I press "Previous" in the speedbar
-    Then the contents should be "Foo\nBar Foo\nHmm\nBaz"
-    And the selected text should be "Foo"
+    Then the selected text should be "Foo"
     And the selection range should be from 8 to 11
     When I press "Previous" in the speedbar
-    Then the contents should be "Foo\nBar Foo\nHmm\nBaz"
-    And the selected text should be "Foo"
+    Then the selected text should be "Foo"
     And the selection range should be from 0 to 3
-    When I check "Wrap around" in the speedbar
-    And I press "Previous" in the speedbar
-    Then the contents should be "Foo\nBar Foo\nHmm\nBaz"
-    And the selected text should be "Foo"
+    When I press "Previous" in the speedbar
+    Then the selected text should be "Foo"
     And the selection range should be from 8 to 11
 
-  # Current Settings: Plain, No Match case, Wrap around
-
   Scenario: Find previous without wrap around
     When I replace the contents with "Foo\nBar Foo\nHmm\nBaz"
     And I move the cursor to 18
-    And I run the command DocumentSearch::FindAndReplaceSpeedbarCommand
+    And I open the find speedbar
     And I uncheck "Wrap around" in the speedbar
     And I type "Foo" into the "Find" field in the speedbar
     Then the contents should be "Foo\nBar Foo\nHmm\nBaz"
@@ -294,96 +305,237 @@ Feature: Find
     Then the contents should be "Foo\nBar Foo\nHmm\nBaz"
     And there should not be any text selected
 
-  # Current Settings: Plain, No Match case, No Wrap around
-
   Scenario: Should scroll vertically to the match
     When I replace the contents with 100 lines of "xxx" then "Foo"
     And I scroll to the top of the document
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I type "Foo" into the "Find" field in the speedbar
+    And I open the find speedbar
+    And I type "foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selected text should be "Foo"
     And line number 100 should be visible
 
   Scenario: "Should scroll horizontally to the match"
     When I replace the contents with 300 "x" then "Foo"
     And I move the cursor to 0
-    And I run the command DocumentSearch::FindMenuCommand
-    And I type "Foo" into the "Find" field in the speedbar
+    And I open the find speedbar
+    And I type "foo" into the "Find" field in the speedbar
+    And I press "Next" in the speedbar
     Then the selected text should be "Foo"
     And horizontal offset 302 should be visible
 
   Scenario: Should reopen with the same text as the previous search
-    When I run the command DocumentSearch::FindMenuCommand
+    When I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
     And I close the speedbar
-    And I run the command DocumentSearch::FindMenuCommand
+    And I open the find speedbar
     Then the "Find" field in the speedbar should have text "foo"
 
-  Scenario: Should reopen with the same value of query type as the previous search
-    When I run the command DocumentSearch::FindMenuCommand
-    And I choose "Plain" in the "query_type" field in the speedbar
-    And I close the speedbar
-    And I run the command DocumentSearch::FindMenuCommand
-    Then "Plain" should be chosen in the "query_type" field in the speedbar
-    When I choose "Regex" in the "query_type" field in the speedbar
-    And I close the speedbar
-    And I run the command DocumentSearch::FindMenuCommand
-    Then "Regex" should be chosen in the "query_type" field in the speedbar
-    When I run the command DocumentSearch::FindMenuCommand
-    And I choose "Glob" in the "query_type" field in the speedbar
-    And I close the speedbar
-    And I run the command DocumentSearch::FindMenuCommand
-    Then "Glob" should be chosen in the "query_type" field in the speedbar
-
-  # Current Settings: Glob, Match case, Wrap around
-
-  Scenario: Should reopen with the same value of Match case as the previous search
-    When I run the command DocumentSearch::FindMenuCommand
-    And I check "Match case" in the speedbar
-    And I close the speedbar
-    And I run the command DocumentSearch::FindMenuCommand
-    Then "Match case" should be checked in the speedbar
-    When I uncheck "Match case" in the speedbar
-    And I close the speedbar
-    And I run the command DocumentSearch::FindMenuCommand
-    Then "Match case" should not be checked in the speedbar
-
-  # Current Settings: Glob, No Match case, Wrap around
-
-  Scenario: Should reopen with the same value of Wrap around as the previous search
-    And I run the command DocumentSearch::FindMenuCommand
-    And I check "Wrap around" in the speedbar
-    And I close the speedbar
-    And I run the command DocumentSearch::FindMenuCommand
-    Then "Wrap around" should be checked in the speedbar
-    When I uncheck "Wrap around" in the speedbar
-    And I close the speedbar
-    And I run the command DocumentSearch::FindMenuCommand
-    Then "Wrap around" should not be checked in the speedbar
-
-  # Current Settings: Glob, No Match case, Wrap around
-
   Scenario: Should initialize query with the currently selected text
     When I replace the contents with "Flux\nBar\nFoo"
     And I move the cursor to 0
     And I select from 0 to 4
-    And I run the command DocumentSearch::FindMenuCommand
+    And I open the find speedbar
     Then the "Find" field in the speedbar should have text "Flux"
 
-  Scenario: Search for a word should start from the start of a selection
+  # End: Scenarios adapted from incremental_search.feature
+
+  # Begin: Replacement scenarios specific to Find speedbar
+
+  Scenario: Replace and find with no initial selection
+    When I replace the contents with "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And I move the cursor to 0
+    And I open the find speedbar
+    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 && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 12 to 15
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT Rab\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 19 to 22
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT RABBIT\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 30 to 33
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT RABBIT\nHmm\nRABBIT\nFoo\nBaz"
+    And the selected text should be "RAB"
+    And the selection range should be from 12 to 15
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBITBIT RABBIT\nHmm\nRABBIT\nFoo\nBaz"
+    And the selected text should be "RAB"
+    And the selection range should be from 22 to 25
+
+  Scenario: Replace and find with matching initial selection
+    When I replace the contents with "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And I select from 12 to 15
+    And I open the find speedbar
+    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 && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT Rab\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 19 to 22
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT RABBIT\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 30 to 33
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT RABBIT\nHmm\nRABBIT\nFoo\nBaz"
+    And the selected text should be "RAB"
+    And the selection range should be from 12 to 15
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBITBIT RABBIT\nHmm\nRABBIT\nFoo\nBaz"
+    And the selected text should be "RAB"
+    And the selection range should be from 22 to 25
+
+  Scenario: Replace and find with initial selection that doesn't match
+    When I replace the contents with "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And I select from 4 to 7
+    And I open the find speedbar
+    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 && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 12 to 15
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT Rab\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 19 to 22
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT RABBIT\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 30 to 33
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT RABBIT\nHmm\nRABBIT\nFoo\nBaz"
+    And the selected text should be "RAB"
+    And the selection range should be from 12 to 15
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBITBIT RABBIT\nHmm\nRABBIT\nFoo\nBaz"
+    And the selected text should be "RAB"
+    And the selection range should be from 22 to 25
+
+  Scenario: Replace and find with initial selection that is after last match
+    When I replace the contents with "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And I select from 28 to 31
+    And I open the find speedbar
+    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 && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 12 to 15
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT Rab\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 19 to 22
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT RABBIT\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 30 to 33
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBIT RABBIT\nHmm\nRABBIT\nFoo\nBaz"
+    And the selected text should be "RAB"
+    And the selection range should be from 12 to 15
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo RABBITBIT RABBIT\nHmm\nRABBIT\nFoo\nBaz"
+    And the selected text should be "RAB"
+    And the selection range should be from 22 to 25
+
+  Scenario: Replace and find with initial selection that is after last match and no wrap around
+    When I replace the contents with "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And I select from 28 to 31
+    And I open the find speedbar
+    And I type "Rab" into the "Find" field in the speedbar
+    And I type "RABBIT" into the "Replace" field in the speedbar
+    And I uncheck "Wrap around" in the speedbar
+    And I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be ""
+    And the selection range should be from 31 to 31
+    When I press "Replace && Find" in the speedbar
+    Then the contents should be "Foo\nBar Foo Rab Rab\nHmm\nRab\nFoo\nBaz"
+    And the selected text should be ""
+    And the selection range should be from 31 to 31
+
+  Scenario: Replace all replaces one
     When I replace the contents with "Foo\nBar\nBaz"
-    And I select from 5 to 8
-    And I run the command DocumentSearch::FindMenuCommand
-    And I type "Ba" into the "Find" field in the speedbar
-    Then the selected text should be "Ba"
-    And the selection should be on line 2
+    And I move the cursor to 0
+    And I open the find speedbar
+    And I type "Bar" into the "Find" field in the speedbar
+    And I type "Rab" into the "Replace" field in the speedbar
+    And I uncheck "Wrap around" in the speedbar
+    And I press "Replace All" in the speedbar
+    Then the contents should be "Foo\nRab\nBaz"
+    And the selected text should be "Rab"
+    And the selection range should be from 4 to 7
 
-  Scenario: Should match the next occurence of the currently selected text
-    When I replace the contents with "Foo\nBar\nFoo"
+  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 select from 0 to 3
-    And I run the command DocumentSearch::FindMenuCommand
-    And I press "Next" in the speedbar
-    Then the selected text should be "Foo"
-    And line number 2 should be visible
+    And I open the find speedbar
+    And I type "Bar" into the "Find" field in the speedbar
+    And I type "Rab" into the "Replace" field in the speedbar
+    And I uncheck "Wrap around" in the speedbar
+    And I press "Replace All" in the speedbar
+    Then the contents should be "Foo\nRab\nBaz\nRab\nQux"
+    And the selected text should be "Rab"
+    And the selection range should be from 12 to 15
+
+  Scenario: Replace all replaces two on the same line
+    When I replace the contents with "abcabc"
+    And I open the find speedbar
+    And I type "bc" into the "Find" field in the speedbar
+    And I type "xx" into the "Replace" field in the speedbar
+    And I uncheck "Wrap around" in the speedbar
+    And I press "Replace All" in the speedbar
+    Then the contents should be "axxaxx"
+    And the selected text should be "xx"
+    And the selection range should be from 4 to 6
+    When I press "Replace All" in the speedbar
+    Then the contents should be "axxaxx"
+    And the selected text should be "xx"
+    And the selection range should be from 4 to 6
+
+  Scenario: Replace all replaces overlapping occurences on the same line
+    When I replace the contents with "deedeedeed"
+    And I open the find speedbar
+    And I type "deed" into the "Find" field in the speedbar
+    And I type "misdeed" into the "Replace" field in the speedbar
+    And I uncheck "Wrap around" in the speedbar
+    And I press "Replace All" in the speedbar
+    Then the contents should be "misdeedeemisdeed"
+    And the selected text should be "misdeed"
+    And the selection range should be from 9 to 16
+
+  Scenario: Replace all is a single undo action
+    When I replace the contents with "Foo\n\nabcabc\n\nBar"
+    And I open the find speedbar
+    And I type "bc" into the "Find" field in the speedbar
+    And I type "xx" into the "Replace" field in the speedbar
+    And I uncheck "Wrap around" in the speedbar
+    And I press "Replace All" in the speedbar
+    Then the contents should be "Foo\n\naxxaxx\n\nBar"
+    And the selected text should be "xx"
+    And the selection range should be from 9 to 11
+    When I undo
+    Then the contents should be "Foo\n\nabcabc\n\nBar"
+
+  Scenario: Replace all regex with back-references
+    When I replace the contents with "One fish\ntwo fish\nred fish\nblue fish"
+    And I move the cursor to 0
+    And I open the find speedbar
+    And I type "(\w+) fish" into the "Find" field in the speedbar
+    And I type "\1 car" into the "Replace" field in the speedbar
+    And I check "Regex" in the speedbar
+    And I uncheck "Wrap around" in the speedbar
+    And I press "Replace All" in the speedbar
+    Then the contents should be "One car\ntwo car\nred car\nblue car"
+    And the selected text should be "blue car"
+    And the selection range should be from 24 to 32
+
+  # End: Replacement scenarios specific to Find speedbar