redcar 0.9.2 → 0.10

data/plugins/clojure/spec/spec_helper.rb

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

data/plugins/connection_manager/lib/connection_manager.rb

@@ -13,10 +13,10 @@ module Redcar
     def self.open_connection(c)
       Project::Manager.connect_to_remote(c.protocol, c.host, c.user, c.path, PrivateKeyStore.paths)
     end
-    
+
     class Connection < CONNECTION_SUPER_CLASS
       def to_hash
-        { 
+        {
           "name" => name,
           "host" => host,
           "port" => port,
@@ -26,22 +26,22 @@ module Redcar
         }
       end
     end
-        
+
     class OpenRemoteFilter < Command
       def execute
         FilterDialog.new.open
       end
     end
-    
-    def self.keymaps
-      osx = Redcar::Keymap.build("main", :osx) do
-        link "Cmd+P", OpenRemoteFilter
-      end
-      linwin = Redcar::Keymap.build("main", [:linux, :windows]) do
-        link "Ctrl+P", OpenRemoteFilter
-      end
-      [osx, linwin]
-    end
+
+    # def self.keymaps
+    #   osx = Redcar::Keymap.build("main", :osx) do
+    #     link "Cmd+P", OpenRemoteFilter
+    #   end
+    #   linwin = Redcar::Keymap.build("main", [:linux, :windows]) do
+    #     link "Ctrl+P", OpenRemoteFilter
+    #   end
+    #   [osx, linwin]
+    # end
 
     def self.menus
       Menu::Builder.build do

data/plugins/declarations/lib/declarations.rb

@@ -11,6 +11,7 @@ module Redcar
       Menu::Builder.build do
         sub_menu "Project" do
           item "Go to declaration", :command => Declarations::GoToTagCommand, :priority => 30
+          item "Rebuild tags file", :command => Declarations::RebuildTagsCommand, :priority => 31
         end
       end
     end
@@ -21,7 +22,7 @@ module Redcar
       end
 
       osx = Keymap.build("main", :osx) do
-        link "Cmd+G", Declarations::GoToTagCommand
+        link "Ctrl+Alt+G", Declarations::GoToTagCommand
       end
 
       [linwin, osx]
@@ -34,17 +35,17 @@ module Redcar
     def self.file_path(project)
       ::File.join(project.config_dir, 'tags')
     end
-    
+
     class ProjectRefresh < Task
       def initialize(project)
         @file_list   = project.file_list
         @project     = project
       end
-      
+
       def description
         "#{@project.path}: reparse files for declarations"
       end
-      
+
       def execute
         return if @project.remote?
         file = Declarations::File.new(Declarations.file_path(@project))
@@ -53,7 +54,7 @@ module Redcar
         Declarations.clear_tags_for_path(file.path)
       end
     end
-    
+
     def self.project_refresh_task_type
       ProjectRefresh
     end
@@ -91,14 +92,24 @@ module Redcar
       DocumentSearch::FindNextRegex.new(regexp, true).run_in_focussed_tab_edit_view
     end
 
+    class RebuildTagsCommand < Command
+      def execute
+        project = Project::Manager.focussed_project
+        tags_path = Declarations.file_path(project)
+        FileUtils.rm tags_path
+        ProjectRefresh.new(project).execute
+      end
+    end
+    
     class GoToTagCommand < EditTabCommand
+      sensitize :open_project
 
       def execute
         if Project::Manager.focussed_project.remote?
           Application::Dialog.message_box("Go to declaration doesn't work in remote projects yet :(")
           return
         end
-          
+
         if doc.selection?
           handle_tag(doc.selected_text)
         else

data/plugins/document_search/features/find.feature

@@ -0,0 +1,389 @@
+# 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
+
+  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
+
+  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 type "Bar" into the "Find" field 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 type "Foo" into the "Find" field 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 type "Foo" into the "Find" field 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 type "Foo" into the "Find" field 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
+    Then the selected text should be "Foo"
+    And the selection should be on line 0
+
+  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 type "Foo" into the "Find" field 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"
+    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
+
+  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 "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"
+
+  # Current Settings: Regex, No Match case, Wrap around
+
+  Scenario: Search for a regex matches a second time
+    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
+    Then the selected text should be "Bar"
+    When I press "Next" in the speedbar
+    Then the selected text should be "Baz"
+
+  Scenario: Doesn't search for a 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 "Plain" in the "query_type" field in the speedbar
+    And I type "Ba*" into the "Find" field 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"
+    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"
+    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
+    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 "foo" into the "Find" field 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
+    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 type "fo." into the "Find" field 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 type "foo" into the "Find" field 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: Plain, Match case, Wrap around
+
+  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 type "fo." into the "Find" field 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
+    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 type "Foo" into the "Find" field 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
+    When 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 8 to 11
+    When 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
+
+   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 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"
+    And the selected text should be "Foo"
+    And the selection range should be from 0 to 3
+    When 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 8 to 11
+    When I press "Next" in the speedbar
+    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
+    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
+    When I press "Previous" 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 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"
+    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"
+    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 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"
+    And there should not be any text selected
+    When I press "Previous" 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 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"
+    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 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
+    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
+    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
+    And I type "foo" into the "Find" field in the speedbar
+    And I close the speedbar
+    And I run the command DocumentSearch::FindMenuCommand
+    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
+    Then the "Find" field in the speedbar should have text "Flux"
+
+  Scenario: Search for a word should start from the start of a selection
+    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
+
+  Scenario: Should match the next occurence of the currently selected text
+    When I replace the contents with "Foo\nBar\nFoo"
+    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