redcar 0.12.1 → 0.13

data/plugins/application_swt/lib/application_swt/icon.rb

@@ -4,7 +4,7 @@ module Redcar
     module Icon
       def self.swt_image(icon)
         case icon
-        when :directory
+        when :directory, :dir
           dir_image
         when :file
           file_image

data/plugins/application_swt/lib/application_swt/menu.rb

@@ -16,8 +16,6 @@ module Redcar
 
       attr_reader :menu_bar
 
-
-
       def self.menu_types
         [Swt::SWT::BAR, Swt::SWT::POP_UP]
       end
@@ -31,11 +29,13 @@ module Redcar
         @keymap = keymap
         @menu_bar = Swt::Widgets::Menu.new(window.shell, type)
         @menu_bar.set_visible(false)
+        
         return unless menu_model
         @handlers = []
         @use_numbers = options[:numbers]
         @number = 1
-        add_entries_to_menu(@menu_bar, menu_model)
+        
+        add_entries_to_menu(@menu_bar, nil, menu_model)
         #puts "ApplicationSWT::Menu initialize took #{Time.now - s}s"
       end
 
@@ -59,7 +59,26 @@ module Redcar
         @use_numbers
       end
 
-      def add_entries_to_menu(menu, menu_model)
+      class MenuListener
+        attr_reader :items
+        
+        def initialize
+          @items = []
+        end
+        
+        def menu_shown(e)
+          items.each do |item, entry|
+            if entry.type == :check
+              item.setSelection(entry.checked?)
+            end
+          end
+        end
+        
+        def menu_hidden(e)
+        end
+      end
+
+      def add_entries_to_menu(menu, menu_listener, menu_model)
         menu_model.each do |entry|
           if entry.is_a?(Redcar::Menu::LazyMenu)
             menu_header = Swt::Widgets::MenuItem.new(menu, Swt::SWT::CASCADE)
@@ -68,7 +87,7 @@ module Redcar
             menu_header.menu = new_menu
             menu_header.add_arm_listener do
               new_menu.get_items.each {|i| i.dispose }
-              add_entries_to_menu(new_menu, entry)
+              add_entries_to_menu(new_menu, nil, entry)
             end
           elsif entry.is_a?(Redcar::Menu)
             menu_header = Swt::Widgets::MenuItem.new(menu, Swt::SWT::CASCADE)
@@ -76,7 +95,9 @@ module Redcar
             new_menu = Swt::Widgets::Menu.new(menu)
             menu_header.menu = new_menu
             menu_header.enabled = (entry.length > 0)
-            add_entries_to_menu(new_menu, entry)
+            new_menu_listener = MenuListener.new
+            add_entries_to_menu(new_menu, new_menu_listener, entry)
+            new_menu.add_menu_listener(new_menu_listener)
             menu_header.add_arm_listener do
               entry.entries.zip(new_menu.get_items) do |sub_entry, swt_item|
                 if sub_entry.lazy_text?
@@ -88,12 +109,15 @@ module Redcar
             item = Swt::Widgets::MenuItem.new(menu, Swt::SWT::SEPARATOR)
           elsif entry.is_a?(Redcar::Menu::Item)
             item = Swt::Widgets::MenuItem.new(menu, Menu.types[entry.type] || Swt::SWT::PUSH)
-            item.setSelection(entry.active)
             if entry.command.is_a?(Proc)
               connect_proc_to_item(item, entry)
             else
               connect_command_to_item(item, entry)
             end
+            if [:check, :radio].include? entry.type
+              menu_listener.items << [item, entry] if menu_listener
+              item.setSelection(entry.checked?)
+            end
           else
             raise "unknown object of type #{entry.class} in menu"
           end
@@ -121,7 +145,11 @@ module Redcar
         else
           item.text = entry.text
         end
-        item.addSelectionListener(ProcSelectionListener.new(entry))
+        if entry.enabled?
+          item.addSelectionListener(ProcSelectionListener.new(entry))
+        else
+          item.enabled = false
+        end
       end
 
       class SelectionListener
@@ -151,14 +179,18 @@ module Redcar
         else
           item.text = entry.text
         end
-        item.add_selection_listener(SelectionListener.new(entry))
-        h = entry.command.add_listener(:active_changed) do |value|
-          unless item.disposed
-            item.enabled = value
+        if entry.enabled?
+          item.add_selection_listener(SelectionListener.new(entry))
+          h = entry.command.add_listener(:active_changed) do |value|
+            unless item.disposed
+              item.enabled = value
+            end
           end
-        end
-        @handlers << [entry.command, h]
-        if not entry.command.active?
+          @handlers << [entry.command, h]
+          if not entry.command.active?
+            item.enabled = false
+          end
+        else
           item.enabled = false
         end
       end

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

@@ -104,6 +104,12 @@ module Redcar
       def attach_view_listeners
         @tab_folder.add_ctab_folder2_listener(CTabFolder2Listener.new(self))
         @tab_folder.add_selection_listener(SelectionListener.new(self))
+        @tab_folder.add_listener(Swt::SWT::MenuDetect) do |event|
+          point = ApplicationSWT.display.map(nil, @tab_folder, Swt::Graphics::Point.new(event.x, event.y))
+          if item = @tab_folder.getItem(point)
+            @model.right_click_on_tab(tab_item_to_tab_model(item))
+          end
+        end
       end
       
       # Called by the models when a tab is selected by Redcar.
@@ -139,8 +145,11 @@ module Redcar
       private
       
       def focussed_tab
-        focussed_tab_item = tab_folder.get_selection
-        @model.tabs.detect {|tab| tab.controller.item == focussed_tab_item }
+        tab_item_to_tab_model(tab_folder.get_selection)
+      end
+      
+      def tab_item_to_tab_model(tab_item)
+        @model.tabs.detect {|tab| tab.controller.item == tab_item }
       end
       
     end

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

@@ -2,11 +2,11 @@
 module Redcar
   class ApplicationSWT
     class Window
-      attr_reader :shell, :window
+      attr_reader :shell, :window, :sash
 
       SASH_WIDTH             = 5
-      TREEBOOK_WIDTH         = 200
       MINIMUM_TREEBOOK_WIDTH = 0
+      TREEBOOK_WIDTH         = 200
       VISIBLE_TREEBOOK_WIDTH = 25
       TOOLBAR_HEIGHT         = 25
       @toolbar_height        = 30
@@ -67,8 +67,7 @@ module Redcar
         @window.add_listener(:speedbar_closed, &method(:speedbar_closed))
         @window.add_listener(:enlarge_notebook, &method(:enlarge_notebook))
         @window.add_listener(:reset_notebook_widths, &method(:reset_notebook_sash_widths))
-        @window.add_listener(:increase_treebook_width, &method(:increase_treebook_width))
-        @window.add_listener(:decrease_treebook_width, &method(:decrease_treebook_width))
+        @window.add_listener(:treebook_width_changed, &method(:set_sash_widths))
 
         @window.add_listener(:toggle_trees_visible, &method(:toggle_sash_widths))
         @window.treebook.add_listener(:tree_added) do
@@ -87,19 +86,34 @@ module Redcar
         @window.treebook.add_listener(:tree_removed) do
           reset_sash_widths
         end
+        
         @shell.add_key_listener(KeyListener.new(self))
+        @sash.add_selection_listener do |e|
+          @treebook_open_width = e.x
+        end
       end
 
-      def treebook_hidden?
-        treebook_width <= VISIBLE_TREEBOOK_WIDTH
+      def default_treebook_width
+        TREEBOOK_WIDTH + SASH_WIDTH
       end
 
       def treebook_width
         @sash.layout_data.left.offset
       end
 
-      def default_treebook_width
-        TREEBOOK_WIDTH + SASH_WIDTH
+      def treebook_open_width
+        @treebook_open_width || default_treebook_width
+      end
+      
+      def set_treebook_open_width(width)
+        @treebook_open_width = width
+        unless treebook_hidden?
+          set_sash_widths(width)
+        end
+      end
+
+      def treebook_hidden?
+        treebook_width <= VISIBLE_TREEBOOK_WIDTH
       end
 
       def fullscreen
@@ -109,6 +123,17 @@ module Redcar
       def fullscreen=(value)
         @shell.setFullScreen(value)
       end
+      
+      def bounds
+        rect = @shell.bounds
+        [rect.x, rect.y, rect.width, rect.height]
+      end
+      
+      def set_bounds(new_bounds)
+        @shell.set_bounds(
+          Java::OrgEclipseSwtGraphics::Rectangle.new(
+            new_bounds[0], new_bounds[1], new_bounds[2], new_bounds[3]))
+      end
 
       class KeyListener
         def initialize(edit_view_swt)
@@ -116,18 +141,13 @@ module Redcar
         end
 
         def key_pressed(key_event)
-          p key_event
           if key_event.character == Swt::SWT::TAB
-            p :tab_pressedwin
           elsif key_event.character == Swt::SWT::ESC
-            p :esc_pressedwin
           end
         end
 
         def verify_key(key_event)
-          p :verkey
           if key_event.character == Swt::SWT::TAB
-            p :tab_pressed
             key_event.doit = false
           end
         end
@@ -138,9 +158,7 @@ module Redcar
 
       def create_treebook_controller
         treebook = @window.treebook
-        controller = ApplicationSWT::Treebook.new(
-        self,
-        treebook)
+        controller = ApplicationSWT::Treebook.new(self, treebook)
         treebook.controller = controller
       end
 
@@ -353,11 +371,7 @@ module Redcar
         @treebook_unopened = !@window.treebook.trees.any?
         width = 0
         if @window.treebook.trees.any?
-          if @treebook_open_width
-            width = @treebook_open_width
-          else
-            width = default_treebook_width
-          end
+          width = treebook_open_width
         end
         set_sash_widths(width)
       end
@@ -370,23 +384,12 @@ module Redcar
           set_sash_widths(MINIMUM_TREEBOOK_WIDTH)
         end
       end
-
-      def decrease_treebook_width
-        width = treebook_width
-        unless width < MINIMUM_TREEBOOK_WIDTH + SASH_WIDTH
-          set_sash_widths(width-SASH_WIDTH)
-        end
-      end
-
-      def increase_treebook_width
-        set_sash_widths(treebook_width+SASH_WIDTH)
-      end
-
+      
       def set_sash_widths(offset)
         @sash.layout_data.left = Swt::Layout::FormAttachment.new(0, offset)
         @shell.layout
       end
-
+      
       def reset_notebook_sash_widths
         width = (100/@window.notebooks.length).to_i
         widths = [width]*@window.notebooks.length

data/plugins/auto_indenter/lib/auto_indenter/analyzer.rb

@@ -52,7 +52,7 @@ module Redcar
             return 0, indent_next_line
           end
           line = @doc.get_line(current)
-          if rules.unindented_line?(line)
+          if rules.unindented_line?(line) or line =~ /^\s*$/
             current -= 1
           else
             if indent_next_line == nil

data/plugins/auto_indenter/spec/auto_indenter/analyzer_spec.rb

@@ -58,6 +58,15 @@ RUBY
       should_indent(<<RUBY, :line => 1, :indent => 0)
 def foo
   end # should be dedented
+RUBY
+    end
+    
+    it "should ignore blank lines as part of the indentation" do
+      should_indent(<<RUBY, :line => 3, :indent => 1)
+  def foo
+  end
+
+def foo
 RUBY
     end
   end

data/plugins/declarations/lib/declarations.rb

@@ -1,4 +1,5 @@
 
+require 'declarations/commands'
 require 'declarations/completion_source'
 require 'declarations/file'
 require 'declarations/parser'
@@ -9,8 +10,17 @@ module Redcar
   class Declarations
     def self.menus
       Menu::Builder.build do
+        sub_menu "Edit" do
+          group :priority => 30 do
+            item "Find declaration", :command => Declarations::OpenOutlineViewCommand
+          end
+        end
+        
         sub_menu "Project" do
-          item "Go to declaration", :command => Declarations::GoToTagCommand, :priority => 30
+          group :priority => 60 do
+            item "Go to declaration", :command => Declarations::GoToTagCommand, :priority => 30
+            item "Find declaration", :command => Declarations::OpenProjectOutlineViewCommand, :priority => :first
+          end
           sub_menu "Refresh", :priority => 31 do
             item "Declarations file", :command => Declarations::RebuildTagsCommand
           end
@@ -21,10 +31,14 @@ module Redcar
     def self.keymaps
       linwin = Keymap.build("main", [:linux, :windows]) do
         link "Alt+G", Declarations::GoToTagCommand
+        link "Ctrl+I", Declarations::OpenOutlineViewCommand
+        link "Ctrl+Shift+I", Declarations::OpenProjectOutlineViewCommand
       end
 
       osx = Keymap.build("main", :osx) do
         link "Ctrl+Alt+G", Declarations::GoToTagCommand
+        link "Cmd+I", Declarations::OpenOutlineViewCommand
+        link "Cmd+Ctrl+I", Declarations::OpenProjectOutlineViewCommand
       end
 
       [linwin, osx]
@@ -38,6 +52,20 @@ module Redcar
       ::File.join(project.config_dir, 'tags')
     end
 
+    def self.icon_for_kind(kind)
+      h = {
+        :method     => :node_insert,
+        :class      => :open_source_flipped,
+        :attribute  => :status,
+        :alias      => :arrow_branch,
+        :assignment => :arrow,
+        :interface  => :information,
+        :closure    => :node_magnifier,
+        :none       => nil
+      }
+      h[kind.to_sym]
+    end
+      
     class ProjectRefresh < Task
       def initialize(project)
         @file_list   = project.file_list
@@ -49,7 +77,6 @@ module Redcar
       end
 
       def execute
-        return if @project.remote?
         file = Declarations::File.new(Declarations.file_path(@project))
         file.update_files(@file_list)
         file.dump
@@ -78,9 +105,9 @@ module Redcar
       end
     end
 
-	def self.match_kind(path, regex)
+    def self.match_kind(path, regex)
       Declarations::Parser.new.match_kind(path, regex)
-	end
+    end
 
     def self.clear_tags_for_path(path)
       @tags_for_path ||= {}
@@ -93,67 +120,5 @@ module Redcar
       regexp = Regexp.new(Regexp.escape(match[:match]))
       DocumentSearch::FindNextRegex.new(regexp, true).run_in_focussed_tab_edit_view
     end
-
-    class RebuildTagsCommand < Command
-      def execute
-        project = Project::Manager.focussed_project
-        tags_path = Declarations.file_path(project)
-        FileUtils.rm tags_path if ::File.exists? tags_path
-        ProjectRefresh.new(project).execute
-      end
-    end
-    
-    class GoToTagCommand < EditTabCommand
-      sensitize :open_project
-
-      def execute
-        if Project::Manager.focussed_project.remote?
-          Application::Dialog.message_box("Go to declaration doesn't work in remote projects yet :(")
-          return
-        end
-
-        if doc.selection?
-          handle_tag(doc.selected_text)
-        else
-          range = doc.current_word_range
-          handle_tag(doc.get_slice(range.first, range.last))
-        end
-      end
-
-      def handle_tag(token = '')
-        tags_path = Declarations.file_path(Project::Manager.focussed_project)
-        unless ::File.exist?(tags_path)
-          Application::Dialog.message_box("The declarations file 'tags' has not been generated yet.")
-          return
-        end
-        matches = find_tag(tags_path, token).uniq
-        
-        # save current cursor position before jump to another location.
-        Redcar.app.navigation_history.save(doc) if matches.size > 0
-        
-        case matches.size
-        when 0
-          Application::Dialog.message_box("There is no declaration for '#{token}' in the 'tags' file.")
-        when 1
-          Redcar::Declarations.go_to_definition(matches.first)
-        else
-          open_select_tag_dialog(matches)
-        end
-        
-        Redcar.app.navigation_history.save(doc) if matches.size > 0
-      end
-
-      def find_tag(tags_path, tag)
-        Declarations.tags_for_path(tags_path)[tag] || []
-      end
-
-      def open_select_tag_dialog(matches)
-        Declarations::SelectTagDialog.new(matches).open
-      end
-
-      def log(message)
-        puts("==> Ctags: #{message}")
-      end
-    end
   end
 end