redcar 0.6.1 → 0.7

data/plugins/edit_view_swt/lib/edit_view_swt/document.rb

@@ -25,7 +25,7 @@ module Redcar
         end
         Application::Dialog.popup_menu(menu, :pointer)
       end
-
+      
       def attach_modification_listeners
         jface_document.add_document_listener(DocumentListener.new(@model))
         styledText.add_selection_listener(SelectionListener.new(@model))

data/plugins/edit_view_swt/vendor/java-mateview.rb

@@ -32,4 +32,4 @@ module JavaMateView
   end
 end
 
- 
+ 

data/plugins/find-in-project/lib/find_in_project.rb

@@ -5,10 +5,12 @@ module Redcar
   class FindInProject
     def self.menus
       Redcar::Menu::Builder.build do
-        sub_menu "Plugins" do
-          sub_menu "Find In Project", :priority => 64 do
-            item "Find In Project!", Redcar::FindInProject::OpenSearch
-            item "Edit Preferences", Redcar::FindInProject::EditPreferences
+        sub_menu "Edit" do
+          sub_menu "Search" do
+            sub_menu "Find In Project", :priority => 64 do
+              item "Find In Project!", Redcar::FindInProject::OpenSearch
+              item "Edit Preferences", Redcar::FindInProject::EditPreferences
+            end
           end
         end
       end
@@ -16,7 +18,7 @@ module Redcar
     
   def self.toolbars
     ToolBar::Builder.build do
-      item "Find in Project", :command => OpenSearch, :icon => File.join(Redcar::ICONS_DIRECTORY, "application-search-result.png"), :barname => :search
+      item "Find in Project", :command => OpenSearch, :icon => File.join(Redcar::ICONS_DIRECTORY, "application-search-result.png"), :barname => :project
     end
   end
 

data/plugins/html_view/features/step_definitions/html_view_steps.rb

@@ -7,7 +7,7 @@ Then /^the HTML tab (should say|says) "([^"]*)"$/ do |_, needle|
     started = true
     start = Time.now
     contents = get_browser_contents
-    while !contents.match(needle) && Time.now - start < limit
+    while !contents or (contents and !contents.match(needle)) && Time.now - start < limit
       contents = get_browser_contents
       sleep 0.1
     end    
@@ -19,4 +19,4 @@ Then /^the HTML tab (should say|says) "([^"]*)"$/ do |_, needle|
   # on current version of SWT and XulRunner. More info at:
   # https://bugs.eclipse.org/bugs/show_bug.cgi?id=259687
   contents.should match needle unless Redcar.platform == :windows
-end
+end

data/plugins/line_tools/features/step_definitions/line_tools_steps.rb

@@ -18,7 +18,6 @@ When /^I replace the line$/ do
   Redcar::LineTools::ReplaceLineCommand.new.run
 end
 
-
 When /^I clear the line$/ do
   Redcar::LineTools::ClearLineCommand.new.run
 end

data/plugins/line_tools/lib/line_tools.rb

@@ -5,15 +5,13 @@ module Redcar
     def self.menus
       Menu::Builder.build do
         sub_menu "Edit" do
-          group(:priority => 110) do
-            sub_menu "Line Tools" do
-              item "Raise Region", LineTools::RaiseTextCommand
-              item "Lower Region", LineTools::LowerTextCommand
-              item "Replace Line", LineTools::ReplaceLineCommand
-              item "Clear Line"  , LineTools::ClearLineCommand
-              item "Trim Line"   , LineTools::TrimLineAfterCursorCommand
-              item "Kill Line"   , LineTools::KillLineCommand
-            end
+          sub_menu "Line Tools" do
+            item "Raise Region", LineTools::RaiseTextCommand
+            item "Lower Region", LineTools::LowerTextCommand
+            item "Replace Line", LineTools::ReplaceLineCommand
+            item "Clear Line"  , LineTools::ClearLineCommand
+            item "Trim Line"   , LineTools::TrimLineAfterCursorCommand
+            item "Kill Line"   , LineTools::KillLineCommand
           end
         end
       end

data/plugins/macros/features/block_selection_in_macros.feature

@@ -0,0 +1,48 @@
+#Feature: Block selection in macros
+#  The macros should behave correctly around block selection mode.
+#
+#  Background:
+#    When I open a new edit tab
+#    Given the content is:
+#        """
+#        foo
+#        bar
+#        baz
+#        """
+#    And I move to the start of the text
+#    
+#  Scenario: Set the correct block selection mode before running the macro
+#    When I turn block selection on
+#    And I start recording a macro
+#    And I select down
+#    And I select down
+#    And I type "a"
+#    And I stop recording a macro
+#    And I turn block selection off
+#    And I move to the start of the text
+#    And I run the last recorded macro
+#    Then the content should be:
+#        """
+#        aafoo
+#        aabar
+#        aabaz
+#        """
+#        
+#  Scenario: Change block selection mode during the macro
+#    And I start recording a macro
+#    When I turn block selection on
+#    And I select down
+#    And I select down
+#    And I type "a"
+#    And I stop recording a macro
+#    And I turn block selection off
+#    And I move to the start of the text
+#    And I run the last recorded macro
+#    Then the content should be:
+#        """
+#        aafoo
+#        aabar
+#        aabaz
+#        """
+#
+    

data/plugins/macros/features/predictive_macros.feature

@@ -0,0 +1,79 @@
+Feature: Predictive macros
+  As a user
+  I want Redcar to read my mind
+  So I don't have to type stuff
+
+  Background:
+    When I open a new edit tab
+
+  Scenario: Repeat simple command sequence that is fully repeated
+    When I type "abab"
+    And I press predict
+    Then the contents should be "ababab"
+    
+  Scenario: Repeat simple command sequence that is fully repeated twice
+    When I type "abab"
+    And I press predict
+    And I press predict
+    Then the contents should be "abababab"
+
+  Scenario: Repeat simple command sequence that is partially repeated
+    When I type "aba"
+    And I press predict
+    Then the contents should be "abab"
+    
+  Scenario: Should continue repeating same prediction even if a longer pattern is spotted
+    When I type "abab"
+    And I press predict
+    And I press predict
+    And I press predict
+    Then the contents should be "ababababab"
+
+  Scenario: Can define a new pattern after repeating
+    When I type "abab"
+    And I press predict
+    When I type "cdcd"
+    And I press predict
+    Then the contents should be "abababcdcdcd"
+  
+  Scenario: Can change prediction
+    When I type "abccabcc"
+    And I press predict
+    Then the contents should be "abccabccabcc"
+    When I press alternate predict
+    Then the contents should be "abccabccc"
+  
+  Scenario: Shouldn't raise an error when there are no predictions
+    When I type "abc"
+    And I press predict
+    Then the contents should be "abc"
+    
+  Scenario: Commenting example with full repeat
+    Given I replace the contents with "foo\nbar\nbaz\nqux\nquux\ncorge"
+    And I move the cursor to 0
+    And I type "# "
+    And I move down
+    And I move left
+    And I move left
+    And I type "# "
+    And I move down
+    And I move left
+    And I move left
+    And I press predict
+    And I press predict
+    Then the contents should be "# foo\n# bar\n# baz\n# qux\n<c>quux\ncorge"
+    
+  Scenario: Commenting example with partial repeat
+    Given I replace the contents with "foo\nbar\nbaz\nqux\nquux\ncorge"
+    And I move the cursor to 0
+    And I type "# "
+    And I move down
+    And I move left
+    And I move left
+    And I type "# "
+    And I press predict
+    And I press predict
+    Then the contents should be "# foo\n# bar\n# baz\n<c>qux\nquux\ncorge"
+    
+
+    

data/plugins/macros/features/record_and_run_macro.feature

@@ -0,0 +1,87 @@
+Feature: Clear Line
+
+  Background:
+    When I open a new edit tab
+
+  Scenario: Macro with typing
+    When I start recording a macro
+    And I type "hi there "
+    And I stop recording a macro
+    And I run the last recorded macro
+    Then the contents should be "hi there hi there "
+  
+  Scenario: Check type steps move the cursor correctly
+    When I type "hello"
+    Then the cursor should be at 5
+    
+  Scenario: Check navigation steps work
+    When I type "hello"
+    And I move left
+    And I move left
+    And I move left
+    Then the cursor should be at 2
+    
+  Scenario: Macro with movement
+    When I replace the contents with "foo bar baz"
+    And I move the cursor to 0
+    And I start recording a macro
+    And I move right
+    And I move right
+    And I move right
+    And I move right
+    And I stop recording a macro
+    And I run the last recorded macro
+    Then the cursor should be at 8
+
+  Scenario: Macro with typing and movement
+    When I start recording a macro
+    And I type "foo"
+    And I move left
+    And I type "X"
+    And I move right
+    And I stop recording a macro
+    And I run the last recorded macro
+    Then the contents should be "foXofoXo"
+    
+  Scenario: Macro with typing, movement and commands
+    When I replace the contents with "foo\nbar\nbaz\n"
+    And I move the cursor to 1
+    And I start recording a macro
+    And I trim the line
+    And I move down
+    And I stop recording a macro
+    And I run the last recorded macro
+    Then the contents should be "f\nb\nbaz\n"
+    And the cursor should be at 5
+
+  Scenario: Should be able to run the last macro twice
+    When I replace the contents with "foo\nbar\nbaz\nqux\nquux"
+    And I move the cursor to 1
+    And I start recording a macro
+    And I trim the line
+    And I move down
+    And I stop recording a macro
+    And I run the last recorded macro
+    And I run the last recorded macro
+    Then the contents should be "f\nb\nb\nqux\nquux"
+    And the cursor should be at 7
+    
+  Scenario: Tabs should work correctly in macro
+    When tabs are soft, 4 spaces
+    And I start recording a macro
+    And I type "a\tb"
+    And I stop recording a macro
+    And I run the last recorded macro
+    Then the contents should be "a   ba  b"
+  
+  Scenario: Delete key in macro
+    When I replace the contents with "foo"
+    And I move the cursor to 0
+    And I start recording a macro
+    And I delete
+    And I stop recording a macro
+    And I run the last recorded macro
+    Then the contents should be "o"
+    And the cursor should be at 0
+  
+  

data/plugins/macros/features/step_definitions/macro_steps.rb

@@ -0,0 +1,66 @@
+When /I start recording a macro/ do
+  Redcar::Macros::StartStopRecordingCommand.new.run
+end
+
+When /I stop recording a macro/ do
+  Redcar::Macros::StartStopRecordingCommand.new.run
+end
+
+When /I run the last recorded macro/ do
+  Redcar::Macros::RunLastCommand.new.run
+end
+
+When /^I type "([^"]*)"$/ do |text|
+  text = text.gsub("\\t", "\t").gsub("\\n", "\n")
+  text.split(//).each do |letter|
+    edit_view = Redcar::EditView.focussed_edit_view
+    edit_view.type_character(letter[0])
+  end
+end
+
+edit_view_action_steps = {
+  :LINE_UP                => "I move up",
+  :LINE_DOWN              => "I move down",
+  :LINE_START             => "I move to the start of the line",
+  :LINE_END               => "I move to the end of the line",
+  :COLUMN_PREVIOUS        => "I move left",
+  :COLUMN_NEXT            => "I move right",
+  :PAGE_UP                => "I page up",
+  :PAGE_DOWN              => "I page down",
+  :WORD_PREVIOUS          => "I move to the previous word",
+  :WORD_NEXT              => "I move to the next word",
+  :TEXT_START             => "I move to the start of the text",
+  :TEXT_END               => "I move to the end of the text",
+  :WINDOW_START           => "I move to the start of the window",
+  :WINDOW_END             => "I move to the end of the window",
+  :SELECT_ALL             => "I select all",
+  :SELECT_LINE_UP         => "I select up",
+  :SELECT_LINE_DOWN       => "I select down",
+  :SELECT_LINE_START      => "I select to the start of the line",
+  :SELECT_LINE_END        => "I select to the end of the line",
+  :SELECT_COLUMN_PREVIOUS => "I select left",
+  :SELECT_COLUMN_NEXT     => "I select right",
+  :SELECT_PAGE_UP         => "I select page up",
+  :SELECT_PAGE_DOWN       => "I select page down",
+  :SELECT_WORD_PREVIOUS   => "I select to the previous word",
+  :SELECT_WORD_NEXT       => "I select to the next word",
+  :SELECT_TEXT_START      => "I select to the start of the text",
+  :SELECT_TEXT_END        => "I select to the end of the text",
+  :SELECT_WINDOW_START    => "I select to the start of the window",
+  :SELECT_WINDOW_END      => "I select to the end of the window",
+  :CUT                    => "dsafjl;fjsadfk",
+  :COPY                   => "asdfkjalsgj",
+  :PASTE                  => "asdfasdfe",
+  :DELETE_PREVIOUS        => "I backspace",
+  :DELETE_NEXT            => "I delete",
+  :DELETE_WORD_PREVIOUS   => "I delete to the previous word",
+  :DELETE_WORD_NEXT       => "I delete to the next word"
+}
+
+edit_view_action_steps.each do |action_symbol, step_text|
+  When step_text do
+    Redcar::EditView.focussed_edit_view.invoke_action(action_symbol)
+  end
+end
+
+

data/plugins/macros/features/step_definitions/prediction_steps.rb

@@ -0,0 +1,8 @@
+When /^I press predict$/ do
+  Redcar::Macros::PredictCommand.new.run
+end
+
+When /^I press alternate predict$/ do
+  Redcar::Macros::AlternatePredictCommand.new.run
+end
+

data/plugins/macros/features/support/env.rb

@@ -0,0 +1,2 @@
+RequireSupportFiles File.dirname(__FILE__) + "/../../../edit_view/features/"
+RequireSupportFiles File.dirname(__FILE__) + "/../../../line_tools/features/"

data/plugins/macros/lib/macros.rb

@@ -0,0 +1,167 @@
+
+require 'macros/action_sequence'
+require 'macros/commands'
+require 'macros/macro'
+require 'macros/manager_controller'
+
+require 'macros/predictive/sequence_finder'
+require 'macros/predictive/document_controller'
+
+module Redcar
+  module Macros
+    DONT_RECORD_COMMANDS = [StartStopRecordingCommand, RunLastCommand, NameLastMacroCommand]
+    
+    def self.recording
+      @recording ||= {}
+    end
+    
+    def self.session_macros
+      @session_macros ||= []
+    end
+      
+    def self.saved_macros
+      @saved_macros ||= storage['saved_macros']
+    end
+    
+    def self.save_macro(macro)
+      saved_macros << macro
+      update_storage
+    end
+    
+    def self.update_storage
+      storage['saved_macros'] = saved_macros
+    end
+    
+    class << self
+      attr_accessor :last_run
+      attr_accessor :last_run_or_recorded
+    end
+    
+    def self.storage
+      @storage ||= begin
+        storage = Plugin::Storage.new('macros')
+        storage.set_default('saved_macros', [])
+        storage
+      end
+    end
+    
+    def self.name_macro(macro_name, msg)
+      if macro = Macros.session_macros.detect {|m| m.name == macro_name }
+        result = Application::Dialog.input("Macro Name", 
+              msg, macro.name)
+        if result[:button] == :ok
+          macro.name = result[:value]
+          Macros.session_macros.delete(macro)
+          Macros.save_macro(macro)
+          Redcar.app.repeat_event(:macro_named)
+        end
+      end
+    end
+    
+    def self.rename_macro(macro_name)
+      if macro = Macros.saved_macros.detect {|m| m.name == macro_name }
+        result = Application::Dialog.input("Macro Name", 
+              "Rename macro:", macro.name)
+        if result[:button] == :ok
+          macro.name = result[:value]
+          update_storage
+          Redcar.app.repeat_event(:macro_named)
+        end
+      end
+    end
+    
+    def self.delete_macro(macro_name)
+      if macro = Macros.saved_macros.detect {|m| m.name == macro_name }
+        Macros.saved_macros.delete(macro)
+        update_storage
+      elsif macro = Macros.session_macros.detect {|m| m.name == macro_name }
+        Macros.session_macros.delete(macro)
+      end
+    end
+    
+    def self.menus
+      Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "Macros" do
+            item lambda {
+                if Macros.recording[EditView.focussed_edit_view]
+                  "Stop Recording"
+                else
+                  "Start Recording"
+                end
+              }, StartStopRecordingCommand
+            item "Run Last", RunLastCommand
+            item "Name and Save Last Recorded", NameLastMacroCommand
+            separator
+            item "Macro Manager", MacroManagerCommand
+            lazy_sub_menu "New" do
+              Macros.session_macros.reverse.each do |macro|
+                item(macro.name) { macro.run }
+              end
+            end
+            lazy_sub_menu "Saved" do
+              Macros.saved_macros.reverse.each do |macro|
+                item(macro.name) { macro.run }
+              end
+            end
+            separator
+            item "Predict", PredictCommand
+            item "Change Prediction", AlternatePredictCommand
+          end
+        end
+      end
+    end
+    
+    def self.keymaps
+      osx = Redcar::Keymap.build("main", :osx) do
+        link "Cmd+Alt+M", StartStopRecordingCommand
+        link "Cmd+Shift+M", RunLastCommand
+        link "Cmd+Alt+Shift+M", NameLastMacroCommand
+        link "Cmd+P", PredictCommand
+        link "Cmd+Alt+P", AlternatePredictCommand
+      end
+      
+      linwin = Redcar::Keymap.build("main", [:linux, :windows]) do
+        link "Ctrl+Alt+M", StartStopRecordingCommand
+        link "Ctrl+Shift+M", RunLastCommand
+        link "Ctrl+Alt+Shift+M", NameLastMacroCommand
+        link "Ctrl+P", PredictCommand
+        link "Ctrl+Alt+P", AlternatePredictCommand
+      end
+      [osx, linwin]
+    end
+    
+    def self.document_controller_types
+      [Macros::Predictive::DocumentController]
+    end
+    
+    def self.sensitivities
+      [
+        Sensitivity.new(:not_recording_a_macro, Redcar.app, false, [:tab_focussed, :macro_record_changed]) do
+          edit_view = EditView.focussed_edit_view
+          !edit_view or !Macros.recording[edit_view]
+        end,
+        Sensitivity.new(:recording_a_macro, Redcar.app, false, [:tab_focussed, :macro_record_changed]) do
+          edit_view = EditView.focussed_edit_view
+          edit_view and Macros.recording[edit_view]
+        end,
+        Sensitivity.new(:is_last_macro, Redcar.app, false, [:macro_record_changed, :macro_ran]) do
+          Macros.last_run_or_recorded
+        end,
+        Sensitivity.new(:any_macros_recorded_this_session, Redcar.app, false, [:macro_record_changed, :macro_named]) do
+          Macros.session_macros.any?
+        end,
+        Sensitivity.new(:in_prediction_mode, Redcar.app, false, [:tab_focussed, :start_prediction_mode, :end_prediction_mode]) do
+          edit_view = EditView.focussed_edit_view
+          if edit_view
+            if controller = edit_view.document.controllers(Macros::Predictive::DocumentController).first
+              controller.in_prediction_mode?
+            end
+          end
+        end
+      ]
+    end
+  end
+end
+
+