redcar 0.7 → 0.8

data/plugins/comment/plugin.rb

@@ -0,0 +1,7 @@
+Plugin.define do
+  name    "comment"
+  version "0.1"
+  file    "lib", "comment"
+  object  "Redcar::Comment"
+  dependencies "redcar", ">0"
+end

data/plugins/comment/vendor/comment_lib.json

@@ -0,0 +1,47 @@
+{
+    "Ada"                         : { "line_comment" : "--"  },
+    "BASIC"                       : { "line_comment" : "REM" },
+    "C"                           : { "line_comment" : "//"  , "start_block" : "/*", "end_block" : "*/"          },
+    "C#"                          : { "line_comment" : "//"  , "start_block" : "/*", "end_block" : "*/"          },
+    "C++"                         : { "line_comment" : "//"  , "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###" },
+    "D"                           : { "line_comment" : "//"  , "start_block" : "/+"      , "end_block" : "+/"    },
+    "Easyb"                       : { "line_comment" : "//"  , "start_block" : "/*"      , "end_block" : "*/"    },
+    "FORTRAN"                     : { "line_comment" : "C"  },
+    "GNU Smalltalk"               : { "start_block"  : "\""  , "end_block"   : "\""   },
+    "Grails Server Page"          : { "start_block"  : "<%--", "end_block"   : "--%>" },
+    "Groovy"                      : { "line_comment" : "//"  , "start_block" : "/*"    , "end_block" : "*/" },
+    "Haskell"                     : { "start_block"  : "{-"  , "end_block"   : "-}"   },
+    "HTML"                        : { "start_block"  : "<!--", "end_block"   : "-->"  },
+    "Java"                        : { "line_comment" : "//"  , "start_block" : "/*"    , "end_block" : "*/" },
+    "JavaScript"                  : { "line_comment" : "//"  , "start_block" : "/*"    , "end_block" : "*/" },
+    "LaTeX"                       : { "line_comment" : "%"  },
+    "Lisp"                        : { "line_comment" : ";"   , "start_block" : "#|"      , "end_block" : "|#"     },
+    "Lua"                         : { "line_comment" : "--"  , "start_block" : "--[["    , "end_block" : "]]"     },
+    "Mathematica"                 : { "start_block"  : "% (*", "end_block"   : "*)"     },
+    "Matlab"                      : { "line_comment" : "%"   , "start_block" : "%{\n"    , "end_block" : "\n%}"   },
+    "Perl"                        : { "line_comment" : "#"   , "start_block" : "=begin\n", "end_block" : "\n=end" },
+    "PHP"                         : { "line_comment" : "//"  , "start_block" : "/*"      , "end_block" : "*/"     },
+    "Postscript"                  : { "line_comment" : "%"  },
+    "Powershell"                  : { "line_comment" : "#"   , "start_block" : "<#"      , "end_block" : "#>"     },
+    "Python"                      : { "line_comment" : "#"   , "start_block" : "\"\"\""  , "end_block" : "\"\"\"" },
+    "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" },
+    "Scala"                       : { "line_comment" : "//"  , "start_block" : "/*"      , "end_block" : "*/"     },
+    "Scheme"                      : { "line_comment" : ";"   , "start_block" : "#|"      , "end_block" : "|#"     },
+    "Shell Script (Bash)"         : { "line_comment" : "#"  },
+    "Simula"                      : { "start_block"  : "comment", "end_block": ";"      },
+    "Smarty"                      : { "start_block"  : "{*"  , "end_block"   : "*}"     },
+    "SQL"                         : { "line_comment" : "--"  , "start_block" : "/*"      , "end_block" : "*/"     },
+    "Standard ML"                 : { "start_block"  : "(*"  , "end_block"   : "*)"     },
+    "TeX"                         : { "line_comment" : "%"  },
+    "Vala"                        : { "line_comment" : "//"  , "start_block" : "/*", "end_block" : "*/"           },
+    "VBscript"                    : { "line_comment" : "'"  },
+    "Vim Script"                  : { "line_comment" : "\"" },
+    "Visual Basic"                : { "line_comment" : "'"  },
+    "XHTML"                       : { "start_block"  : "<!--", "end_block"   : "-->" },
+    "XML"                         : { "start_block"  : "<!--", "end_block"   : "-->" }
+}

data/plugins/declarations/lib/declarations.rb

@@ -113,7 +113,7 @@ module Redcar
           Application::Dialog.message_box("The declarations file 'tags' has not been generated yet.")
           return
         end
-        matches = find_tag(tags_path, token)
+        matches = find_tag(tags_path, token).uniq
         case matches.size
         when 0
           Application::Dialog.message_box("There is no declaration for '#{token}' in the 'tags' file.")

data/plugins/document_search/features/replace.feature

@@ -131,6 +131,14 @@ Feature: Replace in file
     And I press "Replace" in the speedbar
     Then the contents should be "foobar\nfoobar\nfoobar"
     And the selection range should be from 14 to 20
-  
-  
+
+  Scenario: The Search-and-Replace Speedbar should get initialized with the currently selected text
+    When I replace the contents with "Foo\nBar\nFoo"
+    And I select from 4 to 7
+    When I run the command DocumentSearch::SearchAndReplaceCommand
+    Then the "Search" field in the speedbar should have text "Bar"
+    When I type "Foo" into the "Replace" field in the speedbar
+    And I press "Replace" in the speedbar
+    Then the contents should be "Foo\nFoo\nFoo"
+
   

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

@@ -1,4 +1,3 @@
 
-RequireSupportFiles File.dirname(__FILE__) + "/../../../edit_view/features/"
 
 

data/plugins/document_search/lib/document_search.rb

@@ -7,7 +7,7 @@ module DocumentSearch
     Redcar::Menu::Builder.build do
       sub_menu "Edit" do
         sub_menu "Search", :priority => 50 do
-          item "Document Search",       SearchForwardCommand
+          item "Document Search",    SearchForwardCommand
           item "Repeat Last Search", RepeatPreviousSearchForwardCommand
           item "Search and Replace", SearchAndReplaceCommand
         end
@@ -89,6 +89,9 @@ module DocumentSearch
   class SearchAndReplaceCommand < Redcar::EditTabCommand
     def execute
       @speedbar = SearchAndReplaceSpeedbar.new
+      if doc.selection?
+        @speedbar.initial_query = doc.selected_text
+      end
       win.open_speedbar(@speedbar)
     end
   end

data/plugins/document_search/lib/document_search/replace.rb

@@ -12,8 +12,16 @@ module DocumentSearch
     end
     
     def execute
-      # Get the current line and then get the line segment from the cursor or selection to the end of the line
-      latest_point = [doc.cursor_offset, doc.selection_offset].max
+      # The current selection is usually not used for the next replacement, unless
+      # it matches the query string, in which case we assume that the user meant replace it, too
+      offsets = [doc.cursor_offset, doc.selection_offset]
+      if query == doc.selected_text
+        latest_point = offsets.min
+      else
+        latest_point = offsets.max
+      end
+
+      # Get the current line and then get the line segment from the cursor to the end of the line
       curr_line_number = doc.line_at_offset(latest_point)
       cursor_line_offset = latest_point - doc.offset_at_line(curr_line_number)
       curr_line = doc.get_line(curr_line_number)
@@ -90,7 +98,7 @@ module DocumentSearch
             doc.replace_line(i, line.chomp)
             count += 1
           end
-        end while line != nil
+        end
       end
       if last_match_line
         line_offset = doc.offset_at_line(last_match_line)

data/plugins/document_search/lib/document_search/search_and_replace.rb

@@ -6,9 +6,12 @@ module DocumentSearch
       attr_accessor :previous_replace
       attr_accessor :previous_search_type
     end
-    
+
+    attr_accessor :initial_query
+
     def after_draw
-      self.query.value = SearchAndReplaceSpeedbar.previous_query || ""
+      SearchSpeedbar.previous_query ||= ""
+      self.query.value = @initial_query || SearchSpeedbar.previous_query
       self.replace.value = SearchAndReplaceSpeedbar.previous_replace || ""
       self.search_type.value = SearchAndReplaceSpeedbar.previous_search_type
       self.query.edit_view.document.select_all

data/plugins/edit_view/features/case_change.feature

@@ -7,13 +7,13 @@ Feature: Change Case
     When I replace the contents with "Curry Chicken"
     And I select from 5 to 0
     And I run the command Redcar::EditView::UpcaseTextCommand
-    Then the contents should be "<s>CURRY<c> Chicken"
+    Then the contents should be "<c>CURRY<s> Chicken"
 
   Scenario: Upcase selected text and preserve cursor position
     When I replace the contents with "Curry Chicken"
     And I select from 0 to 5
     And I run the command Redcar::EditView::UpcaseTextCommand
-    Then the contents should be "<c>CURRY<s> Chicken"
+    Then the contents should be "<s>CURRY<c> Chicken"
 
   Scenario: Upcase word if no selection
     When I replace the contents with "Curry Chicken"
@@ -25,19 +25,19 @@ Feature: Change Case
     When I replace the contents with "CURRY CHICKEN"
     And I select from 0 to 5
     And I run the command Redcar::EditView::DowncaseTextCommand
-    Then the contents should be "curry CHICKEN"
+    Then the contents should be "<s>curry<c> CHICKEN"
 
   Scenario: Titlize text
     When I replace the contents with "curry chicken"
     And I select from 0 to 13
     And I run the command Redcar::EditView::TitlizeTextCommand
-    Then the contents should be "Curry Chicken"
+    Then the contents should be "<s>Curry Chicken<c>"
   
   Scenario: Opposite case
     When I replace the contents with "Curry Chicken"
     And I select from 0 to 13
     And I run the command Redcar::EditView::OppositeCaseTextCommand
-    Then the contents should be "cURRY cHICKEN"
+    Then the contents should be "<s>cURRY cHICKEN<c>"
   
   Scenario: Camel case
     When I replace the contents with "curry_chicken"
@@ -49,15 +49,15 @@ Feature: Change Case
     When I replace the contents with "CurryChicken"
     And I move the cursor to 12
     And I run the command Redcar::EditView::UnderscoreTextCommand
-    Then the contents should be "curry_chicken"
+    Then the contents should be "curry_chicke<c>n"
     
   Scenario: Pascal to Underscore to Camel Case rotation
     When I replace the contents with "CurryChicken"
     And I move the cursor to 12
     And I run the command Redcar::EditView::CamelSnakePascalRotateTextCommand
-    Then the contents should be "curry_chicken"
+    Then the contents should be "curry_chicke<c>n"
     When I run the command Redcar::EditView::CamelSnakePascalRotateTextCommand
-    Then the contents should be "curryChicken"
+    Then the contents should be "curryChicken<c>"
     When I run the command Redcar::EditView::CamelSnakePascalRotateTextCommand
     Then the contents should be "CurryChicken<c>"
-  
+  

data/plugins/edit_view/features/cursor_navigation.feature

@@ -0,0 +1,36 @@
+Feature: Cursor navigation
+
+  Background:
+    When I open a new edit tab
+
+  Scenario: Move forward word works with multi-byte chars
+    When I replace the contents with "<h1>'Oáy z' wee"
+    And I move the cursor to 0
+    When I move to the next word
+    Then the contents should be "<h1<c>>'Oáy z' wee"
+    When I move to the next word
+    Then the contents should be "<h1>'<c>Oáy z' wee"
+    When I move to the next word
+    Then the contents should be "<h1>'Oáy<c> z' wee"
+    When I move to the next word
+    Then the contents should be "<h1>'Oáy z<c>' wee"
+    When I move to the next word
+    Then the contents should be "<h1>'Oáy z' <c>wee"
+    When I move to the next word
+    Then the contents should be "<h1>'Oáy z' wee<c>"
+
+  Scenario: Move backward word works with multi-byte chars
+    When I replace the contents with "<h1>'Oáy z' wee"
+    And I move the cursor to 15
+    When I move to the previous word
+    Then the contents should be "<h1>'Oáy z' <c>wee"
+    When I move to the previous word
+    Then the contents should be "<h1>'Oáy z<c>' wee"
+    When I move to the previous word
+    Then the contents should be "<h1>'Oáy <c>z' wee"
+    When I move to the previous word
+    Then the contents should be "<h1>'<c>Oáy z' wee"
+    When I move to the previous word
+    Then the contents should be "<h1<c>>'Oáy z' wee"
+    When I move to the previous word
+    Then the contents should be "<<c>h1>'Oáy z' wee"

data/plugins/edit_view/features/step_definitions/editing_steps.rb

@@ -17,7 +17,7 @@ end
 
 When /^I select from (\d+) to (\d+)$/ do |start_offset, end_offset|
   doc = Redcar.app.focussed_window.focussed_notebook.focussed_tab.edit_view.document
-  doc.set_selection_range(start_offset.to_i, end_offset.to_i)
+  doc.set_selection_range(end_offset.to_i, start_offset.to_i)
 end
 
 When /^I copy text$/ do
@@ -108,13 +108,13 @@ Then /^the contents should be "(.*)"$/ do |text|
   doc = Redcar::EditView.focussed_edit_view_document
   actual = doc.to_s
   if expected.include?("<c>")
-    curoff = doc.cursor_offset
-    actual = actual.insert(curoff, "<c>")
-    seloff = doc.selection_offset
-    if seloff > curoff
-      seloff += 3
+    char_curoff = doc.cursor_offset
+    actual = actual.insert(actual.char_offset_to_byte_offset(char_curoff), "<c>")
+    char_seloff = doc.selection_offset
+    if char_seloff > char_curoff
+      char_seloff += 3
     end
-    actual = actual.insert(seloff, "<s>") unless curoff == seloff
+    actual = actual.insert(actual.char_offset_to_byte_offset(char_seloff), "<s>") unless char_curoff == char_seloff
   end
   actual.should == expected
 end
@@ -169,7 +169,7 @@ Then /^the cursor should be on line (\d+)$/ do |num|
   doc.cursor_line.should == num.to_i
 end
 
-When /^I replace the contents with "([^\"]*)"$/ do |contents|
+When /^I replace the contents with "((?:[^\"]|\\")*)"$/ do |contents|
   contents = unescape_text(contents)
   doc = Redcar::EditView.focussed_edit_view_document
   cursor_offset = (contents =~ /<c>/)
@@ -251,3 +251,58 @@ Then /^the content? should be:$/ do |string|
   Then %{the contents should be "#{escape_text(string)}"}
 end
 
+
+When /^I type "((?:[^"]|\\")*)"$/ do |text|
+  text = text.gsub("\\t", "\t").gsub("\\n", "\n").gsub("\\\"", "\"")
+  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/edit_view/features/step_definitions/notebook_steps.rb

@@ -1,6 +1,8 @@
 
 module NotebookSwtHelper
   def notebook_sash
+    Redcar.app.show_toolbar = false
+    Redcar.app.refresh_toolbar!
     active_shell.children.to_a.last.children.to_a[0]
   end
   

data/plugins/edit_view/features/step_definitions/tab_steps.rb

@@ -10,7 +10,7 @@ Given /^there is an edit tab containing "([^\"]*)"$/ do |contents|
   end
 end
 
-When /^I open a new edit tab$/ do 
+When /^I open a new edit tab$/ do
   Redcar::Top::NewCommand.new.run
 end
 
@@ -42,17 +42,17 @@ Then /^there should be (one|\d+) (.*) tabs?$/ do |num, tab_type|
   else
     num = num.to_i
   end
-  
+
   # in the model
   tabs = Redcar.app.focussed_window.notebooks.map {|nb| nb.tabs }.flatten
   tabs.length.should == num
-  
+
   # in the GUI
   case tab_type
   when "edit"
     tab_class = Redcar::EditTab
   end
-  
+
   tabs = get_tabs
   tabs.length.should == num
 end
@@ -64,7 +64,7 @@ Then /^the edit tab should have the focus$/ do
   edit_tabs.first.controller.edit_view.mate_text.get_text_widget.is_focus_control?.should be_true
 end
 
-Then /^there should be no open tabs$/ do 
+Then /^there should be no open tabs$/ do
   get_tab_folder.getItems.to_a.length.should == 0
 end
 
@@ -89,4 +89,7 @@ Then /^my active tab should be "([^"]*)"$/ do |name|
   focussed_tab.title.should == name
 end
 
+Then /^my active tab should have an "([^"]*)" icon$/ do |arg1|
+  focussed_tab.icon.should == :"#{arg1}"
+end
 

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

@@ -1,7 +1,12 @@
-RequireSupportFiles File.dirname(__FILE__) + "/../../../application/features/"
 
 module SwtTabHelpers
+  def hide_toolbar
+    Redcar.app.show_toolbar = false
+    Redcar.app.refresh_toolbar!
+  end
+
   def get_tab_folders(shell=active_shell)
+    hide_toolbar
     right_composite = shell.children.to_a.last
     notebook_sash_form = right_composite.children.to_a[0]
     tab_folders = notebook_sash_form.children.to_a.select do |c| 
@@ -25,7 +30,8 @@ module SwtTabHelpers
   end
   
   def focussed_tab
-    Redcar.app.focussed_window.focussed_notebook.focussed_tab
+    # In case the focussed tab on the focussed window's notebook is empty, try another window
+    Redcar.app.focussed_window.focussed_notebook.focussed_tab or Redcar.app.windows.map {|w| w.focussed_notebook.focussed_tab}.first
   end
   
   def get_tabs

data/plugins/edit_view/lib/edit_view.rb

@@ -3,6 +3,7 @@ require "edit_view/actions/arrow_keys"
 require "edit_view/actions/deletion"
 require "edit_view/actions/esc"
 require "edit_view/actions/tab"
+require "edit_view/actions/cmd_enter"
 require "edit_view/command"
 require "edit_view/document"
 require "edit_view/document/command"
@@ -173,6 +174,10 @@ module Redcar
     def self.esc_handlers
       [Actions::EscapeHandler]
     end
+    
+    def self.cmd_enter_handlers
+      [Actions::CmdEnterHandler]
+    end
 
     def self.all_tab_handlers
       all_handlers(:tab)
@@ -197,6 +202,10 @@ module Redcar
     def self.all_backspace_handlers
       all_handlers(:backspace)
     end
+    
+    def self.all_cmd_enter_handlers
+      all_handlers(:cmd_enter)
+    end
 
     def handle_key(handlers, modifiers)
       sorted_handlers = handlers.sort_by {|h| (h.respond_to?(:priority) and h.priority) || 0 }.reverse
@@ -233,6 +242,10 @@ module Redcar
     def backspace_pressed(modifiers)
       handle_key(EditView.all_backspace_handlers, modifiers)
     end
+    
+    def cmd_enter_pressed(modifiers)
+      handle_key(EditView.all_cmd_enter_handlers, modifiers)
+    end
 
     # Called by the GUI whenever an EditView is focussed or
     # loses focus. Sends :focussed_edit_view event.
@@ -384,7 +397,9 @@ module Redcar
                                 :reset_undo,
                                 :cursor_offset, :cursor_offset=,
                                 :scroll_to_line, :compound,
-                                :begin_compound, :end_compound
+                                :begin_compound, :end_compound,
+                                :annotations, :remove_annotation,
+                                :remove_all_annotations
 
     def grammar
       @grammar