redcar-dev 0.12.27dev → 0.13.0dev

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
@@ -78,9 +106,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 +121,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

data/plugins/declarations/lib/declarations/commands.rb

@@ -0,0 +1,147 @@
+module Redcar
+  class Declarations
+    
+    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
+    
+    class OpenOutlineViewCommand < Redcar::EditTabCommand
+      
+      def execute
+        cur_doc = Redcar.app.focussed_window.focussed_notebook_tab.document
+        if cur_doc
+          Declarations::OutlineViewDialog.new(cur_doc).open
+        end
+      end
+    end
+
+    class OpenProjectOutlineViewCommand < Redcar::ProjectCommand
+      def execute
+        Declarations::ProjectOutlineViewDialog.new(project).open if project
+      end
+    end
+    
+    class OutlineViewDialog < FilterListDialog
+      include Redcar::Model
+      include Redcar::Observable
+      
+      attr_accessor :document
+      attr_accessor :last_list
+      
+      def initialize(document)
+        @document = document
+        file = Declarations::File.new(@document.path)
+        file.add_tags_for_paths(@document.path)
+        @tags = file.tags
+        @all = []
+        @tags.each do |name, path, match|
+          kind = Declarations.match_kind(path, match)
+          @all << {:name => name, :icon => Declarations.icon_for_kind(kind), :path => path, :match => match}
+        end
+        super()
+      end
+      
+      def update_list(filter)
+        filter_and_rank_by(@all, filter) {|h| h[:name]}
+      end
+
+      def selected(item, ix)
+        close
+        Redcar.app.navigation_history.save(@document) if @document
+        DocumentSearch::FindNextRegex.new(Regexp.new(Regexp.quote(item[:match])), true).run_in_focussed_tab_edit_view
+        Redcar.app.navigation_history.save(@document) if @document
+      end
+    end
+
+    class ProjectOutlineViewDialog < FilterListDialog
+      def initialize(project)
+        @project = project
+        file = Declarations::File.new(Declarations.file_path(@project))
+        @all = []
+        file.tags.each do |name, path, match|
+          @all << {:name => name + " (" + ::File.basename(path) + ")", :base_name => name, :path => path, :match => match}
+        end
+        super()
+      end
+      
+      def update_list(filter)
+        results = filter_and_rank_by(@all, filter) { |h| h[:base_name] }
+        results.each do |result|
+          kind = Declarations.match_kind(result[:path], result[:match])
+          result[:icon] = Declarations.icon_for_kind(kind)
+        end
+        results
+      end
+      
+      def selected(item, ix)
+        if path = item[:path] and ::File.exists?(path)
+          close
+          if tab = Redcar::Project::Manager.open_file(path)
+            doc = Redcar::EditView.focussed_tab_edit_view.document
+            Redcar.app.navigation_history.save(doc)
+            DocumentSearch::FindNextRegex.new(Regexp.new(Regexp.quote(item[:match])), true).run_in_focussed_tab_edit_view
+            Redcar.app.navigation_history.save(doc)
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/declarations/lib/declarations/file.rb

@@ -50,7 +50,7 @@ module Redcar
       end
       
       def dump
-        @tags.sort!
+        @tags = @tags.select {|name, _, _| name}.sort_by {|name, _, _| name }
         tags_file_path = nil
         Tempfile.open('tags') do |tags_file|
           tags_file.puts(@last_updated.to_i.to_s)

data/plugins/edit_view/lib/edit_view.rb

@@ -15,13 +15,13 @@ require "edit_view/grammar"
 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"
 
 require "edit_view/commands/text_conversion_commands"
 require "edit_view/commands/align_assignment_command"
-
+require "edit_view/commands/change_language_command"
+require "edit_view/commands/language_settings_commands"
 
 module Redcar
   class EditView
@@ -97,6 +97,39 @@ module Redcar
     def self.menus
       Menu::Builder.build do
         sub_menu "Edit" do
+          group(:priority => 20) do
+            item "Change Language", ChangeLanguageCommand
+            
+            sub_menu "Tabs" do
+              item "Soft Tabs", :command => EditView::ToggleSoftTabsCommand,
+                                :type => :check, 
+                                :checked => lambda { tab and tab.edit_view.soft_tabs? }
+                                
+              sub_menu "Tab Width" do
+                TabSettings::TAB_WIDTHS.each do |width|
+                  command_klass = Class.new(SetTabWidthCommand)
+                  command_klass.width = width.to_i
+                  already_checker = lambda { tab and tab.edit_view.tab_width.to_s == width.to_s }
+                  item width, :command => command_klass, :type => :check, :checked => already_checker
+                end
+              end
+            end
+            
+            sub_menu "Margin" do
+              item "Word Wrap", :command => EditView::ToggleWordWrapCommand,
+                                :type => :check, 
+                                :checked => lambda { tab and tab.edit_view.word_wrap? }
+              
+              item "Show Margin", :command => EditView::ToggleShowMarginCommand,
+                                  :type => :check, 
+                                  :checked => lambda { tab and tab.edit_view.show_margin? }
+  
+              item lambda { tab ? "Margin Column: #{tab.edit_view.margin_column}" : "Margin Column" }, SetMarginColumnCommand
+            end
+
+            separator
+          end
+          
           sub_menu "Formatting" do
             item "Align Assignments", EditView::AlignAssignmentCommand
             sub_menu "Convert Text", :priority => 40 do

data/plugins/edit_view/lib/edit_view/commands/change_language_command.rb

@@ -0,0 +1,31 @@
+module Redcar
+  class EditView
+
+    class ChangeLanguageCommand < Redcar::EditTabCommand
+
+      class ChangeLanguageDialog < FilterListDialog
+        def initialize(tab)
+          @tab = tab
+          super()
+        end
+        
+        def update_list(filter)
+          bundles  = JavaMateView::Bundle.bundles.to_a
+          grammars = bundles.map {|b| b.grammars.to_a}.flatten
+          names    = grammars.map {|g| g.name}.sort_by {|name| name.downcase }
+          filter_and_rank_by(names, filter)
+        end
+  
+        def selected(name, ix)
+          @tab.edit_view.grammar = name
+          close
+        end
+      end
+
+      def execute
+        ChangeLanguageDialog.new(tab).open
+      end
+    end
+    
+  end
+end

data/plugins/edit_view/lib/edit_view/commands/language_settings_commands.rb

@@ -0,0 +1,45 @@
+module Redcar
+  class EditView
+
+    class ToggleSoftTabsCommand < Redcar::EditTabCommand
+      def execute
+        tab.edit_view.soft_tabs = !tab.edit_view.soft_tabs?
+      end
+    end
+      
+    class ToggleWordWrapCommand < Redcar::EditTabCommand
+      def execute
+        tab.edit_view.word_wrap = !tab.edit_view.word_wrap?
+      end
+    end
+      
+    class ToggleShowMarginCommand < Redcar::EditTabCommand
+      def execute
+        tab.edit_view.show_margin = !tab.edit_view.show_margin?
+      end
+    end
+    
+    class SetTabWidthCommand < Redcar::EditTabCommand
+      class << self
+        attr_accessor :width
+      end
+      
+      def execute
+        tab.edit_view.tab_width = self.class.width.to_i
+      end
+    end
+    
+    class SetMarginColumnCommand < Redcar::EditTabCommand
+      def execute
+        response = Application::Dialog.input("Margin Column", "Enter new margin column:", tab.edit_view.margin_column) do |text|
+          if text !~ /^\d+$/
+            "must be an integer number"
+          end
+        end
+        value = response[:value].to_i
+        tab.edit_view.margin_column = [[value, 200].min, 5].max
+      end
+    end
+      
+  end
+end

data/plugins/edit_view/lib/edit_view/document/command.rb

@@ -11,7 +11,7 @@ module Redcar
         run(:env => {:edit_view => edit_view})
       end
     end
-
+    
     private
 
     def edit_view