redcar 0.5.5dev → 0.5.6dev

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.5.5dev" # also change in lib/redcar.rb!
+REDCAR_VERSION = "0.5.6dev" # also change in lib/redcar.rb!
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'

data/lib/redcar.rb

@@ -51,7 +51,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.5.5dev' # also change in the Rakefile!
+  VERSION         = '0.5.6dev' # also change in the Rakefile!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 5
   VERSION_RELEASE = 0

data/lib/redcar/jvm_options_probe.rb

@@ -1,14 +1,33 @@
-
+require "open3"
+ 
 class JvmOptionsProbe
+ 
   def initialize
-    @help = `java -help`
+    @d32 = @d64 = @client = false
+
+    if Redcar.platform == :windows
+      @help = `java -h`
+      @d32 = (@help == `java -d32`) ? true : false
+      @d64 = (@help == `java -d64`) ? true : false
+      @client = (@help == `java -client`) ? true : false
+    else
+      @help = Open3.popen3("java -h")[2].readlines
+      @d32 = (@help == Open3.popen3("java -d32")[2].readlines) ? true : false
+      @d64 = (@help == Open3.popen3("java -d64")[2].readlines) ? true : false
+      @client = (@help == Open3.popen3("java -client")[2].readlines) ? true : false
+    end
   end
-  
+ 
   def can_use_d32?
-    @help.include?("-d32")
+    @d32
   end
-  
+ 
+  def can_use_d64?
+    @d64
+  end
+ 
   def can_use_client?
-    @help.include?("-client")
+    @client
   end
-end
+end
+

data/plugins/auto_completer/lib/auto_completer.rb

@@ -5,17 +5,17 @@ require 'auto_completer/word_iterator'
 require 'auto_completer/word_list'
 
 module Redcar
-  class AutoCompleter    
+  class AutoCompleter
     WORD_CHARACTERS = /\w|_/ # /(\s|\t|\.|\r|\(|\)|,|;)/
-    
+
     def self.document_controller_types
       [AutoCompleter::DocumentController]
     end
-    
+
     def self.autocompletion_source_types
       [AutoCompleter::CurrentDocumentCompletionSource]
     end
-    
+
     def self.all_autocompletion_source_types
       result = []
       Redcar.plugin_manager.objects_implementing(:autocompletion_source_types).each do |object|
@@ -23,7 +23,23 @@ module Redcar
       end
       result
     end
-    
+
+    #def self.edit_view_context_menus(offset)
+    #  cmd = AutoCompleter::MenuAutoCompleterCommand.new
+    #  cmd.merge_menu(offset)
+    #  completions = cmd.run
+    #  Menu::Builder.build do
+    #    sub_menu "Auto Completion" do
+    #      if completions
+    #        completions.entries.each {|item| append item }
+    #      else
+    #        item "(No Suggestions)" do
+    #        end
+    #      end
+    #    end
+    #  end
+    #end
+
     def self.menus
       Menu::Builder.build do
         sub_menu "Edit" do
@@ -34,13 +50,13 @@ module Redcar
         end
       end
     end
-    
+
     class AutoCompleteCommand < Redcar::EditTabCommand
-      
+
       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)
           prefix = controller.prefix
@@ -57,7 +73,7 @@ module Redcar
             controller.right     = right
           end
         end
-        
+
         if prefix
           index = (controller.index || 0) + 1
           if word_list.completions.length == index
@@ -65,23 +81,23 @@ module Redcar
           end
           completion = word_list.completions[index]
           controller.index = index
-          
+
           start_offset = right
           doc.insert(right, completion[prefix.length..-1])
           word_end_offset = right + completion.length - prefix.length
           doc.cursor_offset = word_end_offset
-          
+
           controller.length_of_previous = completion.length - prefix.length
-          
+
           controller.start_completion
         end
         controller.end_modification
       end
-      
+
       private
-      
+
       def alternatives(prefix)
-        sources = AutoCompleter.all_autocompletion_source_types.map do |t| 
+        sources = AutoCompleter.all_autocompletion_source_types.map do |t|
           t.new(doc, Project::Manager.focussed_project)
         end
         word_list = WordList.new
@@ -92,8 +108,8 @@ module Redcar
         end
         word_list
       end
-      
-      # returns the prefix that is being touched by the cursor and a range 
+
+      # returns the prefix that is being touched by the cursor and a range
       # containing offsets of the prefix.
       def touched_prefix
         range = doc.current_word_range
@@ -103,10 +119,15 @@ module Redcar
         return prefix, left, right
       end
     end
-    
+
     class MenuAutoCompleterCommand < AutoCompleteCommand
-      
+
+      def merge_menu(offset)
+        @merge_menu = offset
+      end
+
       def execute
+        #TODO: something with offset?
         controller = doc.controllers(AutoCompleter::DocumentController).first
         input_word = ""
         word_list = controller.word_list
@@ -117,7 +138,7 @@ module Redcar
           controller.prefix    = prefix
           controller.left      = left
           controller.right     = right
-          
+
           cur_doc = doc
           builder = Menu::Builder.new do
             word_list.words.each do |current_word, word_distance|
@@ -128,12 +149,13 @@ module Redcar
               end
             end
           end
-          
-          Application::Dialog.popup_menu(builder.menu, :cursor)
+          if @merge_menu
+            builder.menu
+          else
+            Application::Dialog.popup_menu(builder.menu, :cursor)
+          end
         end
       end
     end
   end
 end
-
-

data/plugins/edit_view/lib/edit_view.rb

@@ -24,7 +24,7 @@ module Redcar
     include Redcar::Model
     extend Redcar::Observable
     include Redcar::Observable
-    
+
     extend Forwardable
 
     module Handler
@@ -33,21 +33,21 @@ module Redcar
       def handle(edit_view, modifiers)
       end
     end
-    
+
     class << self
       attr_reader :undo_sensitivity, :redo_sensitivity
       attr_reader :focussed_edit_view
     end
-    
+
     def self.tab_settings
       @tab_settings ||= TabSettings.new
     end
 
-    # unused?      
+    # unused?
     def self.storage
       @storage ||= Plugin::Storage.new('edit_view_plugin')
     end
-    
+
     def self.menus
       Menu::Builder.build do
         sub_menu "Edit" do
@@ -68,6 +68,29 @@ module Redcar
       end
     end
 
+    def self.edit_view_context_menus
+      Menu::Builder.build do
+        group(:priority => :first) do
+          item ("Cut"  ) { Redcar::Top::CutCommand.new.run  }
+          item ("Copy" ) { Redcar::Top::CopyCommand.new.run }
+          item ("Paste") { Redcar::Top::PasteCommand.new.run}
+        end
+        group(:priority => 20) do
+          separator
+          sub_menu "Convert Text" do
+            item ("to Uppercase")     {EditView::UpcaseTextCommand.new.run}
+            item ("to Lowercase")     {EditView::DowncaseTextCommand.new.run}
+            item ("to Titlecase")     {EditView::TitlizeTextCommand.new.run}
+            item ("to Opposite Case") {EditView::OppositeCaseTextCommand.new.run}
+            separator
+            item ("to CamelCase")                           {EditView::CamelCaseTextCommand.new.run}
+            item ("to snake_case")                          {EditView::UnderscoreTextCommand.new.run}
+            item ("Toggle PascalCase-underscore-camelCase") {EditView::CamelSnakePascalRotateTextCommand.new.run}
+          end
+        end
+      end
+    end
+
     def self.all_handlers(type)
       result = []
       method_name = :"#{type}_handlers"
@@ -80,31 +103,31 @@ module Redcar
     def self.arrow_left_handlers
       [Actions::ArrowLeftHandler]
     end
-    
+
     def self.arrow_right_handlers
       [Actions::ArrowRightHandler]
     end
-    
+
     def self.tab_handlers
       [Actions::IndentTabHandler]
     end
-    
+
     def self.backspace_handlers
       [Actions::BackspaceHandler]
     end
-    
+
     def self.delete_handlers
       [Actions::DeleteHandler]
     end
-    
+
     def self.esc_handlers
       [Actions::EscapeHandler]
     end
-    
+
     def self.all_tab_handlers
       all_handlers(:tab)
     end
-    
+
     def self.all_esc_handlers
       all_handlers(:esc)
     end
@@ -140,27 +163,27 @@ module Redcar
     def tab_pressed(modifiers)
       handle_key(EditView.all_tab_handlers, modifiers)
     end
-    
+
     def esc_pressed(modifiers)
       handle_key(EditView.all_esc_handlers, modifiers)
     end
-    
+
     def left_pressed(modifiers)
       handle_key(EditView.all_arrow_left_handlers, modifiers)
     end
-    
+
     def right_pressed(modifiers)
       handle_key(EditView.all_arrow_right_handlers, modifiers)
     end
-    
+
     def delete_pressed(modifiers)
       handle_key(EditView.all_delete_handlers, modifiers)
     end
-    
+
     def backspace_pressed(modifiers)
       handle_key(EditView.all_backspace_handlers, modifiers)
     end
-    
+
     # Called by the GUI whenever an EditView is focussed or
     # loses focus. Sends :focussed_edit_view event.
     #
@@ -174,14 +197,14 @@ module Redcar
       edit_view.check_for_updated_document if edit_view
       notify_listeners(:focussed_edit_view, edit_view)
     end
-    
+
     def self.current
       tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
       if tab.is_a?(Redcar::EditTab)
         tab.edit_view
       end
     end
-    
+
     def self.sensitivities
       [
         Sensitivity.new(:edit_tab_focussed, Redcar.app, false, [:tab_focussed]) do |tab|
@@ -196,12 +219,12 @@ module Redcar
             tab and tab.is_a?(EditTab) and tab.edit_view.document.selection?
           end
         end,
-        @undo_sensitivity = 
+        @undo_sensitivity =
           Sensitivity.new(:undoable, Redcar.app, false, [:focussed_tab_changed, :tab_focussed]) do
             tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
             tab and tab.is_a?(EditTab) and tab.edit_view.undoable?
           end,
-        @redo_sensitivity = 
+        @redo_sensitivity =
           Sensitivity.new(:redoable, Redcar.app, false, [:focussed_tab_changed, :tab_focussed]) do
             tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
             tab and tab.is_a?(EditTab) and tab.edit_view.redoable?
@@ -223,36 +246,36 @@ module Redcar
         default_font = "Courier New"
         default_font_size = 9
       end
-      [ EditView.storage["font"] || default_font, 
+      [ EditView.storage["font"] || default_font,
         EditView.storage["font-size"] || default_font_size ]
     end
-    
+
     def self.font
       font_info[0]
     end
-    
+
     def self.font_size
       font_info[1]
     end
-    
+
     def self.font=(font)
       EditView.storage["font"] = font
       all_edit_views.each {|ev| ev.refresh_font }
-    end    
-    
-    def 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)
       theme.gsub!(/ \(Current\)$/, '')
       EditView.storage["theme"] = theme
@@ -265,55 +288,55 @@ module Redcar
     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
-    
+
     def self.focussed_edit_view_document
       focussed_tab_edit_view.document if focussed_tab_edit_view
     end
-    
+
     def self.focussed_document_mirror
       focussed_edit_view_document.mirror if focussed_edit_view_document
     end
-    
+
     def self.all_edit_views
       Redcar.app.windows.map {|w| w.notebooks.map {|n| n.tabs}.flatten }.flatten.select {|t| t.is_a?(EditTab)}.map {|t| t.edit_view}
     end
-    
+
     attr_reader :document
-    
+
     def initialize
       create_document
       @grammar = nil
       @focussed = nil
     end
-    
+
     def create_document
       @document = Redcar::Document.new(self)
     end
-    
+
     def_delegators :controller, :undo,      :redo,
                                 :undoable?, :redoable?,
                                 :reset_undo,
                                 :cursor_offset, :cursor_offset=,
                                 :scroll_to_line, :compound,
                                 :begin_compound, :end_compound
-    
+
     def grammar
       @grammar
     end
-    
+
     def grammar=(name)
       set_grammar(name)
       notify_listeners(:grammar_changed, name)
     end
-    
+
     def set_grammar(name)
       @grammar = name
       self.tab_width     = EditView.tab_settings.width_for(name)
@@ -325,11 +348,11 @@ module Redcar
       refresh_show_line_numbers
       refresh_show_annotations
     end
-    
+
     def focus
       notify_listeners(:focussed)
     end
-    
+
     def exists?
       controller.exists?
     end
@@ -337,57 +360,57 @@ module Redcar
     def tab_width
       @tab_width
     end
-    
+
     def tab_width=(val)
       @tab_width = val
       EditView.tab_settings.set_width_for(grammar, val)
       notify_listeners(:tab_width_changed, val)
     end
-    
+
     def set_tab_width(val)
       @tab_width = val
     end
-    
+
     def soft_tabs?
       @soft_tabs
     end
-    
+
     def soft_tabs=(bool)
       @soft_tabs = bool
       EditView.tab_settings.set_softness_for(grammar, bool)
       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
@@ -400,7 +423,7 @@ module Redcar
       EditView.tab_settings.set_show_invisibles(bool)
       all_edit_views.each {|ev| ev.refresh_show_invisibles }
     end
-    
+
     def refresh_show_invisibles
       @show_invisibles = EditView.tab_settings.show_invisibles?
       notify_listeners(:invisibles_changed, @show_invisibles)
@@ -418,7 +441,7 @@ module Redcar
       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)
@@ -436,7 +459,7 @@ module Redcar
       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)
@@ -451,30 +474,30 @@ module Redcar
         :cursor_offset => cursor_offset,
         :grammar       => grammar         }
     end
-    
+
     def deserialize(data)
       self.grammar       = data[:grammar]
       document.text      = data[:contents]
       self.cursor_offset = data[:cursor_offset]
     end
-    
+
     def delay_parsing
       controller.delay_parsing { yield }
     end
-    
+
     def reset_last_checked
       @last_checked = Time.now
     end
-    
+
     def check_for_updated_document
       # awful forward dependency on the Project plugin here....
-      if document and 
-            document.mirror and 
-            document.mirror.is_a?(Project::FileMirror) and 
+      if document and
+            document.mirror and
+            document.mirror.is_a?(Project::FileMirror) and
             document.mirror.changed_since?(@last_checked)
         if document.modified?
           result = Application::Dialog.message_box(
-                     "This file has been changed on disc, and you have unsaved changes in Redcar.\n\n" + 
+                     "This file has been changed on disc, and you have unsaved changes in Redcar.\n\n" +
                      "Revert to version on disc (and lose your changes)?",
                      :buttons => :yes_no
                     )
@@ -489,5 +512,4 @@ module Redcar
       @last_checked = Time.now
     end
   end
-end
-
+end