redcar 0.3.10.1dev → 0.4

data/plugins/application_swt/lib/application_swt/swt_wrapper.rb

@@ -51,6 +51,8 @@ module Swt
     import org.eclipse.swt.widgets.TabItem
     import org.eclipse.swt.widgets.Text
     import org.eclipse.swt.widgets.ToolTip
+    import org.eclipse.swt.widgets.Table
+    import org.eclipse.swt.widgets.TableItem
   end
   
   def self.display

data/plugins/application_swt/lib/application_swt/window.rb

@@ -3,17 +3,17 @@ module Redcar
   class ApplicationSWT
     class Window
       attr_reader :shell, :window
-      
+
       SASH_WIDTH = 5
       TREEBOOK_WIDTH = 200
-      
+
       class ShellListener
         include org.eclipse.swt.events.ShellListener
 
         def initialize(controller)
           @win = controller.window
         end
-        
+
         def shell_closed(e)
           unless Redcar.app.events.ignore?(:window_close, @win)
             e.doit = false
@@ -27,12 +27,12 @@ module Redcar
             Redcar.app.events.create(:window_focus, @win)
           end
         end
-        
+
         def shell_deactivated(_); end
         def shell_deiconified(_); end
         def shell_iconified(_); end
       end
-      
+
       def initialize(window)
         @window = window
       	@notebook_handlers = Hash.new {|h,k| h[k] = []}
@@ -60,25 +60,25 @@ module Redcar
         @window.add_listener(:focussed,      &method(:focussed))
         @window.add_listener(:speedbar_opened, &method(:speedbar_opened))
         @window.add_listener(:speedbar_closed, &method(:speedbar_closed))
-        
+
         @window.treebook.add_listener(:tree_added) do
           if @treebook_unopened
             reset_sash_widths
             @treebook_unopened = false
           end
         end
-        
+
         @window.treebook.add_listener(:tree_removed) do
           reset_sash_widths
         end
         @shell.add_key_listener(KeyListener.new(self))
       end
-          
+
       class KeyListener
         def initialize(edit_view_swt)
           @edit_view_swt = edit_view_swt
         end
-        
+
         def key_pressed(key_event)
         p key_event
           if key_event.character == Swt::SWT::TAB
@@ -87,7 +87,7 @@ module Redcar
           p :esc_pressedwin
           end
         end
-        
+
         def verify_key(key_event)
         p :verkey
           if key_event.character == Swt::SWT::TAB
@@ -95,24 +95,24 @@ module Redcar
           key_event.doit = false
           end
         end
-        
+
         def key_released(key_event)
         end
       end
-      
+
       def create_treebook_controller
         treebook = @window.treebook
         controller = ApplicationSWT::Treebook.new(
-          self, 
+          self,
           treebook)
         treebook.controller = controller
       end
-      
+
       def show
         @shell.open
         @shell.text = window.title
       end
-      
+
       def refresh_menu
         old_menu_bar = shell.menu_bar
         @menu_controller = ApplicationSWT::Menu.new(self, Redcar.app.main_menu, Redcar.app.main_keymap, Swt::SWT::BAR)
@@ -125,11 +125,11 @@ module Redcar
         icon = Swt::Graphics::Image.new(ApplicationSWT.display, path)
         shell.image = icon
       end
-      
+
       def icon_dir
         File.join(Redcar.root, %w(plugins application icons))
       end
-      
+
       def icon_file
         if Redcar::VERSION =~ /dev$/
           "redcar_icon_beta_dev.png"
@@ -143,39 +143,39 @@ module Redcar
         @shell.redraw
         if Redcar.platform == :windows
           require File.dirname(__FILE__) + '/bring_to_front'
-          BringToFront.bring_window_to_front self.shell.handle          
+          BringToFront.bring_window_to_front self.shell.handle
         end
         @shell.force_active # doesn't do anything, really
         @shell.set_active
-      end        
-      
+      end
+
       def popup_menu(menu)
         menu.controller = ApplicationSWT::Menu.new(self, menu, nil, Swt::SWT::POP_UP)
         menu.controller.show
       end
-      
+
       def popup_menu_with_numbers(menu)
         menu.controller = ApplicationSWT::Menu.new(self, menu, nil, Swt::SWT::POP_UP, :numbers => true)
         menu.controller.show
       end
-      
+
       def speedbar_opened(speedbar)
         speedbar.controller = ApplicationSWT::Speedbar.new(@window, right_composite, speedbar)
       end
-      
+
       def speedbar_closed(speedbar)
         speedbar.controller.close
       end
-      
+
       def title_changed(new_title)
         @shell.text = new_title
       end
-      
+
       def new_notebook(notebook_model)
         notebook_controller = ApplicationSWT::Notebook.new(notebook_model, @notebook_sash)
         reset_notebook_sash_widths
       end
-      
+
       def notebook_removed(notebook_model)
         notebook_controller = notebook_model.controller
         @notebook_handlers[notebook_model].each do |h|
@@ -184,30 +184,30 @@ module Redcar
         notebook_controller.dispose
         reset_notebook_sash_widths
       end
-      
+
       def notebook_orientation_changed(new_orientation)
         orientation = horizontal_vertical(new_orientation)
         @notebook_sash.setOrientation(orientation)
       end
-      
+
       def focussed(_)
         @shell.set_active
       end
-      
+
       def closed(_)
         @shell.close
         @menu_controller.close
       end
-      
+
       def dispose
         @shell.dispose
         @menu_controller.close
       end
-      
+
       attr_reader :right_composite, :left_composite, :tree_composite, :tree_layout, :tree_sash
 
       private
-      
+
       def create_shell
         @shell = Swt::Widgets::Shell.new(ApplicationSWT.display)
         @shell.layout = Swt::Layout::FormLayout.new
@@ -220,10 +220,10 @@ module Redcar
         end
         ApplicationSWT.register_shell(@shell)
       end
-      
+
       def create_sashes(window_model)
         orientation = horizontal_vertical(window_model.notebook_orientation)
-        
+
         @left_composite = Swt::Widgets::Composite.new(@shell, Swt::SWT::NONE)
         @left_composite.layout = Swt::Layout::GridLayout.new(1, false).tap do |l|
           l.verticalSpacing = 0
@@ -231,7 +231,7 @@ module Redcar
           l.horizontalSpacing = 0
           l.marginWidth = 0
         end
-                
+
         @sash = Swt::Widgets::Sash.new(@shell, Swt::SWT::VERTICAL)
 
         @right_composite = Swt::Widgets::Composite.new(@shell, Swt::SWT::NONE)
@@ -241,13 +241,13 @@ module Redcar
           l.horizontalSpacing = 0
           l.marginWidth = 0
         end
-        
+
         @sash.layout_data = Swt::Layout::FormData.new.tap do |d|
           d.left = Swt::Layout::FormAttachment.new(0, 0)
           d.top =  Swt::Layout::FormAttachment.new(0, 0)
           d.bottom = Swt::Layout::FormAttachment.new(100, 0)
         end
-        
+
         @sash.add_selection_listener do |e|
           sash_rect = @sash.bounds
           shell_rect = @shell.client_area
@@ -262,7 +262,7 @@ module Redcar
             @shell.layout
           end
         end
-        
+
         @left_composite.layout_data = Swt::Layout::FormData.new.tap do |l|
           l.left = Swt::Layout::FormAttachment.new(0, 5)
           l.right = Swt::Layout::FormAttachment.new(@sash, 0)
@@ -276,17 +276,17 @@ module Redcar
           d.top = Swt::Layout::FormAttachment.new(0, 5)
           d.bottom = Swt::Layout::FormAttachment.new(100, -5)
         end
-                
+
         @tree_sash = Swt::Custom::SashForm.new(@left_composite, orientation)
         grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
         @tree_sash.layout_data = grid_data
-        
+
         @notebook_sash = Swt::Custom::SashForm.new(@right_composite, orientation)
         grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
         @notebook_sash.layout_data = grid_data
         @notebook_sash.sash_width = SASH_WIDTH
       end
-      
+
       def horizontal_vertical(symbol)
         case symbol
         when :horizontal
@@ -295,7 +295,7 @@ module Redcar
           Swt::SWT::VERTICAL
         end
       end
-      
+
       def reset_sash_widths
         @treebook_unopened = !@window.treebook.trees.any?
         if @window.treebook.trees.any?
@@ -305,7 +305,7 @@ module Redcar
         end
         @shell.layout
       end
-      
+
       def reset_notebook_sash_widths
         width = (100/@window.notebooks.length).to_i
         widths = [width]*@window.notebooks.length

data/plugins/core/lib/core/gui.rb

@@ -39,7 +39,12 @@ module Redcar
         @event_loop.start
       end
     end
-    
+
+    # Lets the even loop run until block returns false
+    def yield_until(&block)
+      @event_loop.yield_until(&block)
+    end
+
     # Stops the event loop for this gui.
     def stop
       @event_loop.stop

data/plugins/core/lib/core/observable.rb

@@ -100,7 +100,7 @@ module Redcar
     
     def observable_run_blocks(event_name, aspect, args)
       blocks = observable_events(event_name.to_s)[ASPECTS[aspect]].clone
-      blocks.each {|b| b.call(*args) }
+      blocks.map {|b| b.call(*args) }
     end
     
     def observable_events(event_name)

data/plugins/core/spec/core/task_queue_spec.rb

@@ -3,13 +3,10 @@ require 'java'
 
 require File.join(File.dirname(__FILE__), *%w".. spec_helper")
 
-TaskQueue = Redcar::TaskQueue
-Task      = Redcar::Task
-
-describe TaskQueue do
+describe Redcar::TaskQueue do
   before do
     $started_tasks = []
-    @q = TaskQueue.new
+    @q = Redcar::TaskQueue.new
   end
   
   after do

data/plugins/declarations/lib/declarations.rb

@@ -74,7 +74,11 @@ module Redcar
         {}
       end
     end
-    
+
+	def self.match_kind(path, regex)
+      Declarations::Parser.new.match_kind(path, regex)
+	end
+
     def self.clear_tags_for_path(path)
       @tags_for_path ||= {}
       @tags_for_path.delete(path)

data/plugins/declarations/lib/declarations/file.rb

@@ -28,7 +28,7 @@ module Redcar
           end
         end
       end
-      
+
       def update_files(file_list)
         changed_files = file_list.changed_since(last_updated)
         changed_files.delete(@path)

data/plugins/declarations/lib/declarations/parser.rb

@@ -4,40 +4,65 @@ module Redcar
   - regex:    "class\\s+(\\w+)"
     capture:  1
     type:     id
+    kind:     class
   - regex:    "interface\\s+(\\w+)"
     capture:  1
     type:     id
+    kind:     interface
   - regex:    "(public|private).*\\s+(\\w+)\s*\\("
     capture:  2
     type:     id
+    kind:     method
   YAML
   
   RUBY_YAML=<<-YAML
   - regex:    "^[^#]*(class|module)\\s+(?:\\w*::)*(\\w+)(?:$|\\s|<)"
     capture:  2
     type:     id
+    kind:     class
   - regex:    "^[^#]*def (self\\.)?(\\w+[?!]?)"
     capture:  2
     type:     id
+    kind:     method
   - regex:    "^[^#]*attr(_reader|_accessor|_writer)(.*)$"
     capture:  2
     type:     id-list
+    kind:     attribute
   - regex:    "^[^#]*alias\s+:(\\w+)"
     capture:  1
     type:     id
+    kind:     alias
   - regex:    "^[^#]*alias_method\s+:(\\w+[?!]?)"
     capture:  1
     type:     id
+    kind:     alias
   - regex:    "^\\s*([A-Z]\\w*)\\s*="
     capture:  1
     type:     id
+    kind:     assignment
+  YAML
+
+  PHP_YAML=<<-YAML
+  - regex:    "class\\s+(\\w+)"
+    capture:  1
+    type:     id
+    kind:     class
+  - regex:    "interface\\s+(\\w+)"
+    capture:  1
+    type:     id
+    kind:     interface
+  - regex:    "function\\s+(\\w+)\s*\\("
+    capture:  1
+    type:     id
+    kind:     method
   YAML
   
   class Declarations
     class Parser
       DEFINITIONS = {
         /\.rb$/   => YAML.load(RUBY_YAML),
-        /\.java$/ => YAML.load(JAVA_YAML)
+        /\.java$/ => YAML.load(JAVA_YAML),
+        /\.php$/ => YAML.load(PHP_YAML)
       }
       
       attr_reader :tags
@@ -52,8 +77,6 @@ module Redcar
         end
       end
       
-      private
-      
       def decls_for_file(path)
         DEFINITIONS.each do |fn_re, decls|
           if path =~ fn_re
@@ -63,22 +86,29 @@ module Redcar
         nil
       end
       
+      def match_kind(path, match)
+        if decls = decls_for_file(path)
+          decls.each do |decl|
+            if match.match(Regexp.new(decl["regex"]))
+              return decl["kind"]
+            end
+          end
+        end
+      end
+      
+      private
+      
       def match_in_file(path)
         tags = []
         begin
-          file = ::File.read(path)
-          if decls = decls_for_file(path)
-            decls.each do |decl| 
-              file.each_line do |line| 
-                if md = line.match(Regexp.new(decl["regex"]))
-                  capture = md[decl["capture"]]
-                  case decl["type"]
-                  when "id"
-                    tags << [capture, path, md[0]]
-                  when "id-list"
-                    tags += capture.scan(/\w+/).map {|id| [id, path, md[0]] }
-                  end
-                end
+          process_file(path) do |line, decl|
+            if md = line.match(Regexp.new(decl["regex"]))
+              capture = md[decl["capture"]]
+              case decl["type"]
+              when "id"
+                tags << [capture, path, md[0]]
+              when "id-list"
+                tags += capture.scan(/\w+/).map {|id| [id, path, md[0]] }
               end
             end
           end
@@ -88,6 +118,20 @@ module Redcar
         end
       end
       
+      def process_file(path, &block)
+        if decls = decls_for_file(path)
+          decls.each do |decl|
+            file(path).each_line do |line|
+              block.call(line, decl)
+            end
+          end
+        end
+      end
+      
+      def file(path)
+        ::File.read(path)
+      end
+      
     end
   end
 end