redcar 0.3.3 → 0.3.4

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

@@ -0,0 +1,15 @@
+module Redcar
+  class EditView
+    module Actions
+      class EscapeHandler
+        def self.handle(edit_view, modifiers)
+          return false if Redcar.app.focussed_window.speedbar
+          return false if modifiers.any?
+          # on osx menu items with "Escape" as their keybinding don't seem to activate correctly
+          return false if Redcar.platform != :osx
+          AutoCompleter::AutoCompleteCommand.new.run
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,10 @@ module Redcar
   class EditView
     module Actions
       class IndentTabHandler
+        def self.priority
+          1
+        end
+        
         def self.handle(edit_view, modifiers)
           return false if modifiers.any?
           doc = edit_view.document

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

@@ -8,22 +8,21 @@ module Redcar
     include Redcar::Observable
     extend Forwardable
     
-    def self.register_controller_type(controller_type)
-      unless controller_type.ancestors.include?(Document::Controller)
-        raise "expected #{Document::Controller}"
+    def self.all_document_controller_types
+      result = []
+      Redcar.plugin_manager.loaded_plugins.each do |plugin|
+        if plugin.object.respond_to?(:document_controller_types)
+          result += plugin.object.document_controller_types
+        end
       end
-      document_controller_types << controller_type
-    end
-    
-    def self.document_controller_types
-      @document_controller_types ||= []
+      result
     end
     
     class << self
       attr_accessor :default_mirror
     end
     
-    attr_reader :mirror
+    attr_reader :mirror, :edit_view
     
     def initialize(edit_view)
       @edit_view = edit_view
@@ -33,12 +32,15 @@ module Redcar
     def get_controllers
       @controllers = {
         Controller::ModificationCallbacks => [],
-        Controller::NewlineCallback => []
+        Controller::NewlineCallback       => [],
+        Controller::CursorCallbacks       => []
       }
-      Document.document_controller_types.each do |type|
+      Document.all_document_controller_types.each do |type|
+        controller = type.new
+        controller.document = self
         @controllers.each do |key, value|
-          if type.ancestors.include?(key)
-            value << type.new(self)
+          if controller.is_a?(key)
+            value << controller
           end
         end
       end
@@ -57,11 +59,9 @@ module Redcar
       @mirror ? @mirror.title : nil
     end
     
-    # helper method to get
-    # the mirror's path
-    # if it has one
+    # helper method to get the mirror's path if it has one
     def path
-      if @mirror && @mirror.respond_to?(:path) && @mirror.path
+      if @mirror and @mirror.respond_to?(:path) and @mirror.path
         @mirror.path
       else
         nil
@@ -81,7 +81,9 @@ module Redcar
     def verify_text(start_offset, end_offset, text)
       @change = [start_offset, end_offset, text]    
       @controllers[Controller::ModificationCallbacks].each do |controller|
-        controller.before_modify(start_offset, end_offset, text)
+        rescue_document_controller_error(controller) do
+          controller.before_modify(start_offset, end_offset, text)
+        end
       end
     end
 
@@ -89,16 +91,28 @@ module Redcar
       start_offset, end_offset, text = *@change
       set_modified(true)
       @controllers[Controller::ModificationCallbacks].each do |controller|
-        controller.after_modify
+        rescue_document_controller_error(controller) do
+          controller.after_modify
+        end
       end
       @controllers[Controller::NewlineCallback].each do |controller|
         if text == "\n" or text == "\r\n"
-          controller.after_newline(line_at_offset(start_offset) + 1)
+          rescue_document_controller_error(controller) do
+            controller.after_newline(line_at_offset(start_offset) + 1)
+          end
         end
       end
       @change = nil      
       notify_listeners(:changed)
-    end                  
+    end
+    
+    def cursor_moved(new_offset)
+      @controllers[Controller::CursorCallbacks].each do |controller|
+        rescue_document_controller_error(controller) do
+          controller.cursor_moved(new_offset)
+        end
+      end
+    end               
     
     def about_to_be_changed(start_offset, length, text)
     end
@@ -132,6 +146,13 @@ module Redcar
       replace(offset, 0, text)
     end
     
+    # Insert text at the cursor offset
+    #
+    # @param [String] text  text to insert
+    def insert_at_cursor(text)
+      insert(cursor_offset, text)
+    end
+    
     # Delete text
     #
     # @param [Integer] offset  character offset from the start of the document
@@ -294,6 +315,15 @@ module Redcar
     def get_range(start, length)
       controller.get_range(start, length)
     end
+    
+    # Get a slice of text from the document.
+    #
+    # @param [String] start_offset the character offset of the start of the slice
+    # @param [String] end_offset   the character offset of the end of the slice
+    # @return [String] the text
+    def get_slice(start_offset, end_offset)
+      get_range(start_offset, end_offset - start_offset)
+    end
 
     # Get the text of a line by index. (Includes a trailing "\n", 
     # unless it is the last line in the document.)
@@ -380,6 +410,21 @@ module Redcar
     def num_lines_visible
       biggest_visible_line - smallest_visible_line
     end
+    
+    # The scope hierarchy at this point
+    #
+    # @param [String]
+    def cursor_scope
+      controller.scope_at(cursor_line, cursor_line_offset)
+    end
+    
+    def create_mark(offset, gravity=:right)
+      controller.create_mark(offset, gravity)
+    end
+    
+    def delete_mark(mark)
+      controller.delete_mark(mark)
+    end
 
     private
     
@@ -405,5 +450,17 @@ module Redcar
         "untitled"
       end
     end
+    
+    def rescue_document_controller_error(controller)
+      begin
+        yield
+      rescue => e
+        puts "*** ERROR in Document controller: #{controller.inspect}"
+        puts e.class.name + ": " + e.message
+        puts e.backtrace
+      end   
+    end
   end
 end
+
+

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

@@ -2,12 +2,10 @@
 module Redcar
   class Document
     module Controller
-      def initialize(document)
-        @document = document
-      end
+      attr_accessor :document
       
-      def document
-        @document
+      def inspect
+        "<#{self.class}>"
       end
       
       module ModificationCallbacks
@@ -25,6 +23,12 @@ module Redcar
           raise "not implemented"
         end
       end
+      
+      module CursorCallbacks
+        def cursor_moved(offset)
+          raise "not implemented"
+        end
+      end
     end
   end
 end

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -120,6 +120,10 @@ module Redcar
       end
     end
     
+    def delay_parsing
+      mate_text.delay_parsing { yield }
+    end
+    
     def swt_focus_gained
       EditView.focussed_edit_view = @model
       @model.focus

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

@@ -14,6 +14,7 @@ module Redcar
       def attach_modification_listeners
         jface_document.add_document_listener(DocumentListener.new(@model))
         styledText.add_selection_listener(SelectionListener.new(@model))
+        styledText.add_caret_listener(CaretListener.new(@model))
       end
       
       def single_line?
@@ -107,6 +108,32 @@ module Redcar
         @model.selection_range_changed(cursor_offset, selection_offset)
       end
       
+      @markStruct ||= Struct.new(:location, :category) # save away the parent class
+      class Mark < @markStruct
+        def get_offset;      location.get_offset;      end
+        def get_line;        location.get_line;        end
+        def get_line_offset; location.get_line_offset; end
+        def inspect;         "<Mark #{get_line}:#{get_line_offset} (#{get_offset})>"; end
+      end
+      
+      def create_mark(offset, gravity)
+        line = line_at_offset(offset)
+        line_offset = offset - offset_at_line(line)
+        case gravity
+        when :left
+          category = "lefts"
+        when :right
+          category = "rights"
+        end
+  			location = @swt_mate_document.get_text_location(line, line_offset)
+				@swt_mate_document.add_text_location(category, location)
+				Mark.new(location, category)
+      end
+      
+      def delete_mark(mark)
+        @swt_mate_document.remove_text_location(mark.category, mark.location)
+      end
+      
       def block_selection_mode?
         styledText.get_block_selection
       end
@@ -119,6 +146,20 @@ module Redcar
         @swt_mate_document.mateText.getControl
       end
       
+      def scope_at(line, line_offset)
+        @swt_mate_document.mateText.scope_at(line, line_offset)
+      end
+      
+      class CaretListener
+        def initialize(model)
+          @model = model
+        end
+        
+        def caret_moved(event)
+          @model.cursor_moved(event.caretOffset)
+        end
+      end
+      
       class SelectionListener
         def initialize(model)
           @model = model

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

@@ -8,6 +8,7 @@ module JavaMateView
   import com.redcareditor.mate.Parser
   import com.redcareditor.mate.Pattern
   import com.redcareditor.mate.Scope
+  import com.redcareditor.mate.ScopeMatcher
   import com.redcareditor.theme.Theme
   import com.redcareditor.theme.ThemeManager
   
@@ -23,6 +24,12 @@ module JavaMateView
       scope.isOpen = true
       self.parser.root = scope
     end
+    
+    def delay_parsing
+      parser.deactivate
+      yield
+      parser.reactivate
+    end
   end
 end
 

data/plugins/html_view/lib/html_view.rb

@@ -15,7 +15,7 @@ module Redcar
       func = RubyFunc.new(@html_tab.controller.browser, "rubyCall")
       func.controller = @controller
       text = controller.index + setup_javascript_listeners
-      puts text
+     # puts text
       @html_tab.controller.browser.set_text(text)
     end
     

data/plugins/project/lib/project.rb

@@ -6,9 +6,11 @@ require "project/find_file_dialog"
 require "project/dir_mirror"
 require "project/dir_controller"
 require "project/drb_service"
+require "project/recent_directories"
 
 module Redcar
   class Project
+    RECENT_FILES_LENGTH = 20
 
     # this will restore open files unless other files or dirs were passed
     # as command line parameters
@@ -50,8 +52,8 @@ module Redcar
   
     def self.filter_path
       if Redcar.app.focussed_notebook_tab
-       if path = Redcar.app.focussed_notebook_tab.document.path
-          dir = File.dirname(path)
+        if mirror = EditView.focussed_document_mirror and mirror.is_a?(FileMirror)
+          dir = File.dirname(mirror.path)
           return dir
         end
       end      
@@ -105,7 +107,7 @@ module Redcar
     
     # Opens a new EditTab with a FileMirror for the given path.
     #
-    # @path  [String] path  the path of the file to be edited
+    # @path  [String] path the path of the file to be edited
     # @param [Window] win  the Window to open the File in
     def self.open_file(path, win = Redcar.app.focussed_window)
       win ||= Redcar.app.new_window # in case there's not one open
@@ -122,18 +124,40 @@ module Redcar
     # @param [String] path  the path of the directory to view
     # @param [Window] win  the Window to open the Tree in
     def self.open_dir(path, win = Redcar.app.focussed_window)
+      if !File.directory?(path)
+      	raise 'Not a directory: ' + path
+      end
       win ||= Redcar.app.new_window # case none open
       tree = Tree.new(Project::DirMirror.new(path),
                       Project::DirController.new)
       Project.open_tree(win, tree)
+      # adds the directory path to the RecentDirectories plugin
+      RecentDirectories.store_path(path)
       storage['last_open_dir'] = path
     end
     
-    # A list of files previously opened in this session
+    # A list of files previously opened in this session for a given directory path
     #
+    # @param  [String] path   a directory path
     # @return [Array<String>] an array of paths
-    def self.recent_files
-      @recent_files ||= []
+    def self.recent_files_for(path)
+      (@recent_files ||= Hash.new {|h,k| h[k] = [] })[path]
+    end
+    
+    # The directory path of the currently focussed project, or nil if
+    # there is no directory open in the focussed window.
+    #
+    # @return [String, nil]
+    def self.focussed_project_path
+      if tree = focussed_project_tree
+        tree.tree_mirror.path
+      end
+    end
+    
+    # The Tree object for the currently focussed project tree, or nil
+    # if there is no directory open in the focussed window.
+    def self.focussed_project_tree
+      Redcar.app.focussed_window.treebook.trees.detect {|t| t.tree_mirror.is_a?(Project::DirMirror)}
     end
     
     private
@@ -149,7 +173,6 @@ module Redcar
           open_file(path)
         end
       end
-      
     end
         
     # saves away a list of the currently open files in
@@ -168,8 +191,10 @@ module Redcar
     # handles files and/or dirs passed as command line arguments
     def self.handle_startup_arguments
       if ARGV
-        dir_args  = ARGV.select {|path| File.directory?(path) }
-        file_args = ARGV.select {|path| File.file?(path)      }
+        args = ARGV.dup
+        dir_args  = args.select {|path| File.directory?(path) }
+        args -= dir_args
+        file_args = args.select {|path| !path.start_with?('--') }
         
         dir_args.each {|path| open_dir(path) }
         file_args.each {|path| open_file(path) }
@@ -182,26 +207,31 @@ module Redcar
     def self.init_current_files_hooks
       Redcar.app.add_listener(:tab_focussed) do |tab|
         if tab and tab.document_mirror.respond_to?(:path)
-          add_to_recent_files(tab.document_mirror.path)
+          add_to_recent_files_for(Project.focussed_project_path, tab.document_mirror.path)
         end
       end
+      attach_app_listeners
     end
     
-    def self.add_to_recent_files(new_file)
-      # sanitize paths for doze
-      # like "E:\\installs\\ruby191p376\\bin/rdebug.bat" => "E:/installs/ruby191p376/bin/rdebug.bat"
-      new_file = File.expand_path(new_file) 
-      unless new_file == @last_file
-        recent_files.delete(new_file)
-        recent_files << new_file
+    def self.attach_app_listeners
+      Redcar.app.add_listener(:lost_focus) do
+        FindFileDialog.clear
+      end
       
-        if @last_file
-          recent_files.delete(@last_file)
-          recent_files.unshift(@last_file)
-        end
+      Redcar.app.add_listener(:focussed) do
+        @window_trees.values.each {|tree| tree.refresh}
+      end
+    end
+    
+    def self.add_to_recent_files_for(directory_path, new_file)
+      new_file = File.expand_path(new_file) 
+      if recent_files_for(directory_path).include?(new_file)
+        recent_files_for(directory_path).delete(new_file)
+      end
+      recent_files_for(directory_path).unshift(new_file)
+      if recent_files_for(directory_path).length > RECENT_FILES_LENGTH
+        recent_files_for(directory_path).pop
       end
-
-      @last_file = new_file
     end
     
     def self.set_tree(win, tree)
@@ -320,7 +350,7 @@ module Redcar
     class FindFileCommand < ProjectCommand
      
       def execute
-        dialog = FindFileDialog.new win
+        dialog = FindFileDialog.new
         dialog.open
       end
     end