redcar 0.9.2 → 0.10

data/plugins/application_swt/lib/swt/graphics_utils.rb

@@ -166,5 +166,28 @@ module Swt
 
       return Image.new(display, dd)
     end
+
+    def self.pixel_location_at_offset(offset)
+      edit_view = Redcar::EditView.focussed_tab_edit_view
+      if edit_view
+        text_widget = edit_view.controller.mate_text.viewer.get_text_widget
+        location    = text_widget.get_location_at_offset(offset)
+        x, y = location.x, location.y
+        widget_offset = text_widget.to_display(0,0)
+        x += widget_offset.x
+        y += widget_offset.y
+        [x,y]
+      end
+    end
+
+    def self.below_pixel_location_at_offset(offset)
+      x, y = GraphicsUtils.pixel_location_at_offset(offset)
+      if x and y
+        edit_view = Redcar::EditView.focussed_tab_edit_view
+        text_widget = edit_view.controller.mate_text.viewer.get_text_widget
+        y += text_widget.get_line_height
+        [x, y]
+      end
+    end
   end
 end

data/plugins/application_swt/lib/swt/vtab_folder.rb

@@ -40,6 +40,13 @@ module Swt
           :percents => percents.collect { |i| i / 100.0 },
           :vertical => vertical }
       end
+      
+      def set_background(colors, percents, vertical = true)
+        @background_color_options = { :colors => colors,
+          :percents => percents.collect { |i| i / 100.0 },
+          :vertical => vertical }
+        @tab_area.background = colors[colors.size - 1]
+      end
 
       def add_item(tab)
         @items << tab

data/plugins/application_swt/lib/swt/vtab_label.rb

@@ -41,7 +41,7 @@ module Swt
                   h = idx > 0 ? extent.height * options[:percents][idx - 1] : 0
                   gc.fill_gradient_rectangle(0, h, extent.width, extent.height * p, true)
                 else
-                  h = idx > 0 ? extent.width * options[:percents][idx - 1] : 0
+                  w = idx > 0 ? extent.width * options[:percents][idx - 1] : 0
                   gc.fill_gradient_rectangle(w, 0, extent.width * p, extent.height, false)
                 end
               end

data/plugins/application_swt/spec/application_swt/gradient_spec.rb

@@ -0,0 +1,142 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe Redcar::ApplicationSWT::Gradient do
+  
+  color_position_hash = {100 => "#000000", 0 => "#FFFFFF", 50 => "#999999"}
+  subject { Redcar::ApplicationSWT::Gradient.new(color_position_hash) }
+  
+  it "should output its contents as a hash" do
+    subject.to_hash.should == color_position_hash
+  end
+  
+  describe "swt_stops" do
+    
+    it "not include the implied zero stop" do
+      subject.swt_stops.should_not include(0)
+    end
+    
+    it "should include nonzero stops from the input" do
+      subject.swt_stops.to_a.should == [50, 100]
+    end
+    
+    it "should be in increasing order" do
+      subject.swt_stops.sort.should == subject.swt_stops.to_a
+    end
+    
+  end
+  
+  describe "swt_colors" do
+  
+    it "should be Swt::Color versions of the gradient colors in increasing order by stop position" do
+      subject.swt_colors[0].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 255, 255, 255)
+      subject.swt_colors[1].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 153, 153, 153)
+      subject.swt_colors[2].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 0, 0, 0)
+    end
+    
+  end
+  
+  context "when constructed with an implied 0-position stop" do
+    
+    subject { Redcar::ApplicationSWT::Gradient.new( 50 => "#000000", 100 => "#FFFFFF" ) }
+    
+    describe "swt_stops" do
+      
+      it "should have the first color position as its first element" do
+        subject.swt_stops.first.should == 50
+      end
+      
+    end
+    
+    describe "swt_colors" do
+      
+      it "should have the gradient's first color as its first two elements" do
+        first_color = Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 0, 0, 0)
+        subject.swt_colors[0].should == first_color
+        subject.swt_colors[1].should == first_color
+      end
+      
+    end
+    
+  end
+  
+  context "when constructed with an implied 100-position stop" do
+    
+    subject { Redcar::ApplicationSWT::Gradient.new( 0 => "#000000", 50 => "#FFFFFF" ) }
+    
+    describe "swt_stops" do
+      
+      it "should include a stop at position 100" do
+        subject.swt_stops.should include(100)
+      end
+      
+    end
+    
+    describe "swt_colors" do
+      
+      it "should have the gradient's last color as its last two elements" do
+        last_color = Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 255, 255, 255)
+        subject.swt_colors[1].should == last_color
+        subject.swt_colors[2].should == last_color
+      end
+      
+    end
+    
+  end
+  
+  context "when constructed with stop position below 0" do
+    
+    it "should raise an ArgumentError" do
+      expect{ Redcar::ApplicationSWT::Gradient.new( -999 => "#FFFFFF") }.should raise_error(ArgumentError)
+    end
+    
+  end
+  
+  context "when constructed with stop position above 100" do
+    
+    it "should raise an ArgumentError" do
+      expect{ Redcar::ApplicationSWT::Gradient.new( 999 => "#FFFFFF") }.should raise_error(ArgumentError)
+    end
+    
+  end
+  
+  context "when constructed with three-character hex strings for colors" do
+    
+    subject { Redcar::ApplicationSWT::Gradient.new( 50 => "#F0F" ) }
+    
+    it "should process the colors correctly" do
+      subject.swt_colors[0].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 255, 0, 255)
+    end
+    
+  end
+  
+  context "when constructed with a single color instead of a gradient" do
+  
+    subject { Redcar::ApplicationSWT::Gradient.new( "#FFFFFF" ) }
+  
+    it "it should construct a gradient with that color" do
+      subject.swt_colors[0].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 255, 255, 255)
+    end
+  
+  end
+  
+  context "when constructed with a color name" do
+    
+    subject { Redcar::ApplicationSWT::Gradient.new( "black" ) }
+    
+    it "should return the SWT system color corresponding to that name" do
+      subject.swt_colors[0].should == Redcar::ApplicationSWT.display.get_system_color(Swt::SWT::COLOR_BLACK)
+    end
+    
+  end
+  
+  context "when constructed with the color 'none'" do
+    
+    subject { Redcar::ApplicationSWT::Gradient.new( "none" ) }
+    
+    it "should return the SWT system color corresponding to that name" do
+      subject.swt_colors[0].should == Redcar::ApplicationSWT.display.get_system_color(Swt::SWT::NONE)
+    end
+    
+  end
+  
+end

data/plugins/auto_completer/lib/auto_completer.rb

@@ -3,6 +3,7 @@ require 'auto_completer/current_document_completion_source'
 require 'auto_completer/document_controller'
 require 'auto_completer/word_iterator'
 require 'auto_completer/word_list'
+require 'auto_completer/list_dialog'
 
 module Redcar
   class AutoCompleter
@@ -24,22 +25,6 @@ module Redcar
       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
@@ -122,38 +107,21 @@ module Redcar
 
     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
+        word_list  = controller.word_list
         prefix, left, right = touched_prefix
         if prefix
           word_list = alternatives(prefix)
-          controller.word_list = word_list
-          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|
-              item(current_word) do
-                offset = cur_doc.cursor_offset - prefix.length
-                text   = current_word[input_word.length..current_word.length]
-                cur_doc.replace(offset, prefix.length, text)
-              end
-            end
-          end
-          if @merge_menu
-            builder.menu
-          else
-            Application::Dialog.popup_menu(builder.menu, :cursor)
-          end
+          cur_doc   = doc
+          key_list  = word_list.words.keys
+          height    = [key_list.size,8].min
+          dialog    = ListDialog.new(prefix,cur_doc)
+          dialog.update_list(key_list)
+          dialog.set_location(cur_doc.cursor_offset - prefix.length)
+          dialog.set_size 300, height
+          dialog.open
         end
       end
     end

data/plugins/auto_completer/lib/auto_completer/list_dialog.rb

@@ -0,0 +1,21 @@
+
+module Redcar
+  class AutoCompleter
+    class ListDialog < Redcar::ModelessListDialog
+
+      def initialize(prefix,document)
+        super()
+        @prefix = prefix
+        @doc = document
+      end
+
+      def selected(index)
+        if text = select(index)
+          offset = @doc.cursor_offset - @prefix.length
+          @doc.replace(offset, @prefix.length, text)
+          close
+        end
+      end
+    end
+  end
+end

data/plugins/clojure/lib/clojure.rb

@@ -0,0 +1,33 @@
+
+require 'clojure/repl_mirror'
+
+module Redcar
+  class Clojure
+
+    def self.menus
+      Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "REPL" do
+            item "Open Clojure REPL", ClojureOpenREPL
+          end
+        end
+      end
+    end
+
+    def self.load_dependencies
+      unless @loaded
+        require File.join(Redcar.asset_dir, "clojure.jar")
+        require File.join(Redcar.asset_dir, "clojure-contrib.jar")
+        require File.join(Redcar.asset_dir, "org-enclojure-repl-server.jar")
+        require File.dirname(__FILE__) + "/../vendor/enclojure-wrapper.jar"
+        @loaded = true
+      end
+    end
+
+    class ClojureOpenREPL < Redcar::REPL::OpenREPL
+      def execute
+        open_repl(ReplMirror.new)
+      end
+    end
+  end
+end

data/plugins/{repl/lib/repl/clojure_mirror.rb → clojure/lib/clojure/repl_mirror.rb}

@@ -1,49 +1,45 @@
 
 module Redcar
-  class REPL
-    class ClojureMirror < ReplMirror
-      
+  class Clojure
+    class ReplMirror < Redcar::REPL::ReplMirror
+
       def title
         "Clojure REPL"
       end
-      
+
       def grammar_name
         "Clojure REPL"
       end
-      
+
       def prompt
         "user=>"
       end
-      
+
       def evaluator
-        @evaluator ||= ClojureMirror::Evaluator.new(self)
+        @evaluator ||= Evaluator.new(self)
       end
-      
+
       def format_error(e)
         "ERROR: #{e.message}\n\n#{e.backtrace.join("\n")}"
       end
 
       class Evaluator
         attr_reader :wrapper
-        
-        def self.load_clojure_dependencies
+
+        def self.load_dependencies
           unless @loaded
-            require File.join(Redcar.asset_dir, "clojure.jar")
-            require File.join(Redcar.asset_dir, "clojure-contrib.jar")
-            require File.join(Redcar.asset_dir, "org-enclojure-repl-server.jar")
-            require File.dirname(__FILE__) + "/../../vendor/enclojure-wrapper.jar"
-            
+            Clojure.load_dependencies
             import 'redcar.repl.Wrapper'
             @loaded = true
           end
         end
 
         def initialize(mirror)
-          ClojureMirror::Evaluator.load_clojure_dependencies
+          Evaluator.load_dependencies
           @mirror = mirror
           @wrapper ||= begin
-            wrapper = Wrapper.new 
-            
+            wrapper = Wrapper.new
+
             @thread = Thread.new do
               loop do
                 output = wrapper.getResult
@@ -51,11 +47,11 @@ module Redcar
                 @result = $1
               end
             end
-            
+
             wrapper
           end
         end
-        
+
         def execute(expr)
           wrapper.sendToRepl(expr)
           true until @result

data/plugins/clojure/plugin.rb

@@ -0,0 +1,9 @@
+
+Plugin.define do
+  name    "Clojure"
+  version "1.0"
+  file    "lib", "clojure"
+  object  "Redcar::Clojure"
+  dependencies "redcar", ">0",
+               "repl",   ">0"
+end

data/plugins/{repl/spec/repl/clojure_mirror_spec.rb → clojure/spec/clojure/repl_mirror_spec.rb}

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
-class Redcar::REPL
-  describe ClojureMirror do
+class Redcar::Clojure
+  describe ReplMirror do
     before(:all) do
-      @mirror = ClojureMirror.new
+      @mirror = ReplMirror.new
       @changed_event = false
       @mirror.add_listener(:change) { @changed_event = true }
     end
@@ -12,44 +12,43 @@ class Redcar::REPL
       while @mirror.read.nil? || @mirror.read[-3,3] != "=> "
       end
     end
-    
+
     describe "before executing" do
       it "should exist" do
         @mirror.should be_exist
       end
-      
+
       it "should have a title" do
         @mirror.title.should == "Clojure REPL"
       end
-      
+
       it "should not be changed" do
         @mirror.should_not be_changed
       end
     end
-    
+
     describe "after executing" do
       it "should exist" do
         @mirror.should be_exist
       end
-      
+
       it "should have a title" do
         @mirror.title.should == "Clojure REPL"
       end
-      
+
       it "should not be changed" do
         @mirror.should_not be_changed
       end
-      
+
       it "should have a prompt" do
         wait_for_prompt
         @mirror.read.should == (<<-CLOJURE).chomp
 # Clojure REPL
+# type 'help' for help
 
 user=> 
 CLOJURE
       end
-      
     end
-          
   end
-end
+end