redcar-dev 0.12.17dev → 0.12.18dev

data/plugins/auto_indenter/spec/spec_helper.rb

@@ -1,5 +1 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("auto_indenter")

data/plugins/auto_pairer/features/auto_pairer.feature

@@ -39,7 +39,7 @@ Feature: Automatically insert paired characters
   Scenario: Wrap selected text
     When I open a new edit tab
     And I type "Boris"
-    And I select from 0 to 5
+    And I select from (0,0) to (0,5)
     And I type "("
     Then the contents should be "(Boris)<c>"
 

data/plugins/comment/features/line_comment.feature

@@ -6,7 +6,7 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting a single line
     When I replace the contents with "A piece of code"
     And I switch the language to "C"
-    And I move the cursor to 5
+    And I move the cursor to (0,5)
     And I toggle comment lines
     Then the contents should be "// A pie<c>ce of code"
     When I toggle comment lines
@@ -15,14 +15,14 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Uncommenting a single line
     When I replace the contents with "# A piece of code"
     And I switch the language to "Ruby"
-    And I move the cursor to 5
+    And I move the cursor to (0,5)
     And I toggle comment lines
     Then the contents should be "A p<c>iece of code"
 
   Scenario: Commenting a single line among many
     When I replace the contents with "foo\nbar\nbaz"
     And I switch the language to "Ruby"
-    And I move the cursor to 4
+    And I move the cursor to (0,4)
     And I toggle comment lines
     Then the contents should be "foo\n<c># bar\nbaz"
     When I toggle comment lines
@@ -31,14 +31,14 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Uncommenting a single line that doesn't have the space
     When I replace the contents with "#A piece of code"
     And I switch the language to "Ruby"
-    And I move the cursor to 5
+    And I move the cursor to (0,5)
     And I toggle comment lines
     Then the contents should be "A piece of code"
 
   Scenario: Commenting several lines
     When I replace the contents with "Two pieces\nof code"
     And I switch the language to "Ruby"
-    And I select from 0 to 13
+    And I select from (0,0) to (1,2)
     And I toggle comment lines
     Then the contents should be "<s># Two pieces\n# of<c> code"
     When I toggle comment lines
@@ -47,14 +47,14 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Uncommenting several lines, not all of them have the space
     When I replace the contents with "# Two pieces\n#of code"
     And I switch the language to "Ruby"
-    And I select from 0 to 16
+    And I select from (0,0) to (1,3)
     And I toggle comment lines
     Then the contents should be "<s>Two pieces\nof<c> code"
 
   Scenario: Commenting when not all the lines begin with the comment symbol
     When I replace the contents with "# foo\n# bar\nbaz"
     And I switch the language to "Ruby"
-    And I select from 0 to 15
+    And I select from (0,0) to (2,3)
     And I toggle comment lines
     Then the contents should be "<s># # foo\n# # bar\n# baz<c>"
     When I toggle comment lines
@@ -63,7 +63,7 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting when not all the lines begin with the comment symbol, reversed
     When I replace the contents with "# foo\n# bar\nbaz"
     And I switch the language to "Ruby"
-    And I select from 15 to 0
+    And I select from (2,3) to (0,0)
     And I toggle comment lines
     Then the contents should be "<c># # foo\n# # bar\n# baz<s>"
     When I toggle comment lines
@@ -72,7 +72,7 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting a single line with the cursor on the next line
     When I replace the contents with "Two pieces\nof code"
     And I switch the language to "Ruby"
-    And I select from 0 to 11
+    And I select from (0,0) to (1,0)
     And I toggle comment lines
     Then the contents should be "<s># Two pieces\n<c>of code"
     When I toggle comment lines
@@ -81,7 +81,7 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting a single line with the cursor on the next line, reversed
     When I replace the contents with "Two pieces\nof code"
     And I switch the language to "Ruby"
-    And I select from 11 to 0
+    And I select from (1,0) to (0,0)
     And I toggle comment lines
     Then the contents should be "<c># Two pieces\n<s>of code"
     When I toggle comment lines
@@ -90,7 +90,7 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting a single line with the cursor and selection point on the same line
     When I replace the contents with "Two pieces\nof code"
     And I switch the language to "Ruby"
-    And I select from 3 to 0
+    And I select from (0,3) to (0,0)
     And I toggle comment lines
     Then the contents should be "<c># Two<s> pieces\nof code"
     When I toggle comment lines
@@ -99,7 +99,7 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Inserting a single space after comments when a line has no indentation
     When I replace the contents with "A few\nlines\nof unindented\ncode"
     And I switch the language to "Ruby"
-    And I select from 2 to 27
+    And I select from (0,2) to (3,1)
     And I toggle comment lines
     Then the contents should be "A <s># few\n# lines\n# of unindented\n# c<c>ode"
     When I toggle comment lines
@@ -116,7 +116,7 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting several lines, not from the start of one of them
     When I replace the contents with "Two pieces\nof code"
     And I switch the language to "Ruby"
-    And I select from 2 to 13
+    And I select from (0,2) to (1,2)
     And I toggle comment lines
     Then the contents should be "Tw<s># o pieces\n# of<c> code"
     When I toggle comment lines
@@ -125,7 +125,7 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting several lines, not from the start of one of them, reversed
     When I replace the contents with "Two pieces\nof code"
     And I switch the language to "Ruby"
-    And I select from 13 to 2
+    And I select from (1,2) to (0,2)
     And I toggle comment lines
     Then the contents should be "Tw<c># o pieces\n# of<s> code"
     When I toggle comment lines
@@ -134,7 +134,7 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting several lines, not from the start of one of them
     When I replace the contents with "    foo\n    bar"
     And I switch the language to "Ruby"
-    And I select from 2 to 15
+    And I select from (0,2) to (1,7)
     And I toggle comment lines
     Then the contents should be "  <s>  # foo\n    # bar<c>"
     When I toggle comment lines
@@ -143,16 +143,17 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting several lines, with mismatched indentation, beginning in the start
     When I replace the contents with "    def foo\n      dfo\n    sdfj\n  asdf\nasdf"
     And I switch the language to "Ruby"
-    And I select from 0 to 40
+    And I select from (0,0) to (4,2)
     And I toggle comment lines
     Then the contents should be "<s>#     def foo\n#       dfo\n#     sdfj\n#   asdf\n# as<c>df"
 
   Scenario: Commenting several indented lines, beginning before the text starts
     Given the content is:
 				"""
-				  <s>    def foo
-				        dfo<c>
+				      def foo
+				        dfo
 				"""
+    And I select from (0,2) to (1,11)
     And I switch the language to "Ruby"
     And I toggle comment lines
     Then the content should be:
@@ -164,9 +165,10 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting several indented lines, beginning before the text starts, reversed
     Given the content is:
 				"""
-				  <c>    def foo
-				        dfo<s>
+				      def foo
+				        dfo
 				"""
+    And I select from (1,11) to (0,2)
     And I switch the language to "Ruby"
     And I toggle comment lines
     Then the content should be:
@@ -178,9 +180,10 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting several indented lines, beginning where the text starts
     Given the content is:
 				"""
-				      <s>def foo
-				        dfo<c>
+				      def foo
+				        dfo
 				"""
+    And I select from (0,6) to (1,11)
     And I switch the language to "Ruby"
     And I toggle comment lines
     Then the content should be:
@@ -198,13 +201,14 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting several indented lines, with a whitespace only line in between
     Given the content is:
         """
-            <s>doc.compound do
+            doc.compound do
               all_lines_are_already_commented = true
               start_line_comment_offset       = nil
               insertion_column                = 1000
               
-              <c>(start_line..end_line).each do |line|
+              (start_line..end_line).each do |line|
         """
+    And I select from (0,4) to (5,6)
     And I switch the language to "Ruby"
     And I toggle comment lines
     Then the content should be:
@@ -220,13 +224,14 @@ Feature: Commenting lines by prefixing a comment string
   Scenario: Commenting several indented lines, with a blank line in between
     Given the content is:
         """
-            <s>doc.compound do
+            doc.compound do
               all_lines_are_already_commented = true
               start_line_comment_offset       = nil
               insertion_column                = 1000
         
-              <c>(start_line..end_line).each do |line|
+              (start_line..end_line).each do |line|
         """
+    And I select from (0,4) to (5,6)
     And I switch the language to "Ruby"
     And I toggle comment lines
     Then the content should be:

data/plugins/comment/features/selection_comment.feature

@@ -14,7 +14,7 @@ Feature: Commenting a selected area of text
   Scenario: Commenting a selection spanning several lines
     When I replace the contents with "a piece\nof code"
     And I switch the language to "C++"
-    And I select from 4 to 9
+    And I select from (0,4) to (1,1)
     And I toggle block comment
     Then I should see "a pi/*ece\no*/f code" in the edit tab
     And I toggle block comment

data/plugins/comment/features/step_definitions/comment_steps.rb

@@ -1,7 +1,11 @@
 When /^I toggle block comment$/ do
-  Redcar::Comment::ToggleSelectionCommentCommand.new.run
+  Swt.sync_exec do
+    Redcar::Comment::ToggleSelectionCommentCommand.new.run
+  end
 end
 
 When /^I toggle comment lines$/ do
-  Redcar::Comment::ToggleLineCommentCommand.new.run
+  Swt.sync_exec do
+    Redcar::Comment::ToggleLineCommentCommand.new.run
+  end
 end

data/plugins/comment/vendor/comment_lib.json

@@ -4,6 +4,7 @@
     "C"                           : { "line_comment" : "//"  , "start_block" : "/*"      , "end_block" : "*/"     },
     "C#"                          : { "line_comment" : "//"  , "start_block" : "/*"      , "end_block" : "*/"     },
     "C++"                         : { "line_comment" : "//"  , "start_block" : "/*"      , "end_block" : "*/"     },
+    "CSS"                         : {                          "start_block" : "/*"      , "end_block" : "*/"     },
     "Cucumber Plain Text Feature" : { "line_comment" : "#"                                                        },
     "Clojure"                     : { "line_comment" : ";"   , "start_block" : "(comment", "end_block" : ")"      },
     "CoffeeScript"                : { "line_comment" : "#"   , "start_block" : "###\n"   , "end_block" : "\n###"  },
@@ -30,6 +31,7 @@
     "RSpec"                       : { "line_comment" : "#"   , "start_block" : "=begin\n", "end_block" : "\n=end" },
     "Ruby"                        : { "line_comment" : "#"   , "start_block" : "=begin\n", "end_block" : "\n=end" },
     "Ruby on Rails"               : { "line_comment" : "#"   , "start_block" : "=begin\n", "end_block" : "\n=end" },
+    "Ruby Sass"                   : { "line_comment" : "//"                                                       },
     "Scala"                       : { "line_comment" : "//"  , "start_block" : "/*"      , "end_block" : "*/"     },
     "Scheme"                      : { "line_comment" : ";"   , "start_block" : "#|"      , "end_block" : "|#"     },
     "Shell Script (Bash)"         : { "line_comment" : "#"                                                        },

data/plugins/core/lib/core.rb

@@ -38,4 +38,30 @@ module Redcar
       PersistentCache.storage_dir = File.join(Redcar.user_dir, "cache")
     end
   end
+  
+  class TimeoutError < StandardError; end
+
+  def self.timeout(limit)
+    x = Thread.current
+    result = nil
+    y = Thread.new do
+      begin
+        result = yield
+      rescue Object => e
+        x.raise e
+      end
+    end
+    s = Time.now
+    loop do
+      if not y.alive?
+        break
+      elsif Time.now - s > limit
+        y.kill
+        raise Redcar::TimeoutError, "timed out after #{Time.now - s}s"
+        break
+      end
+      sleep 0.1
+    end
+    result
+  end
 end

data/plugins/core/spec/core/base_storage_spec.rb

@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Plugin::BaseStorage do
   

data/plugins/core/spec/core/gui_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Gui do
   before do

data/plugins/core/spec/core/observable_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+require "spec_helper"
 
 describe Redcar::Observable do
   class SeeMe

data/plugins/core/spec/core/persistent_cache_spec.rb

@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), *%w".. .. lib core persistent_cache")
+require "spec_helper"
 
 PersistentCache = Redcar::PersistentCache
 

data/plugins/core/spec/core/shared_storage_spec.rb

@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Plugin::SharedStorage do
   

data/plugins/core/spec/core/storage_spec.rb

@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Plugin::Storage do
   

data/plugins/core/spec/core/task_queue_spec.rb

@@ -1,7 +1,5 @@
 
-require 'java'
-
-require File.join(File.dirname(__FILE__), *%w".. spec_helper")
+require "spec_helper"
 
 describe Redcar::TaskQueue do
   before do

data/plugins/core/spec/spec_helper.rb

@@ -1,8 +1,5 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("core")
 
 class QuickTask < Redcar::Task
   def initialize(id=nil)

data/plugins/declarations/spec/declarations/file_spec.rb

@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 module Redcar
   describe Declarations::File do

data/plugins/declarations/spec/spec_helper.rb

@@ -1,5 +1 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("declarations")

data/plugins/document_search/features/find.feature

@@ -8,21 +8,21 @@ Feature: Find
 
   Scenario: Open Find speedbar
     When I replace the contents with "Foo\nBar\nBaz"
-    And I move the cursor to 0
-    And I open the find speedbar
+    And I move the cursor to (0,0)
+    And I select menu item "Edit|Find|Find..."
     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 open the find speedbar
+    And I move the cursor to (0,0)
+    And I select menu item "Edit|Find|Find..."
     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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "Foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -33,7 +33,7 @@ Feature: Find
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "Foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -41,7 +41,7 @@ Feature: Find
 
   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 move the cursor to (0,1)
     And I open the find speedbar
     And I type "Foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -53,7 +53,7 @@ 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 3
+    And I move the cursor to (0,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
@@ -62,7 +62,7 @@ Feature: Find
 
   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 select from (0,0) to (0,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
@@ -71,7 +71,7 @@ Feature: Find
 
   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 select from (0,0) to (0,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
@@ -80,7 +80,7 @@ Feature: Find
 
   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 select from (0,0) to (0,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
@@ -89,7 +89,7 @@ Feature: Find
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "ler" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -98,7 +98,7 @@ Feature: Find
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -107,7 +107,7 @@ Feature: Find
 
   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 move the cursor to (0,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
@@ -116,7 +116,7 @@ Feature: Find
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -137,7 +137,7 @@ Feature: Find
 
   Scenario: Should select multi-byte characters
     When I replace the contents with "Benedikt Müller"
-    And I move the cursor to 0
+    And I move the cursor to (0,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
@@ -146,7 +146,7 @@ Feature: Find
 
   Scenario: Should select multi-byte characters
     When I replace the contents with "Benedikt Müller"
-    And I move the cursor to 0
+    And I move the cursor to (0,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
@@ -155,7 +155,7 @@ Feature: Find
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "凯兰" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -164,7 +164,7 @@ Feature: Find
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "Ba." into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -172,7 +172,7 @@ Feature: Find
 
   Scenario: Search for a regex
     When I replace the contents with "Foo\nBar\nBaz"
-    And I move the cursor to 0
+    And I move the cursor to (0,0)
     And I open the find speedbar
     And I type "Ba." into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -185,7 +185,7 @@ Feature: Find
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -193,7 +193,7 @@ Feature: Find
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "fo." into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -204,36 +204,36 @@ Feature: Find
 
   Scenario: Should match case if requested
     When I replace the contents with "Foo\nBar\nBaz"
-    And I move the cursor to 0
+    And I move the cursor to (0,0)
     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 move the cursor to (0,0)
     And I press "Next" in the speedbar
     Then there should not be any text selected
     When I type "Foo" into the "Find" field in the speedbar
-    And I move the cursor to 0
+    And I move the cursor to (0,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 move the cursor to (0,0)
     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
-    And I move the cursor to 0
+    And I move the cursor to (0,0)
     And I press "Next" in the speedbar
     Then there should not be any text selected
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "Foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -251,7 +251,7 @@ 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 move the cursor to (0,0)
     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
@@ -269,7 +269,7 @@ Feature: Find
 
   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 move the cursor to (3,2)
     And I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -287,7 +287,7 @@ Feature: Find
 
   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 move the cursor to (3,2)
     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
@@ -308,7 +308,7 @@ Feature: Find
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -317,7 +317,7 @@ Feature: Find
 
   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 move the cursor to (0,0)
     And I open the find speedbar
     And I type "foo" into the "Find" field in the speedbar
     And I press "Next" in the speedbar
@@ -333,8 +333,8 @@ Feature: Find
 
   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 move the cursor to (0,0)
+    And I select from (0,0) to (0,4)
     And I open the find speedbar
     Then the "Find" field in the speedbar should have text "Flux"
 
@@ -344,7 +344,7 @@ Feature: Find
 
   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 move the cursor to (0,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
@@ -464,7 +464,7 @@ Feature: Find
 
   Scenario: Replace all replaces one
     When I replace the contents with "Foo\nBar\nBaz"
-    And I move the cursor to 0
+    And I move the cursor to (0,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
@@ -476,7 +476,7 @@ Feature: Find
 
   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 move the cursor to (0,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
@@ -527,7 +527,7 @@ Feature: Find
 
   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 move the cursor to (0,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