redcar 0.3.1dev → 0.3.2dev

data/plugins/application_swt/lib/application_swt/notebook.rb

@@ -20,6 +20,11 @@ module Redcar
             end
           end
         end
+        
+        def show_list(event); end
+        def maximize(*_); end
+        def minimize(*_); end
+        def restore(*_); end
       end
       
       class SelectionListener

data/plugins/application_swt/lib/application_swt/speedbar.rb

@@ -0,0 +1,187 @@
+module Redcar
+  class ApplicationSWT
+    class Speedbar
+      attr_reader :widget
+      
+      def initialize(window, parent, model)
+        @window_model = window
+        @parent = parent
+        @model = model
+        create_widgets
+        attach_key_listeners
+        disable_menu_items
+        if widget = focussable_widgets.first
+          widget.set_focus
+        end
+      end
+      
+      def close
+        @composite.dispose
+        @parent.layout
+      end
+      
+      def disable_menu_items
+        key_strings = []
+        @model.__items.each do |i|
+          if i.respond_to?(:key)
+            key_strings << i.key
+          end
+        end
+        key_strings.uniq.each do |key_string|
+          ApplicationSWT::Menu.disable_items(key_string)
+        end
+      end
+      
+      def num_columns
+        @model.__items.select {|i| !i.is_a?(Redcar::Speedbar::KeyItem) }.length
+      end
+      
+      def key_items
+        @model.__items.select {|i| i.respond_to?(:key) }
+      end
+      
+      def keyable_widgets
+        @keyable_widgets ||= []
+      end
+      
+      def focussable_widgets
+        @focussable_widgets ||= []
+      end
+      
+      def create_widgets
+        @composite = Swt::Widgets::Composite.new(@parent, Swt::SWT::NONE)
+        grid_data = Swt::Layout::GridData.new
+        grid_data.grabExcessHorizontalSpace = true
+        grid_data.horizontalAlignment = Swt::Layout::GridData::FILL
+      	@composite.setLayoutData(grid_data)
+        layout = Swt::Layout::GridLayout.new(num_columns + 1, false)
+        layout.verticalSpacing = 0
+        layout.marginHeight = 0
+        @composite.setLayout(layout)
+        image = Swt::Graphics::Image.new(ApplicationSWT.display, Redcar::Speedbar.close_image_path)
+        label = Swt::Widgets::Label.new(@composite, 0)
+        label.set_image(image)
+	
+	    label.add_mouse_listener(MouseListener.new(self))
+	
+        @model.__items.each do |item|
+          case item
+          when Redcar::Speedbar::LabelItem
+            label = Swt::Widgets::Label.new(@composite, 0)
+            label.set_text(item.text)
+          when Redcar::Speedbar::TextBoxItem
+            textbox = Swt::Widgets::Text.new(@composite, Swt::SWT::BORDER)
+            textbox.set_text(item.value)
+            gridData = Swt::Layout::GridData.new
+            gridData.grabExcessHorizontalSpace = true
+            gridData.horizontalAlignment = Swt::Layout::GridData::FILL
+            textbox.set_layout_data(gridData)
+            textbox.add_modify_listener do
+              item.value = textbox.get_text
+              if item.listener
+                begin
+                  @model.__context.instance_exec(item.value, &item.listener)
+                rescue => err
+                  error_in_listener(err)
+                end
+              end
+            end
+            keyable_widgets << textbox
+            focussable_widgets << textbox
+          when Redcar::Speedbar::ButtonItem
+            button = Swt::Widgets::Button.new(@composite, 0)
+            button.set_text(item.text)
+            if item.listener
+              button.add_selection_listener do
+                begin
+                  @model.__context.instance_exec(&item.listener)
+                rescue => err
+                  error_in_listener(err)
+                end
+              end
+            end
+            keyable_widgets << button
+            focussable_widgets << button
+          when Redcar::Speedbar::ToggleItem
+            button = Swt::Widgets::Button.new(@composite, Swt::SWT::CHECK)
+            button.set_text(item.text)
+            button.add_selection_listener do
+              item.value = button.get_selection
+              if item.listener
+                begin
+                  @model.__context.instance_exec(item.value, &item.listener)
+                rescue => err
+                  error_in_listener(err)
+                end
+              end
+            end
+            keyable_widgets << button
+            focussable_widgets << button
+          end
+        end
+        @parent.layout
+      end
+      
+      class KeyListener
+        def initialize(speedbar)
+          @speedbar = speedbar
+        end
+        
+        def key_pressed(e)
+        end
+        
+        def key_released(e)
+          @speedbar.key_press(e)
+        end
+      end
+      
+      class MouseListener
+        def initialize(speedbar)
+          @speedbar = speedbar
+        end
+        
+        def mouse_down(*_); end
+        
+        def mouse_up(*_)
+          @speedbar.close_pressed
+        end
+        
+        def mouse_double_click(*_); end
+      end
+      
+      def attach_key_listeners
+        keyable_widgets.each do |widget|
+          widget.add_key_listener(KeyListener.new(self))
+        end
+      end
+      
+      def close_pressed
+        @window_model.close_speedbar
+      end
+      
+      def key_press(e)
+        key_string = Menu::BindingTranslator.key_string(e)
+        if key_string == "\e"
+          @window_model.close_speedbar
+          e.doit = false
+        end
+        key_items.each do |key_item|
+          if Menu::BindingTranslator.matches?(key_string, key_item.key)
+            e.doit = false
+            begin
+              @model.__context.instance_exec(&key_item.listener)
+            rescue Object => err
+              error_in_listener(err)
+            end
+          end
+        end
+      end
+      
+      def error_in_listener(e)
+        puts "*** Error in speedbar listener: #{e.message}"
+        puts e.backtrace.map {|l| "    " + l}
+      end
+    end
+  end
+end
+

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

@@ -1,4 +1,3 @@
-
 require 'rbconfig'
 
 module Swt
@@ -45,17 +44,35 @@ module Swt
     import org.eclipse.swt.widgets.List
     import org.eclipse.swt.widgets.Menu
     import org.eclipse.swt.widgets.MenuItem
+    import org.eclipse.swt.widgets.MessageBox
     import org.eclipse.swt.widgets.Shell
     import org.eclipse.swt.widgets.TabFolder
     import org.eclipse.swt.widgets.TabItem
     import org.eclipse.swt.widgets.Text
+    import org.eclipse.swt.widgets.ToolTip
   end
+  
+  def self.display
+    if defined?(SWT_APP_NAME)
+      Swt::Widgets::Display.app_name = SWT_APP_NAME
+    end
+    @display ||= (Swt::Widgets::Display.getCurrent || Swt::Widgets::Display.new)
+  end
+
+  display # must be created before we import the Clipboard class.
 
   module Custom
     import org.eclipse.swt.custom.CTabFolder
     import org.eclipse.swt.custom.CTabItem
     import org.eclipse.swt.custom.SashForm
     import org.eclipse.swt.custom.StackLayout
+    import org.eclipse.swt.custom.ST
+  end
+  
+  module DND
+    import org.eclipse.swt.dnd.Clipboard
+    import org.eclipse.swt.dnd.Transfer
+    import org.eclipse.swt.dnd.TextTransfer
   end
   
   module Layout
@@ -78,6 +95,11 @@ module Swt
     import org.eclipse.swt.events.KeyEvent
   end
   
+  import org.eclipse.swt.browser.Browser
+  class Browser
+    import org.eclipse.swt.browser.BrowserFunction
+  end
+  
   class RRunnable
     include java.lang.Runnable
 
@@ -110,5 +132,6 @@ module JFace
   
   module Dialogs
     import org.eclipse.jface.dialogs.Dialog
+    import org.eclipse.jface.dialogs.InputDialog
   end
 end

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

@@ -45,6 +45,7 @@ module Redcar
       def add_listeners
         @window.add_listener(:show,          &method(:show))
         @window.add_listener(:menu_changed,  &method(:menu_changed))
+        @window.add_listener(:popup_menu,    &method(:popup_menu))
         @window.add_listener(:title_changed, &method(:title_changed))
         @window.add_listener(:new_notebook,  &method(:new_notebook))
         @window.add_listener(:notebook_removed,  &method(:notebook_removed))
@@ -52,6 +53,8 @@ module Redcar
         method = method(:notebook_orientation_changed)
         @window.add_listener(:notebook_orientation_changed, &method)
         @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
@@ -80,10 +83,23 @@ module Redcar
       end
       
       def menu_changed(menu)
-        @menu_controller = ApplicationSWT::Menu.new(self, menu)
+        @menu_controller = ApplicationSWT::Menu.new(self, menu, Swt::SWT::BAR)
         shell.menu_bar = @menu_controller.menu_bar
       end
       
+      def popup_menu(menu)
+        menu.controller = ApplicationSWT::Menu.new(self, menu, Swt::SWT::POP_UP)
+        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
@@ -155,11 +171,25 @@ module Redcar
       	button.setText("Button in pane2")
       	@tree_layout.topControl = button
       	
-        @notebook_sash     = Swt::Custom::SashForm.new(@sash, orientation)
-        grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
+      	@right_composite = Swt::Widgets::Composite.new(@sash, Swt::SWT::NONE)
+      	@grid_layout = Swt::Layout::GridLayout.new(1, false)
+        @grid_layout.verticalSpacing = 0
+        @grid_layout.marginHeight = 0
+        @grid_layout.horizontalSpacing = 0
+        @grid_layout.marginWidth = 0
+      	@right_composite.setLayout(@grid_layout)
+      	
+        @notebook_sash     = Swt::Custom::SashForm.new(@right_composite, orientation)
+        grid_data = Swt::Layout::GridData.new
+        grid_data.grabExcessHorizontalSpace = true
+        grid_data.horizontalAlignment = Swt::Layout::GridData::FILL
+        grid_data.grabExcessVerticalSpace = true
+        grid_data.verticalAlignment = Swt::Layout::GridData::FILL
       	@notebook_sash.setLayoutData(grid_data)
       	@notebook_sash.setSashWidth(SASH_WIDTH)
       end
+
+      attr_reader :right_composite      
       
       def horizontal_vertical(symbol)
         case symbol

data/plugins/application_swt/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "application_swt"
+  version "1.0"
+  file    "lib", "application_swt"
+  object  "Redcar::ApplicationSWT"
+  dependencies "application", ">0"
+end

data/plugins/application_swt/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 require 'redcar'
 
 Redcar.boot
-Redcar.require_files
+Redcar.load
 
 Spec::Runner.configure do |config|
   config.before(:suite) do

data/plugins/auto_completer/features/auto_complete.feature

@@ -0,0 +1,65 @@
+Feature: Auto Complete
+
+  Scenario: Autocomplete with no completions
+    When I open a new edit tab
+    And I replace the contents with "Tess"
+    And I move the cursor to 4
+    And I auto-complete
+    Then I should see "Tess" in the edit tab
+
+  Scenario: Autocomplete with one completions
+    When I open a new edit tab
+    And I replace the contents with "Daly Da"
+    And I move the cursor to 7
+    And I auto-complete
+    Then I should see "Daly Daly" in the edit tab
+
+  Scenario: Autocomplete with one completions, twice
+    When I open a new edit tab
+    And I replace the contents with "Daly Da"
+    And I move the cursor to 7
+    And I auto-complete
+    And I auto-complete
+    Then I should see "Daly Da" in the edit tab
+    And I should not see "Daly Daly" in the edit tab
+
+  Scenario: Autocomplete with two completions
+    When I open a new edit tab
+    And I replace the contents with "Dan Daly Da"
+    And I move the cursor to 11
+    And I auto-complete
+    Then I should see "Dan Daly Daly" in the edit tab
+
+  Scenario: Autocomplete with two completions, twice
+    When I open a new edit tab
+    And I replace the contents with "Dan Daly Da"
+    And I move the cursor to 11
+    And I auto-complete
+    And I auto-complete
+    Then I should see "Dan Daly Dan" in the edit tab
+
+  Scenario: Autocomplete with two completions, thrice
+    When I open a new edit tab
+    And I replace the contents with "Dan Daly Da"
+    And I move the cursor to 11
+    And I auto-complete
+    And I auto-complete
+    And I auto-complete
+    Then I should see "Dan Daly Da" in the edit tab
+    And I should not see "Dan Daly Daly" in the edit tab
+    And I should not see "Dan Daly Dan" in the edit tab
+    
+  Scenario: Autocomplete at the start of a word
+    When I open a new edit tab
+    And I replace the contents with "Da Daly Dan"
+    And I auto-complete
+    Then I should see "Da Daly Dan" in the edit tab
+
+  Scenario: Autocomplete with one completions at the end of a line
+    When I open a new edit tab
+    And I replace the contents with "Daly Da\nfoo"
+    And I move the cursor to 7
+    And I auto-complete
+    Then I should see "Daly Daly\nfoo" in the edit tab
+
+

data/plugins/auto_completer/features/step_definitions/auto_complete_steps.rb

@@ -0,0 +1,4 @@
+
+When /I auto-complete/ do
+  Redcar::AutoCompleter::AutoCompleteCommand.new.run
+end

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

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

data/plugins/auto_completer/lib/auto_completer.rb

@@ -0,0 +1,99 @@
+
+
+require 'auto_completer/document_controller'
+require 'auto_completer/word_iterator'
+require 'auto_completer/word_list'
+
+module Redcar
+  class AutoCompleter
+    WORD_CHARACTERS = /:|@|\w/ # /(\s|\t|\.|\r|\(|\)|,|;)/
+    
+    def self.start
+      Document.register_controller_type(AutoCompleter::DocumentController)
+    end
+    
+    class AutoCompleteCommand < Redcar::EditTabCommand
+      key :osx => "Ctrl+Escape", :linux => "Ctrl+Space",
+          :windows => "Ctrl+Space"
+      
+      def execute
+        controller = doc.controllers(AutoCompleter::DocumentController).first
+        controller.start_modification
+
+        if controller.in_completion?
+          doc.delete(doc.cursor_offset - controller.length_of_previous, controller.length_of_previous)
+          word = controller.word
+          left = controller.left
+          right = controller.right
+          word_list = controller.word_list
+        else
+          word, left, right = touched_word
+          if word
+            iterator = WordIterator.new(doc, WORD_CHARACTERS)
+            word_list = WordList.new
+            iterator.each_word_with_offset(word) do |matching_word, offset|
+              distance = (offset - doc.cursor_offset).abs
+              word_list.add_word(matching_word, distance)
+            end
+            controller.word_list = word_list
+            controller.word      = word
+            controller.left      = left
+            controller.right     = right
+          end
+        end
+        if word
+          index = (controller.index || 0) + 1
+          if word_list.completions.length == index
+            index = 0
+          end
+          completion = word_list.completions[index]
+          controller.index = index
+          
+          start_offset = right
+          doc.insert(right, completion[word.length..-1])
+          word_end_offset = right + completion.length - word.length
+          doc.cursor_offset = word_end_offset
+  
+          controller.length_of_previous = completion.length - word.length
+  
+          controller.start_completion
+        end
+        controller.end_modification
+      end
+      
+      private
+      
+      # returns the word that is being touched by the cursor and an array 
+      # containing [left, right] document offsets of the word.
+      def touched_word
+        line = doc.get_line(doc.cursor_line)
+        left, right = word_range(line)
+        word = doc.get_range(left, right - left)
+        return nil if word.length == 0
+        return word, left, right
+      end
+      
+      private
+      
+      # returns the range that holds the current word (depending on WORD_CHARACTERS)
+      def word_range(line)
+        left = doc.cursor_line_offset - 1
+        right = doc.cursor_line_offset
+        left_range = 0
+        right_range = 0
+        offset = doc.cursor_offset
+        
+        until left == -1 || WORD_CHARACTERS !~ (line[left].chr)
+          left -= 1
+          left_range -= 1
+        end
+        
+#        until right == line.length || WORD_CHARACTERS !~ (line[right].chr)
+#          right += 1
+#          right_range += 1
+#        end
+        return [offset+left_range, offset+right_range]
+      end
+    end
+  end
+end