redcar 0.3.5 → 0.3.6

data/plugins/application_swt/spec/application_swt/menu/binding_translator_spec.rb

@@ -42,6 +42,17 @@ describe BindingTranslator do
       check("Tab", Swt::SWT::TAB)
     end
 
+    it "translates home" do
+      check("Home", Swt::SWT::HOME)
+      check("Alt+Home", Swt::SWT::ALT + Swt::SWT::HOME)
+      check("Shift+Home", Swt::SWT::SHIFT + Swt::SWT::HOME)
+    end
+    
+    it "translates end" do
+      check("End", Swt::SWT::END)
+      check("Ctrl+End", Swt::SWT::CTRL + Swt::SWT::END)
+      check("Cmd+End", Swt::SWT::COMMAND + Swt::SWT::END)
+    end
   end
 
   describe "multiple modifiers" do

data/plugins/application_swt/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
-
+Redcar.environment = :test
 Redcar.load
 
 Spec::Runner.configure do |config|

data/plugins/auto_completer/lib/auto_completer.rb

@@ -1,14 +1,4 @@
 
-module Redcar
-  class ApplicationSWT
-    class Menu
-      def move(x, y)
-        @menu_bar.setLocation(x, y)
-      end
-    end
-  end
-end
-
 require 'auto_completer/current_document_completion_source'
 require 'auto_completer/document_controller'
 require 'auto_completer/word_iterator'
@@ -144,18 +134,11 @@ module Redcar
             end
           end
           
-          window = Redcar.app.focussed_window
-          location = window.focussed_notebook.focussed_tab.controller.edit_view.mate_text.viewer.getTextWidget.getLocationAtOffset(window.focussed_notebook.focussed_tab.controller.edit_view.cursor_offset)
-          absolute_x = location.x
-          absolute_y = location.y
-          location = window.focussed_notebook.focussed_tab.controller.edit_view.mate_text.viewer.getTextWidget.toDisplay(0,0)
-          absolute_x += location.x
-          absolute_y += location.y
-          menu = ApplicationSWT::Menu.new(window.controller, builder.menu, nil, Swt::SWT::POP_UP)
-          menu.move(absolute_x, absolute_y)
-          menu.show
+          Application::Dialog.popup_menu(builder.menu, :cursor)
         end
       end
     end
   end
 end
+
+

data/plugins/auto_pairer/lib/auto_pairer/document_controller.rb

@@ -71,7 +71,7 @@ module Redcar
           # Type over ends
           if @rules = PairsForScope.pairs_for_scope(cursor_scope)
             inverse_rules = @rules.invert
-            if inverse_rules.include?(text) and !@ignore_insert
+            if !@ignore_insert
               end_mark_pair = find_mark_pair_by_end(start_offset)
               if end_mark_pair and end_mark_pair.text == text
                 @type_over_end = true

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

@@ -16,7 +16,7 @@ module Redcar
   - regex:    "^[^#]*(class|module)\\s+(?:\\w*::)*(\\w+)(?:$|\\s|<)"
     capture:  2
     type:     id
-  - regex:    "^[^#]*def (self\\.)?(\\w+)"
+  - regex:    "^[^#]*def (self\\.)?(\\w+[?!]?)"
     capture:  2
     type:     id
   - regex:    "^[^#]*attr(_reader|_accessor|_writer)(.*)$"
@@ -25,7 +25,7 @@ module Redcar
   - regex:    "^[^#]*alias\s+:(\\w+)"
     capture:  1
     type:     id
-  - regex:    "^[^#]*alias_method\s+:(\\w+)"
+  - regex:    "^[^#]*alias_method\s+:(\\w+[?!]?)"
     capture:  1
     type:     id
   - regex:    "^\\s*([A-Z]\\w*)\\s*="

data/plugins/declarations/spec/spec_helper.rb

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

data/plugins/edit_view/features/step_definitions/notebook_steps.rb

@@ -1,11 +1,11 @@
 
 module NotebookSwtHelper
-  def sash
-    sash = active_shell.children.to_a.first
+  def notebook_sash
+    active_shell.children.to_a.last.children.to_a[0]
   end
   
   def ctab_folders
-    sash.children.to_a[1].children.to_a[0].children.to_a.select do |c| 
+    notebook_sash.children.to_a.select do |c| 
       c.class == Java::OrgEclipseSwtCustom::CTabFolder
     end
   end

data/plugins/edit_view/features/step_definitions/window_steps.rb

@@ -26,7 +26,23 @@ When /I open a new window(?: with title "(.*)")?/ do |title|
 end
 
 class FakeEvent
-  attr_accessor :doit
+  def initialize(event_type, widget)
+    untyped_event = Swt::Widgets::Event.new.tap do |e|
+      e.display = Swt.display
+      e.widget = widget
+      e.x = 0
+      e.y = 0
+    end
+    widget.notify_listeners(event_type, untyped_event)
+  end
+end
+                                                                                                                                             
+When /^I maximize the window size$/ do
+  Redcar.app.focussed_window.controller.shell.maximized = true
+end
+
+When /^I restore the window size$/ do
+  Redcar.app.focussed_window.controller.shell.maximized = false
 end
 
 When /I close the window(?: "(.*)")?( with a command| through the gui)?/ do |title, how|
@@ -43,8 +59,8 @@ When /I close the window(?: "(.*)")?( with a command| through the gui)?/ do |tit
       shell = display.get_active_shell
       win = Redcar.app.windows.detect {|w| w.controller.shell == shell }
     end
-    win.controller.shell_listener.shell_closed(FakeEvent.new)
-  end    
+    FakeEvent.new(Swt::SWT::Close, win.controller.shell)
+  end
 end
 
 When /^I focus the window "([^\"]*)" with a command$/ do |title|
@@ -54,7 +70,7 @@ end
 
 When /^I focus the window "([^\"]*)" through the gui$/ do |title|
   win = Redcar.app.windows.detect{|win| win.title == title }
-  win.controller.shell_listener.shell_activated(FakeEvent.new)
+  FakeEvent.new(Swt::SWT::Activate, win.controller.shell)
 end
 
 Then /^the window should be titled "([^\"]*)"$/ do |title|
@@ -75,10 +91,9 @@ Then /the window "(.*)" should have (\d+) tabs?/ do |win_title, tab_num|
   
   # in the GUI
   display = Swt::Widgets::Display.get_current
-  shells  = display.get_shells.to_a
-  shell   = shells.detect {|s| s.text == win_title}
-  sash_form = shell.children.to_a.first
-  tab_folders = sash_form.children.to_a[1].children.to_a[0].children.to_a.select{|c| c.is_a? Swt::Custom::CTabFolder}
-  items = tab_folders.map{|f| f.getItems.to_a}.flatten
+  shells = display.get_shells.to_a
+  shell = shells.detect {|s| s.text == win_title }
+  items = get_tab_folders(shell).map{|f| f.getItems.to_a}.flatten
+  
   items.map {|i| model_tab_for_item(i)}.length.should == tab_num
 end

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

@@ -1,12 +1,17 @@
 RequireSupportFiles File.dirname(__FILE__) + "/../../../application/features/"
 
 module SwtTabHelpers
+  def get_tab_folders(shell=active_shell)
+    right_composite = shell.children.to_a.last
+    notebook_sash_form = right_composite.children.to_a[0]
+    tab_folders = notebook_sash_form.children.to_a.select do |c| 
+      c.class == Java::OrgEclipseSwtCustom::CTabFolder
+    end
+  end
+  
   def get_tab_folder
-    display = Redcar::ApplicationSWT.display
-    sash_form = active_shell.children.to_a.first
-    tab_folders = sash_form.children.to_a[1].children.to_a[0].children.to_a
-    tab_folders.length.should == 1
-    tab_folders.first
+    get_tab_folders.length.should == 1
+    get_tab_folders.first
   end
 
   def get_tab(tab_folder)
@@ -19,10 +24,7 @@ module SwtTabHelpers
   end
   
   def get_tabs
-    display = Redcar::ApplicationSWT.display
-    sash_form = active_shell.children.to_a.first
-    tab_folders = sash_form.children.to_a[1].children.to_a[0].children.to_a.select{|c| c.is_a? Swt::Custom::CTabFolder}
-    items = tab_folders.map{|f| f.getItems.to_a}.flatten
+    items = get_tab_folders.map{|f| f.getItems.to_a}.flatten
     items.map {|i| model_tab_for_item(i)}
   end
   

data/plugins/edit_view/lib/edit_view.rb

@@ -13,6 +13,8 @@ require "edit_view/edit_tab"
 require "edit_view/modified_tabs_checker"
 require "edit_view/tab_settings"
 require "edit_view/info_speedbar"
+require "edit_view/select_font_dialog"
+require "edit_view/select_theme_dialog"
 
 module Redcar
   class EditView
@@ -185,8 +187,8 @@ module Redcar
         default_font = "Courier New"
         default_font_size = 9
       end
-      [ ARGV.option("font") || default_font, 
-        (ARGV.option("font-size") || default_font_size).to_i ]
+      [ EditView.storage["font"] || default_font, 
+        EditView.storage["font-size"] || default_font_size ]
     end
     
     def self.font
@@ -197,10 +199,37 @@ module Redcar
       font_info[1]
     end
     
-    def self.theme
-      ARGV.option("theme") || "Twilight"
+    def self.font=(font)
+      EditView.storage["font"] = font
+      all_edit_views.each {|ev| ev.refresh_font }
     end    
     
+    def refresh_font      
+      notify_listeners(:font_changed)
+    end
+    
+    def self.font_size=(size)
+      EditView.storage["font-size"] = size
+      all_edit_views.each {|ev| ev.refresh_font }
+    end
+    
+    def self.theme
+      EditView.storage["theme"] || "Twilight"
+    end
+    
+    def self.theme=(theme)
+      EditView.storage["theme"] = theme
+      all_edit_views.each {|ev| ev.refresh_theme }
+    end
+
+    def self.themes
+      @themes ||= []
+    end
+    
+    def refresh_theme
+      notify_listeners(:theme_changed)
+    end
+    
     def self.focussed_tab_edit_view
       Redcar.app.focussed_notebook_tab.edit_view if Redcar.app.focussed_notebook_tab and Redcar.app.focussed_notebook_tab.edit_tab?
     end
@@ -246,9 +275,14 @@ module Redcar
     
     def set_grammar(name)
       @grammar = name
-      self.tab_width = EditView.tab_settings.width_for(name)
-      self.soft_tabs = EditView.tab_settings.softness_for(name)
+      self.tab_width     = EditView.tab_settings.width_for(name)
+      self.soft_tabs     = EditView.tab_settings.softness_for(name)
+      self.word_wrap     = EditView.tab_settings.word_wrap_for(name)
+      self.margin_column = EditView.tab_settings.margin_column_for(name)
+      self.show_margin   = EditView.tab_settings.show_margin_for(name)
       refresh_show_invisibles
+      refresh_show_line_numbers
+      refresh_show_annotations
     end
     
     def focus
@@ -279,6 +313,36 @@ module Redcar
       notify_listeners(:softness_changed, bool)
     end
     
+    def show_margin?
+      @show_margin
+    end
+    
+    def show_margin=(bool)
+      @show_margin = bool
+      EditView.tab_settings.set_show_margin_for(grammar, bool)
+      notify_listeners(:show_margin_changed, bool)
+    end
+    
+    def word_wrap?
+      @word_wrap
+    end
+    
+    def word_wrap=(bool)
+      @word_wrap = bool
+      EditView.tab_settings.set_word_wrap_for(grammar, bool)
+      notify_listeners(:word_wrap_changed, bool)
+    end
+    
+    def margin_column
+      @margin_column
+    end
+    
+    def margin_column=(val)
+      @margin_column = val
+      EditView.tab_settings.set_margin_column_for(grammar, val)
+      notify_listeners(:margin_column_changed, val)
+    end
+    
     def show_invisibles?
       @show_invisibles
     end
@@ -297,6 +361,42 @@ module Redcar
       notify_listeners(:invisibles_changed, @show_invisibles)
     end
 
+    def show_line_numbers?
+      @show_line_numbers
+    end
+
+    def self.show_line_numbers?
+      EditView.tab_settings.show_line_numbers?
+    end
+
+    def self.show_line_numbers=(bool)
+      EditView.tab_settings.set_show_line_numbers(bool)
+      all_edit_views.each {|ev| ev.refresh_show_line_numbers }
+    end
+    
+    def refresh_show_line_numbers
+      @show_line_numbers = EditView.tab_settings.show_line_numbers?
+      notify_listeners(:line_number_visibility_changed, @show_line_numbers)
+    end
+
+    def show_annotations?
+      @show_annotations
+    end
+
+    def self.show_annotations?
+      EditView.tab_settings.show_annotations?
+    end
+
+    def self.show_annotations=(bool)
+      EditView.tab_settings.set_show_annotations(bool)
+      all_edit_views.each {|ev| ev.refresh_show_annotations }
+    end
+    
+    def refresh_show_annotations
+      @show_annotations = EditView.tab_settings.show_annotations?
+      notify_listeners(:annotations_visibility_changed, @show_annotations)
+    end
+
     def title=(title)
       notify_listeners(:title_changed, title)
     end

data/plugins/edit_view/lib/edit_view/info_speedbar.rb

@@ -19,6 +19,20 @@ module Redcar
         @tab.edit_view.soft_tabs = new_value
       end
       
+      toggle :word_wrap, "Word Wrap", nil, false do |new_value|
+        @tab.edit_view.word_wrap = new_value
+      end
+      
+      label :margin_column_label, "Margin:"
+      
+      toggle :show_margin, "", nil, TabSettings::DEFAULT_MARGIN_PRESENT do |new_value|
+        @tab.edit_view.show_margin = new_value
+      end
+      
+      textbox :margin_column, TabSettings::DEFAULT_MARGIN_COLUMN.to_s do |new_value|
+        @tab.edit_view.margin_column = [new_value.to_i, 5].max
+      end
+      
       def initialize(command, tab)
         @command = command
         tab_changed(tab)
@@ -32,17 +46,29 @@ module Redcar
           @tab = new_tab
           grammar.items = InfoSpeedbar.grammar_names
           grammar.value = @tab.edit_view.grammar
-          tab_width.value = @tab.edit_view.tab_width.to_s #EditView.tab_settings.width_for(@tab.edit_view.grammar).to_s
-          soft_tabs.value = @tab.edit_view.soft_tabs?     #EditView.tab_settings.softness_for(@tab.edit_view.grammar)
+          tab_width.value = @tab.edit_view.tab_width.to_s
+          soft_tabs.value = @tab.edit_view.soft_tabs?
+          word_wrap.value = @tab.edit_view.word_wrap?
+          show_margin.value = @tab.edit_view.show_margin?
+          margin_column.value = @tab.edit_view.margin_column.to_s
           @width_handler = @tab.edit_view.add_listener(:tab_width_changed) do |new_value|
             tab_width.value = new_value.to_s
           end
+          @margin_column_handler = @tab.edit_view.add_listener(:margin_column_changed) do |new_value|
+            margin_column.value = new_value.to_s
+          end
           @softness_handler = @tab.edit_view.add_listener(:softness_changed) do |new_value|
             soft_tabs.value = new_value
           end
+          @word_wrap_handler = @tab.edit_view.add_listener(:word_wrap_changed) do |new_value|
+            word_wrap.value = new_value
+          end
           @grammar_handler = @tab.edit_view.add_listener(:grammar_changed) do |new_grammar|
             grammar.value = new_grammar
           end
+          @show_margin_handler = @tab.edit_view.add_listener(:show_margin_changed) do |new_value|
+            show_margin.value = new_value
+          end
         end
       end
       
@@ -50,7 +76,10 @@ module Redcar
         @tab.edit_view.remove_listener(@width_handler)
         @tab.edit_view.remove_listener(@grammar_handler)
         @tab.edit_view.remove_listener(@softness_handler)
-      end        
+        @tab.edit_view.remove_listener(@word_wrap_handler)
+        @tab.edit_view.remove_listener(@margin_column_handler)
+        @tab.edit_view.remove_listener(@show_margin_handler)
+      end
       
       def close
         if @tab

data/plugins/edit_view/lib/edit_view/select_font_dialog.rb

@@ -0,0 +1,39 @@
+module Redcar
+  class EditView
+    class SelectFontDialog < FilterListDialog
+
+      def initialize
+        super()
+        fontdata = Redcar.app.focussed_window.controller.shell.get_display.get_font_list(nil, true)
+        @matches = []
+        (0..(fontdata.length-1)).each do |i|
+          @matches << fontdata[i].get_name unless @matches.include?(fontdata[i].get_name)
+        end
+        @matches.sort!
+      end
+
+      def close
+        super
+      end
+
+      def update_list(filter)
+        @last_list = @matches
+        filtered_list = @last_list
+        if filter.length >= 1
+          filtered_list = filter_and_rank_by(filtered_list, filter, filtered_list.length) do |match|
+            match
+          end
+        end
+        filtered_list
+      end
+
+      def selected(text, ix, closing=false)
+        if @last_list
+          close
+          Redcar::EditView.font = text
+        end
+      end
+
+    end
+  end
+end