redcar 0.5 → 0.5.1dev

data/plugins/edit_view/lib/edit_view/grammars/default.rb

@@ -3,7 +3,7 @@ module Redcar
     module Default
       
       def word
-        /^\w+$/u
+        /^\w+$/
       end
     end
   end

data/plugins/edit_view/lib/edit_view/grammars/ruby.rb

@@ -3,7 +3,7 @@ module Redcar
     module Ruby
 
       def word
-        /^(\w)+(\?|\!)?$/u
+        /^(\w)+(\?|\!)?$/
       end
     end
   end

data/plugins/edit_view/spec/spec_helper.rb

@@ -2,4 +2,4 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.load

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -11,14 +11,13 @@ require File.dirname(__FILE__) + '/../vendor/java-mateview'
 module Redcar
   class EditViewSWT
     include Redcar::Observable
-
+    
     def self.start
-      if gui = Redcar.gui
-        gui.register_controllers(Redcar::EditTab => EditViewSWT::Tab)
-      end
+      gui = ApplicationSWT.gui
+      gui.register_controllers(Redcar::EditTab => EditViewSWT::Tab)
       load_textmate_assets
     end
-
+    
     def self.load_textmate_assets
       s = Time.now
       load_textmate_assets_from_dir(Redcar.root + "/plugins/textmate/vendor/redcar-bundles")
@@ -29,12 +28,12 @@ module Redcar
       puts "took #{Time.now - s}s to load textmate assets"
       EditView.themes.unshift(*JavaMateView::ThemeManager.themes.to_a.map {|th| th.name })
     end
-
+    
     def self.load_textmate_assets_from_dir(dir)
       JavaMateView::Bundle.load_bundles(dir)
       JavaMateView::ThemeManager.load_themes(dir)
     end
-
+    
     attr_reader :mate_text, :widget, :model
 
     def initialize(model, parent, options={})
@@ -58,61 +57,61 @@ module Redcar
         @model.set_grammar(new_grammar)
       end
     end
-
+    
     def create_mate_text
       @mate_text = JavaMateView::MateText.new(@parent, !!@options[:single_line])
       @mate_text.set_font(EditView.font, EditView.font_size)
-
+      
       @model.controller = self
     end
-
+    
     def create_undo_manager
       @undo_manager = JFace::Text::TextViewerUndoManager.new(100)
       @undo_manager.connect(@mate_text.viewer)
     end
-
+    
     def undo
       @undo_manager.undo
       EditView.undo_sensitivity.recompute
       EditView.redo_sensitivity.recompute
     end
-
+    
     def undoable?
       @undo_manager.undoable
     end
-
+    
     def redo
       @undo_manager.redo
       EditView.undo_sensitivity.recompute
       EditView.redo_sensitivity.recompute
     end
-
+    
     def redoable?
       @undo_manager.redoable
     end
-
+    
     def reset_undo
       @undo_manager.reset
     end
-
+    
     def compound
       begin_compound
       yield
       end_compound
     end
-
+    
     def begin_compound
       @undo_manager.begin_compound_change
     end
-
+    
     def end_compound
       @undo_manager.end_compound_change
     end
-
+    
     def create_document
       @document = EditViewSWT::Document.new(@model.document, @mate_text.mate_document)
       @model.document.controller = @document
-      h1 = @model.document.add_listener(:before => :new_mirror,
+      h1 = @model.document.add_listener(:before => :new_mirror, 
             &method(:update_grammar))
       h2 = @model.add_listener(:grammar_changed, &method(:model_grammar_changed))
       h3 = @model.add_listener(:focussed, &method(:focus))
@@ -147,32 +146,21 @@ module Redcar
           @mate_text.set_margin_column(-1)
         end
       end
-      @mate_text.getTextWidget.addMouseListener(MouseListener.new(self))
       @mate_text.getTextWidget.addFocusListener(FocusListener.new(self))
       @mate_text.getTextWidget.addVerifyListener(VerifyListener.new(@model.document, self))
       @mate_text.getTextWidget.addModifyListener(ModifyListener.new(@model.document, self))
       @mate_text.get_control.add_verify_key_listener(VerifyKeyListener.new(self))
       @mate_text.get_control.add_key_listener(KeyListener.new(self))
-      @handlers << [@model.document, h1] << [@model, h2] << [@model, h3] << [@model, h4] <<
+      @handlers << [@model.document, h1] << [@model, h2] << [@model, h3] << [@model, h4] << 
         [@model, h5] << [@model, h6] << [@model, h7] << [@model, h8] <<
         [@model, h9] << [@model, h10] << [@model, h11]
     end
-
-    def right_click(mouse_event)
-      if @model.document.controller and @model.document.controller.respond_to?(:right_click)
-        location = ApplicationSWT.display.get_cursor_location
-        #offset = @mate_text.parser.styledText.get_offset_at_location(location)
-        Redcar.safely("right click on edit view") do
-          @model.document.controller.right_click(@model)
-        end
-      end
-    end
-
+    
     class VerifyKeyListener
       def initialize(edit_view_swt)
         @edit_view_swt = edit_view_swt
       end
-
+      
       def verify_key(key_event)
         if @edit_view_swt.model.document.block_selection_mode?
           @edit_view_swt.begin_compound
@@ -192,88 +180,88 @@ module Redcar
         end
       end
     end
-
+    
     class KeyListener
       def initialize(edit_view_swt)
         @edit_view_swt = edit_view_swt
       end
-
+      
       def key_pressed(_)
         @was_in_block_selection = @edit_view_swt.model.document.block_selection_mode?
       end
-
+      
       def key_released(_)
         if @was_in_block_selection
           @edit_view_swt.end_compound
         end
       end
     end
-
+    
     def delay_parsing
       mate_text.delay_parsing { yield }
     end
-
+    
     def swt_focus_gained
       EditView.focussed_edit_view = @model
       @model.focus
     end
-
+    
     def swt_focus_lost
       EditView.focussed_edit_view = nil
     end
-
+    
     def focus
       @mate_text.get_control.set_focus
     end
-
+    
     def is_current?
       EditView.current == @mate_text.get_control
     end
-
+    
     def has_focus?
       focus_control = ApplicationSWT.display.get_focus_control
       focus_control == @mate_text.get_control
     end
-
+    
     def exists?
       @mate_text.get_control and !@mate_text.get_control.disposed
     end
-
+  
     def attach_listeners
       # h = @document.add_listener(:set_text, &method(:reparse))
       # @handlers << [@document, h]
       @mate_text.get_text_widget.add_word_movement_listener(WordMoveListener.new(self))
     end
-
+    
     def reparse
       @mate_text.parser.parse_range(0, @mate_text.parser.styledText.get_line_count-1)
     end
-
+    
     def cursor_offset=(offset)
       @mate_text.get_text_widget.set_caret_offset(offset)
     end
-
+    
     def cursor_offset
       @mate_text.get_text_widget.get_caret_offset
     end
-
+    
     def scroll_to_line(line_index)
       @mate_text.parser.parserScheduler.last_visible_line_changed(line_index + 100)
       @mate_text.viewer.set_top_index(line_index)
     end
-
+    
     def model_grammar_changed(name)
       @mate_text.set_grammar_by_name(name)
     end
-
+    
     def smallest_visible_line
       @mate_text.viewer.get_top_index
     end
-
+    
     def biggest_visible_line
       @mate_text.viewer.get_bottom_index
     end
-
+    
     def ensure_visible(offset)
       line = @document.line_at_offset(offset)
       line_start_offset = @document.offset_at_line(line)
@@ -286,7 +274,7 @@ module Redcar
         @mate_text.viewer.reveal_range(offset, 1)
       end
     end
-
+    
     def update_grammar(new_mirror)
       title = new_mirror.title
       contents = new_mirror.read
@@ -298,41 +286,25 @@ module Redcar
       grammar_name ||= "Plain Text"
       @model.set_grammar(grammar_name)
     end
-
+    
     STRIP_KEYS = {
       :cut   => 120|Swt::SWT::MOD1,
       :copy  => 99|Swt::SWT::MOD1,
       :paste => 118|Swt::SWT::MOD1
     }
-
+    
     def remove_control_keybindings
       styled_text = @mate_text.get_text_widget
       STRIP_KEYS.each do |_, key|
         styled_text.set_key_binding(key, Swt::SWT::NULL)
       end
     end
-
+    
     def dispose
       @handlers.each {|obj, h| obj.remove_listener(h) }
       @handlers.clear
     end
-
-    class MouseListener
-      def initialize(obj)
-        @obj = obj
-      end
-
-      def mouse_double_click(_); end
-      def mouse_up(_)
-      end
-
-      def mouse_down(e)
-        if e.button == 3
-          @obj.right_click(e)
-        end
-      end
-    end
-
+    
     class FocusListener
       def initialize(obj)
         @obj = obj
@@ -346,22 +318,22 @@ module Redcar
         @obj.swt_focus_lost
       end
     end
-
+    
     class VerifyListener
       def initialize(document, obj)
         @document, @obj = document, obj
       end
-
+      
       def verify_text(e)
         @document.verify_text(e.start, e.end, e.text)
       end
     end
-
+    
     class ModifyListener
       def initialize(document, obj)
         @document, @obj = document, obj
       end
-
+      
       def modify_text(e)
         @document.modify_text
       end

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

@@ -4,71 +4,56 @@ module Redcar
     class Document
       include Redcar::Observable
       attr_reader :jface_document
-
+      
       def initialize(model, swt_mate_document)
         @model          = model
         @swt_mate_document = swt_mate_document
         @jface_document = swt_mate_document.mateText.get_document
       end
-
-      def right_click(edit_view)
-        menu = Menu.new
-        Redcar.plugin_manager.objects_implementing(:edit_view_context_menus).each do |object|
-          case object.method(:edit_view_context_menus).arity
-          when 0
-            menu.merge(object.edit_view_context_menus)
-          when 1
-            menu.merge(object.edit_view_context_menus(edit_view))
-          else
-            puts("Invalid edit_view_context_menus hook detected in "+object.class.name)
-          end
-        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))
         styledText.add_caret_listener(CaretListener.new(@model))
       end
-
+      
       def single_line?
         @swt_mate_document.mateText.isSingleLine
       end
-
+      
       def to_s
         jface_document.get
       end
-
+      
       def length
         jface_document.length
       end
-
+      
       def line_count
         jface_document.get_number_of_lines
       end
-
+      
       def get_line_delimiter
         styledText.get_line_delimiter
       end
-
+      
       def line_at_offset(offset)
         jface_document.get_line_of_offset(offset)
       end
-
+      
       def offset_at_line(line_ix)
         jface_document.get_line_offset(line_ix)
       end
-
+      
       def get_line(line_ix)
         line_info = jface_document.get_line_information(line_ix)
         jface_document.get(line_info.offset, line_info.length)
       end
-
+      
       def get_range(start, length)
         jface_document.get(start, length)
       end
-
+      
       def replace(offset, length, text)
         @model.verify_text(offset, offset+length, text)
         jface_document.replace(offset, length, text)
@@ -77,46 +62,46 @@ module Redcar
         #end
         @model.modify_text
       end
-
+      
       def text=(text)
         @model.verify_text(0, length, text)
         jface_document.set(text)
         @model.modify_text
         notify_listeners(:set_text)
       end
-
+      
       def cursor_offset
         styledText.get_caret_offset
       end
-
+      
       def selection_offset
         range = styledText.get_selection_range
         range.x == cursor_offset ? range.x + range.y : range.x
       end
-
+      
       def cursor_offset=(offset)
         styledText.set_caret_offset(offset)
       end
-
+      
       def selection_range
         range = styledText.get_selection_range
         range.x...(range.x + range.y)
       end
-
+      
       def selection_ranges
         ranges = styledText.get_selection_ranges
         ranges.to_a.each_slice(2).map do |from, length|
           from...(from + length)
         end
       end
-
+      
       def set_selection_range(cursor_offset, selection_offset)
         if block_selection_mode?
           start_offset, end_offset = *[cursor_offset, selection_offset].sort
           start_location = styledText.getLocationAtOffset(start_offset)
           end_location   = styledText.getLocationAtOffset(end_offset)
           styledText.set_block_selection_bounds(
-            start_location.x,
+            start_location.x, 
             start_location.y,
             end_location.x - start_location.x,
             end_location.y - start_location.y + styledText.get_line_height
@@ -126,7 +111,7 @@ module Redcar
         end
         @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
@@ -134,7 +119,7 @@ module Redcar
         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)
@@ -148,37 +133,37 @@ module Redcar
 				@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
-
+      
       def block_selection_mode=(bool)
         styledText.set_block_selection(bool)
       end
-
+      
       def styledText
         @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
@@ -187,21 +172,21 @@ module Redcar
         def widget_default_selected(e)
           @model.selection_range_changed(e.x, e.y)
         end
-
+        
         def widget_selected(e)
           @model.selection_range_changed(e.x, e.y)
-        end
+        end        
       end
-
+      
       class DocumentListener
         def initialize(model)
           @model = model
         end
-
+        
         def document_about_to_be_changed(e)
           @model.about_to_be_changed(e.offset, e.length, e.text)
         end
-
+        
         def document_changed(e)
           @model.changed(e.offset, e.length, e.text)
         end