redcar 0.3.5 → 0.3.6

data/plugins/edit_view/lib/edit_view/select_theme_dialog.rb

@@ -0,0 +1,34 @@
+module Redcar
+  class EditView
+    class SelectThemeDialog < FilterListDialog
+
+      def initialize
+        super()
+        @matches = EditView.themes.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.theme = text
+        end
+      end
+
+    end
+  end
+end

data/plugins/edit_view/lib/edit_view/tab_settings.rb

@@ -3,18 +3,39 @@ module Redcar
     class TabSettings
       DEFAULT_SOFTNESS = true
       DEFAULT_TAB_WIDTH = 2
+      DEFAULT_WORD_WRAP = false
+      DEFAULT_SETTING_NAME = "Default"
       TAB_WIDTHS        = %w(2 3 4 5 6 8)
-      
-      attr_reader :tab_widths, :softnesses, :show_invisibles
-    
+      DEFAULT_MARGIN_COLUMN = 80
+      DEFAULT_MARGIN_PRESENT = false
+
+      attr_reader :tab_widths, :softnesses, :word_wraps, :margin_columns
+      attr_reader :show_margins
+      attr_reader :show_invisibles, :show_line_numbers, :show_annotations
+
       def initialize
-        @tab_widths      = EditView.storage['tab_widths'] || {}
-        @softnesses      = EditView.storage['softnesses'] || {}
-        @show_invisibles = !!EditView.storage['show_invisibles']
+        @tab_widths =
+            {DEFAULT_SETTING_NAME => DEFAULT_TAB_WIDTH}.merge(
+              EditView.storage['tab_widths'] || {})
+        @softnesses =
+            {DEFAULT_SETTING_NAME => DEFAULT_SOFTNESS}.merge(
+              EditView.storage['softnesses'] || {})
+        @word_wraps =
+            {DEFAULT_SETTING_NAME => DEFAULT_WORD_WRAP}.merge(
+              EditView.storage['word_wraps'] || {})
+        @margin_columns = 
+            {DEFAULT_SETTING_NAME => DEFAULT_MARGIN_COLUMN}.merge(
+              EditView.storage['margin_columns'] || {})
+        @show_margins =
+            {DEFAULT_SETTING_NAME => DEFAULT_MARGIN_PRESENT}.merge(
+              EditView.storage['show_margins'] || {})
+        @show_invisibles   = !!EditView.storage['show_invisibles']
+        @show_line_numbers = !!EditView.storage['show_line_numbers']
+        @show_annotations  = !!EditView.storage['show_annotations']
       end
       
       def width_for(grammar_name)
-        tab_widths[grammar_name] || DEFAULT_TAB_WIDTH
+        tab_widths[grammar_name] || tab_widths[DEFAULT_SETTING_NAME]
       end
       
       def set_width_for(grammar_name, width)
@@ -26,7 +47,11 @@ module Redcar
       end
       
       def softness_for(grammar_name)
-        softnesses[grammar_name] == nil ? DEFAULT_SOFTNESS : softnesses[grammar_name]
+        if softnesses[grammar_name] == nil
+          softnesses[DEFAULT_SETTING_NAME]
+        else
+          softnesses[grammar_name]
+        end
       end
       
       def set_softness_for(grammar_name, boolean)
@@ -37,6 +62,49 @@ module Redcar
         end
       end
       
+      def word_wrap_for(grammar_name)
+        if word_wraps[grammar_name] == nil
+          word_wraps[DEFAULT_SETTING_NAME]
+        else
+          word_wraps[grammar_name]
+        end
+      end
+      
+      def set_word_wrap_for(grammar_name, boolean)
+        boolean = !!boolean
+        if word_wraps[grammar_name] != boolean
+          word_wraps[grammar_name] = boolean
+          EditView.storage['word_wraps'] = word_wraps
+        end
+      end
+      
+      def margin_column_for(grammar_name)
+        margin_columns[grammar_name] || margin_columns[DEFAULT_SETTING_NAME]
+      end
+      
+      def set_margin_column_for(grammar_name, column)
+        if margin_columns[grammar_name] != column
+          margin_columns[grammar_name] = column
+          EditView.storage['margin_columns'] = margin_columns
+        end
+      end
+      
+      def show_margin_for(grammar_name)
+        if show_margins[grammar_name] == nil
+          show_margins[DEFAULT_SETTING_NAME]
+        else
+          show_margins[grammar_name]
+        end
+      end
+      
+      def set_show_margin_for(grammar_name, boolean)
+        boolean = !!boolean
+        if show_margins[grammar_name] != boolean
+          show_margins[grammar_name] = boolean
+          EditView.storage['show_margins'] = show_margins
+        end
+      end
+      
       def show_invisibles?
         show_invisibles
       end
@@ -45,6 +113,33 @@ module Redcar
         @show_invisibles = bool
         EditView.storage['show_invisibles'] = bool
       end
+
+      def show_line_numbers?
+        show_line_numbers
+      end
+      
+      def set_show_line_numbers(bool)
+        @show_line_numbers = bool
+        EditView.storage['show_line_numbers'] = bool
+      end
+
+      def show_annotations?
+        show_annotations
+      end
+      
+      def set_show_annotations(bool)
+        @show_annotations = bool
+        EditView.storage['show_annotations'] = bool
+      end
+      
+      def show_margin?
+        show_margin
+      end
+      
+      def set_show_margin(bool)
+        @show_margin = bool
+        EditView.storage['show_margin'] = bool
+      end
     end
   end
 end

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -20,8 +20,18 @@ module Redcar
     end
     
     def self.load_textmate_assets
-      JavaMateView::Bundle.load_bundles(Redcar.root + "/textmate/")
-      JavaMateView::ThemeManager.load_themes(Redcar.root + "/textmate/")
+      load_textmate_assets_from_dir(Redcar.root + "/textmate/")
+      Redcar.plugin_manager.loaded_plugins.each do |plugin|
+        load_textmate_assets_from_dir(File.dirname(plugin.definition_file) + "/")
+      end
+      load_textmate_assets_from_dir(Redcar.user_dir + "/")
+      
+      EditView.themes.unshift(*JavaMateView::ThemeManager.themes.to_a.map {|th| th.name })
+    end
+    
+    def self.load_textmate_assets_from_dir(dir)
+      JavaMateView::Bundle.load_bundles(dir)
+      JavaMateView::ThemeManager.load_themes(dir)
     end
     
     attr_reader :mate_text, :widget, :model
@@ -108,12 +118,39 @@ module Redcar
       h5 = @model.add_listener(:invisibles_changed) do |new_bool|
         @mate_text.showInvisibles(new_bool)
       end
+      h6 = @model.add_listener(:word_wrap_changed) do |new_bool|
+        @mate_text.set_word_wrap(new_bool)
+      end
+      h7 = @model.add_listener(:font_changed) do
+        @mate_text.set_font(EditView.font, EditView.font_size)
+      end
+      h8 = @model.add_listener(:theme_changed) do
+        @mate_text.set_theme_by_name(EditView.theme)
+      end
+      h9 = @model.add_listener(:line_number_visibility_changed) do |new_bool|
+        @mate_text.set_line_numbers_visible(new_bool)
+      end
+      h10 = @model.add_listener(:annotations_visibility_changed) do |new_bool|
+        @mate_text.set_annotations_visible(new_bool)
+      end
+      h11 = @model.add_listener(:margin_column_changed) do |new_column|
+        @mate_text.set_margin_column(new_column)
+      end
+      h12 = @model.add_listener(:show_margin_changed) do |new_bool|
+        if new_bool
+          @mate_text.set_margin_column(@model.margin_column)
+        else
+          @mate_text.set_margin_column(-1)
+        end
+      end
       @mate_text.getTextWidget.addFocusListener(FocusListener.new(self))
       @mate_text.getTextWidget.addVerifyListener(VerifyListener.new(@model.document, self))
       @mate_text.getTextWidget.addModifyListener(ModifyListener.new(@model.document, self))
       @mate_text.get_control.add_verify_key_listener(VerifyKeyListener.new(self))
       @mate_text.get_control.add_key_listener(KeyListener.new(self))
-      @handlers << [@model.document, h1] << [@model, h2] << [@model, h3] << [@model, h4] << [@model, h5]
+      @handlers << [@model.document, h1] << [@model, h2] << [@model, h3] << [@model, h4] << 
+        [@model, h5] << [@model, h6] << [@model, h7] << [@model, h8] <<
+        [@model, h9] << [@model, h10] << [@model, h11]
     end
     
     class VerifyKeyListener

data/plugins/edit_view_swt/lib/edit_view_swt/edit_tab.rb

@@ -5,7 +5,7 @@ module Redcar
       
       attr_reader :item, :edit_view
       
-      def initialize(model, notebook)
+      def initialize(*args)
         super
         @model.add_listener(:changed_title) { |title| @item.text = title }
       end

data/plugins/execute_current_tab/lib/execute_current_tab.rb

@@ -21,6 +21,8 @@ module Redcar
 
     class Execute < EditTabCommand
 
+      TITLE = "Output"
+
       def execute
         path = doc.path
         if path
@@ -32,14 +34,21 @@ module Redcar
           FileUtils.rm(path)
         end
       end
+      
+      def output_tab
+        tabs = win.notebooks.map {|nb| nb.tabs }.flatten
+        tabs.detect {|t| t.title == TITLE} || Top::NewCommand.new.run
+      end
 
       def execute_file(path)
-        command = "ruby \"#{path}\" 2>&1"
-        output = `#{command}`
-        new_tab = Top::NewCommand.new.run          
-        title = "Output from #{command}"
-        new_tab.document.text = title + "\n" + "="*title.length + "\n\n" + output
-        new_tab.title = 'Output'
+        command = "ruby \"#{path}\""
+        output = `#{command} 2>&1`
+        tab = output_tab
+        title = "[#{DateTime.now}]$ #{command}"
+        tab.document.text = "#{tab.document.to_s}" +
+          "#{"="*title.length}\n#{title}\n#{"="*title.length}\n\n#{output}"
+        tab.title = TITLE
+        tab.focus
       end
     end
 

data/plugins/project/features/open_directory_tree.feature

@@ -23,3 +23,13 @@ Feature: Open directory tree
     Then the window should have title "myproject"
     When I close the directory
     Then the window should have title "Redcar"
+
+  Scenario: Directory keeps the same width if maximized
+    Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
+    When I open a directory
+    Then the directory tree width should be the default
+    When I maximize the window size
+    Then the directory tree width should be the default
+    When I restore the window size
+    Then the directory tree width should be the default
+    

data/plugins/project/lib/project.rb

@@ -21,17 +21,19 @@ module Redcar
     attr_reader :window, :tree, :path
 
     def initialize(path)
-      path = File.expand_path(path)
-      if !File.directory?(path)
-      	raise 'Not a directory: ' + path
+      @path   = File.expand_path(path)
+      dir_mirror = Project::DirMirror.new(path)
+      if dir_mirror.exists?
+        @tree   = Tree.new(dir_mirror, Project::DirController.new)
+        @window = nil
+        file_list_resource.compute
       end
-      @path   = path
-      @tree   = Tree.new(Project::DirMirror.new(path),
-                         Project::DirController.new)
-      @window = nil
-      file_list_resource.compute
     end
     
+    def ready?
+      @tree && @path
+    end
+
     def inspect
       "<Project #{path}>"
     end

data/plugins/project/lib/project/dir_mirror.rb

@@ -13,7 +13,7 @@ module Redcar
       
       # Does the directory exist?
       def exists?
-        File.exist?(@path)
+        File.exist?(@path) && File.directory?(@path)
       end
       
       # Have the toplevel nodes changed?
@@ -32,6 +32,11 @@ module Redcar
       end
       
       class Node
+
+        include Redcar::Tree::Mirror::NodeMirror
+
+        attr_reader :path
+
         def self.create_all_from_path(path)
           Dir[path + "/*"].sort_by do |fn|
             File.basename(fn).downcase
@@ -48,10 +53,6 @@ module Redcar
           @cache ||= {}
         end
         
-        include Redcar::Tree::Mirror::NodeMirror
-        
-        attr_reader :path
-        
         def initialize(path)
           @path = path
         end

data/plugins/project/lib/project/drb_service.rb

@@ -10,6 +10,22 @@ module Redcar
         end
       end
     
+      def open_item_untitled(path)
+        begin
+          puts 'drb opening untitled ' + full_path if $VERBOSE
+          if File.file?(path)
+            Redcar::ApplicationSWT.sync_exec do
+              Project::Manager.open_untitled_path(path)
+              Redcar.app.focussed_window.controller.bring_to_front
+            end
+          end
+          'ok'
+        rescue Exception => e
+          puts 'drb got exception:' + e.class + " " + e.message, e.backtrace
+          raise e
+        end 
+      end
+      
       def open_item_drb(full_path)
         begin
           puts 'drb opening ' + full_path if $VERBOSE

data/plugins/project/lib/project/manager.rb

@@ -111,15 +111,23 @@ module Redcar
         window.focus
       end
       
+      def self.open_tab_with_content(text)
+        win = Redcar.app.focussed_window || Redcar.app.new_window
+        tab = win.new_tab(Redcar::EditTab)
+        tab.edit_view.document.text = text
+        tab.edit_view.reset_undo
+        tab.focus
+      end
+      
       # Opens a new Tree with a DirMirror and DirController for the given
       # path, in a new window.
       #
       # @param [String] path  the path of the directory to view
       def self.open_project_for_path(path)
         win     = Redcar.app.new_window
-        project = Project.new(path)
-        project.open(win)
-        project
+        project = Project.new(path).tap do |p|
+          p.open(win) if p.ready?
+        end
       end
       
       # The currently focussed Project, or nil if none.
@@ -154,9 +162,28 @@ module Redcar
             open_file(arg)
           end
         end
+        args.each do |arg|
+          if arg =~ /--untitled-file=(.*)/
+            path = $1
+            found_path_args = true
+            open_untitled_path(path)
+          end
+        end
         found_path_args
       end
       
+      def self.open_untitled_path(path)
+        begin
+          if File.file?(path) and contents = File.read(path)
+            open_tab_with_content(contents)
+          end
+        rescue => e
+          puts "Error opening untitled file #{path}"
+          puts e.class.to_s + ":" + e.message
+          puts e.backtrace
+        end
+      end
+      
       # Attaches a new listener to tab focus change events, so we can 
       # keep the current_files list.
       def self.init_current_files_hooks
@@ -185,7 +212,6 @@ module Redcar
         if path = storage['last_open_dir']
           s = Time.now
           open_project_for_path(path)
-          puts "open project took #{Time.now - s}s"
         end
         
         if files = storage['files_open_last_session']
@@ -207,4 +233,4 @@ module Redcar
       end
     end
   end
-end
+end