redcar 0.7 → 0.8

data/plugins/edit_view/lib/edit_view/actions/cmd_enter.rb

@@ -0,0 +1,11 @@
+module Redcar
+  class EditView
+    module Actions
+      class CmdEnterHandler
+        def self.handle(edit_view, modifiers)
+          Redcar::Top::MoveNextLineCommand.new.run
+        end
+      end
+    end
+  end
+end

data/plugins/edit_view/lib/edit_view/document.rb

@@ -62,20 +62,29 @@ module Redcar
         @controllers.values.flatten.uniq
       end
     end
-    
-    def save!
-      # Call the before_save callback on any plugins that need it
-      #
-      # Pass self as an argument since plugins that use before_save
-      # will most likely need access to the document being saved.
+
+    # Call the before_save and after_save callbacks on any plugins that need it
+    #
+    # Pass self as an argument since plugins that use before_save
+    # will most likely need access to the document being saved.
+    def between_save_hooks
       Redcar.plugin_manager.objects_implementing(:before_save).each do |object|
         object.before_save(self)
       end
-      @mirror.commit(to_s)
-      @edit_view.reset_last_checked
-      set_modified(false)
+      yield
+      Redcar.plugin_manager.objects_implementing(:after_save).each do |object|
+        object.after_save(self)
+      end
     end
-    
+
+    def save!
+      between_save_hooks do
+        @mirror.commit(to_s)
+        @edit_view.reset_last_checked
+        set_modified(false)
+      end
+    end
+
     def modified?
       @modified
     end
@@ -441,10 +450,18 @@ module Redcar
       controller.selection_offset
     end
     
+    def selection_offset=(value)
+      set_selection_range(cursor_offset, value)
+    end
+    
     def selection_line
       line_at_offset(selection_offset)
     end
     
+    def selection_line_offset
+      selection_offset - offset_at_line(selection_line)
+    end
+    
     # Set the range of text selected by the user. 
     #
     # @param [Integer] cursor_offset

data/plugins/edit_view/lib/edit_view/edit_tab.rb

@@ -1,13 +1,26 @@
 module Redcar
   class EditTab < Tab
-    
+
     attr_reader :edit_view
-    
+
     def initialize(*args)
       super
       create_edit_view
     end
-    
+
+    def update_for_file_changes
+      old_icon = @icon
+      doc = @edit_view.document
+      if doc and doc.path
+        if File.exists?(doc.path)
+          @icon = :file if icon == :exclamation
+        else
+          @icon = :exclamation
+        end
+      end
+      notify_listeners(:changed_icon, @icon) if old_icon != @icon
+    end
+
     def create_edit_view
       @edit_view = Redcar::EditView.new
       @edit_view.add_listener(:focussed, &method(:edit_view_focussed))
@@ -15,7 +28,7 @@ module Redcar
       @edit_view.document.add_listener(:selection_range_changed) { notify_listeners(:selection_changed) }
       @edit_view.add_listener(:title_changed) { |newt| self.title = newt }
     end
-    
+
     def edit_view_focussed
       notify_listeners(:focus)
     end

data/plugins/edit_view/spec/edit_view/document_spec.rb

@@ -9,6 +9,9 @@ describe Redcar::Document do
     def reset_last_checked
     end
     
+    def remove_all_annotations(o = nil); end
+    def grammar; end
+
     def controller
       o = Object.new
       def o.method_missing(*_)

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -147,7 +147,7 @@ module Redcar
           action = st.getKeyBinding(event.character | event.stateMask)
           if (action == Swt::SWT::NULL)
             # see if we have a control character
-            if ((event.stateMask & SWT.CTRL) != 0 && event.character <= 31)
+            if ((event.stateMask & Swt::SWT::CTRL) != 0 && event.character <= 31)
               # get the character from the CTRL+char sequence, the control
               # key subtracts 64 from the value of the key that it modifies
               c = event.character + 64
@@ -201,12 +201,19 @@ module Redcar
 
     def undo
       @undo_manager.undo
+      unless @undo_manager.undoable?
+        @undoable_override = false
+      end
       EditView.undo_sensitivity.recompute
       EditView.redo_sensitivity.recompute
     end
 
     def undoable?
-      @undo_manager.undoable
+      # The override malarky is because the JFace::TextViewerUndoManager doesn't
+      # recognize that typing while in Block Selection mode makes the edit view 
+      # undoable. (Even though it faithfully records the actions, and responds
+      # correctly to "undo".) So we override the undo manager for this case.
+      @undoable_override || @undo_manager.undoable
     end
 
     def redo
@@ -221,6 +228,7 @@ module Redcar
 
     def reset_undo
       @undo_manager.reset
+      @undoable_override = false
     end
 
     def compound
@@ -237,6 +245,19 @@ module Redcar
       @undo_manager.end_compound_change
     end
 
+    def annotations(options = nil)
+      return @mate_text.annotations unless options
+      if options[:line]
+        @mate_text.annotationsOnLine(line + 1)
+      elsif options[:type]
+        annotations_of_type(options[:type])
+      end
+    end
+
+    def annotations_of_type(type)
+      annotations.select {|a| a.type == type }
+    end
+
     def add_annotation_type(name, image_path, rgb)
       rgb = Swt::Graphics::RGB.new(rgb[0], rgb[1], rgb[2])
       @mate_text.addAnnotationType(name, image_path, rgb)
@@ -246,6 +267,17 @@ module Redcar
       @mate_text.addAnnotation(annotation_name, line, text, start, length)
     end
 
+    def remove_annotation(mate_annotation)
+      @mate_text.removeAnnotation(mate_annotation)
+    end
+
+    def remove_all_annotations(options = nil)
+      return @mate_text.remove_all_annotations unless options
+      annotations(options).each do |ann|
+        remove_annotation(ann)
+      end
+    end
+
     def create_document
       @document = EditViewSWT::Document.new(@model.document, @mate_text.mate_document)
       @model.document.controller = @document
@@ -281,6 +313,9 @@ module Redcar
           @mate_text.set_margin_column(-1)
         end
       end
+      h13 = @model.document.add_listener(:changed) do
+        @undoable_override = true
+      end
       @mate_text.getTextWidget.addMouseListener(MouseListener.new(self))
       @mate_text.getTextWidget.addFocusListener(FocusListener.new(self))
       @mate_text.getTextWidget.addVerifyListener(VerifyListener.new(@model.document, self))
@@ -289,7 +324,7 @@ module Redcar
       @mate_text.get_control.add_key_listener(KeyListener.new(self))
       @handlers << [@model.document, h1] << [@model, h2] << [@model, h3] << [@model, h4] <<
         [@model, h5] << [@model, h6] << [@model, h7] << [@model, h8] <<
-        [@model, h9] << [@model, h11]
+        [@model, h9] << [@model, h11] << [@model.document, h13]
     end
 
     def right_click(mouse_event)
@@ -322,6 +357,8 @@ module Redcar
       end
 
       def verify_key(key_event)
+        #uncomment this line for key debugging
+        #puts "got keyevent: #{key_event.character} #{key_event.stateMask}"
         if @edit_view_swt.model.document.block_selection_mode?
           @edit_view_swt.begin_compound
         end
@@ -337,6 +374,8 @@ module Redcar
           key_event.doit = !@edit_view_swt.model.delete_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
         elsif key_event.character == Swt::SWT::BS
           key_event.doit = !@edit_view_swt.model.backspace_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
+        elsif key_event.character == 13 and (key_event.stateMask == Swt::SWT::COMMAND or key_event.stateMask == Swt::SWT::CTRL)
+          key_event.doit = !@edit_view_swt.model.cmd_enter_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
         end
       end
     end

data/plugins/edit_view_swt/lib/edit_view_swt/word_movement.rb

@@ -12,24 +12,25 @@ module Redcar
         if [Swt::SWT::MOVEMENT_WORD, Swt::SWT::MOVEMENT_WORD_END].include? e.movement
           e.newOffset = next_offset(e.offset, e.lineOffset, e.lineText)
           # SWT gets pissy without this:
-          if e.newOffset == e.lineOffset + e.lineText.length + 1
+          if e.newOffset == e.lineOffset + e.lineText.chars.length + 1
             e.newOffset += 1
           end
         end
       end
       
-      def next_offset(offset, line_offset, line_text)
-        if offset == line_offset + line_text.length
-          offset + 1
+      def next_offset(chars_offset, chars_line_offset, line_text)
+        if chars_offset == chars_line_offset + line_text.chars.length
+          chars_offset + 1
         else
-          future_text = line_text[(offset - line_offset)..-1]
+          future_text = line_text.chars[(chars_offset - chars_line_offset)..-1].to_s
           if future_text == nil or future_text == ""
-            line_offset + line_text.length
+            chars_line_offset + line_text.chars.length
           else
             if md = future_text.match(MOVE_FORWARD_RE)
-              offset + md.end(0)
+              chars_match_end = future_text.byte_offset_to_char_offset(md.end(0))
+              chars_offset + chars_match_end
             else
-              line_offset + line_text.length
+              chars_line_offset + line_text.chars.length
             end
           end
         end
@@ -45,18 +46,19 @@ module Redcar
         end
       end
       
-      def previous_offset(offset, line_offset, line_text)
-        if offset == line_offset
-          offset - 1
+      def previous_offset(chars_offset, chars_line_offset, line_text)
+        if chars_offset == chars_line_offset
+          chars_offset - 1
         else
-          future_text = line_text[0..(offset - line_offset - 1)].reverse
+          future_text = line_text.chars[0..(chars_offset - chars_line_offset - 1)].reverse.to_s
           if future_text == nil or future_text == ""
-            line_offset
+            chars_line_offset
           else
             if md = future_text.match(MOVE_FORWARD_RE)
-              offset - md.end(0)
+              chars_match_end = future_text.byte_offset_to_char_offset(md.end(0))
+              chars_offset - chars_match_end
             else
-              line_offset
+              chars_line_offset
             end
           end
         end

data/plugins/help/lib/help.rb

@@ -0,0 +1,40 @@
+
+module Redcar
+  class Help
+    def self.menus
+      Redcar::Menu::Builder.build do
+        sub_menu "Help" do
+          group(:priority => :first) do
+            item "Online Help", :command => OnlineHelpCommand
+            item "Submit a Bug", :command => SubmitABugCommand
+          end
+        end
+      end
+    end
+
+    def self.keymaps
+      map = Redcar::Keymap.build("main", [:osx, :linux, :windows]) do
+        link "F1", OnlineHelpCommand
+      end
+      [map]
+    end
+
+    class SubmitABugCommand < Redcar::Command
+      def execute
+        Redcar::WebBookmarks::DisplayWebContent.new(
+          "Submit a Bug",
+          "https://redcar.lighthouseapp.com/projects/25090-redcar/tickets/new"
+        ).run
+      end
+    end
+
+    class OnlineHelpCommand < Redcar::Command
+      def execute
+        Redcar::WebBookmarks::DisplayWebContent.new(
+          "Online Help",
+          "http://github.com/redcar/redcar/wiki/Users-Guide"
+        ).run
+      end
+    end
+  end
+end

data/plugins/help/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "help"
+  version "1.0"
+  file    "lib", "help"
+  object  "Redcar::Help"
+  dependencies "web_bookmarks", ">0"
+end

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

@@ -14,9 +14,11 @@ Then /^the HTML tab (should say|says) "([^"]*)"$/ do |_, needle|
   end
   
   Redcar.gui.yield_until { started && !thread.alive? }
-  
-  # For now, just skip on windows. We can't get browser exec results
-  # on current version of SWT and XulRunner. More info at:
+
+  # For now, just skip on XUL platforms on which we can't get browser exec results
+  # (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
+  unless (contents.nil? or contents.empty?) and [:windows, :linux].include? Redcar.platform
+    contents.should match needle
+  end
 end

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

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

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

@@ -9,58 +9,3 @@ 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/support/env.rb

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

data/plugins/open_default_app/lib/open_default_app.rb

@@ -0,0 +1,35 @@
+module Redcar
+
+  class OpenDefaultApp
+
+    def self.project_context_menus(tree, node, controller)
+      Menu::Builder.build do
+        if node and node.path
+          item ("Open Default App"){OpenDefaultAppCommand.new(node.path).run }
+        end
+      end
+    end
+
+    class OpenDefaultAppCommand < Redcar::Command
+      import java.awt.Desktop
+
+      attr_reader :path
+
+      def initialize(path)
+        @path = path
+      end
+
+      def execute(options=nil)
+        @path ||= options[:value]
+        begin
+		    file  = java::io::File.new(path)
+        desktop = Desktop.get_desktop
+    		desktop.open(file)
+        rescue Object => e
+          Application::Dialog.message_box("A default application could not be found for this type of file.")
+        end
+      end
+    end
+
+  end
+end