redcar 0.7 → 0.8

data/plugins/clipboard-viewer/plugin.rb

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

data/plugins/clipboard-viewer/views/clipboard.html.erb

@@ -0,0 +1,15 @@
+
+<script type="text/javascript" src="file://<%= Redcar::HtmlView.jquery_path %>"></script>
+<% redcar_css = File.expand_path(File.join(Redcar.root, %w(plugins clipboard-viewer views default.css))) %>
+<link rel="stylesheet" href="file://<%= redcar_css %>" type="text/css" media="screen">
+<h1>Clipboard History</h1>
+<div class="content" id="copies">
+  <table>
+    <thead><th>Recently Copied Text</th></thead>
+    <tbody>
+      <% @list.each_with_index do |item, i|%>
+        <tr><td class="copied-item" id="item_<%=i%>"><pre><%= item.join("").gsub("<", "&lt;").gsub(">", "&gt;") %></pre></td></td>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/plugins/clipboard-viewer/views/default.css

@@ -0,0 +1,43 @@
+body {
+  margin:0;
+}
+
+h1 {
+  background: #5f282d url("redcar_small_icon.png") no-repeat 10px 10px;
+  color: #dcb663;
+  height: 30px;
+  line-height: 30px;
+  padding: 10px 10px 10px 52px;
+  font-family: Palatino, Times, serif;
+  letter-spacing: 3px;
+  font-size: 100%;
+}
+
+.content {
+  margin: 10px;
+  font-size: 1.2em;
+}
+
+td.copied-item pre {
+  font-family: monospace;
+}
+
+.refresh {
+  padding: 5px;
+}
+
+.even {
+  background-color: #ddd;
+}
+
+table {
+  font-size: 80%;
+  border-collapse: collapse;
+  border: 1px solid #888;
+}
+
+td,th {
+  border-collapse: collapse;
+  border: 1px solid #888;
+  padding: 8px;
+}

data/plugins/comment/features/line_comment.feature

@@ -0,0 +1,137 @@
+Feature: Commenting lines by prefixing a comment string
+
+  Background:
+    When I open a new edit tab
+
+  Scenario: Commenting a single line
+    When I replace the contents with "A piece of code"
+    And I switch the language to "C"
+    And I move the cursor to 5
+    And I toggle comment lines
+    Then the contents should be "// A pie<c>ce of code"
+    When I toggle comment lines
+    Then the contents should be "A pie<c>ce of code"
+
+  Scenario: Uncommenting a single line
+    When I replace the contents with "# A piece of code"
+    And I switch the language to "Ruby"
+    And I move the cursor to 5
+    And I toggle comment lines
+    Then the contents should be "A p<c>iece of code"
+
+  Scenario: Commenting a single line among many
+    When I replace the contents with "foo\nbar\nbaz"
+    And I switch the language to "Ruby"
+    And I move the cursor to 4
+    And I toggle comment lines
+    Then the contents should be "foo\n<c># bar\nbaz"
+    When I toggle comment lines
+    Then the contents should be "foo\n<c>bar\nbaz"
+
+  Scenario: Uncommenting a single line that doesn't have the space
+    When I replace the contents with "#A piece of code"
+    And I switch the language to "Ruby"
+    And I move the cursor to 5
+    And I toggle comment lines
+    Then the contents should be "A piece of code"
+
+  Scenario: Commenting several lines
+    When I replace the contents with "Two pieces\nof code"
+    And I switch the language to "Ruby"
+    And I select from 0 to 13
+    And I toggle comment lines
+    Then the contents should be "<s># Two pieces\n# of<c> code"
+    When I toggle comment lines
+    Then the contents should be "<s>Two pieces\nof<c> code"
+
+  Scenario: Uncommenting several lines, not all of them have the space
+    When I replace the contents with "# Two pieces\n#of code"
+    And I switch the language to "Ruby"
+    And I select from 0 to 16
+    And I toggle comment lines
+    Then the contents should be "<s>Two pieces\nof<c> code"
+
+  Scenario: Commenting when not all the lines begin with the comment symbol
+    When I replace the contents with "# foo\n# bar\nbaz"
+    And I switch the language to "Ruby"
+    And I select from 0 to 15
+    And I toggle comment lines
+    Then the contents should be "<s># # foo\n# # bar\n# baz<c>"
+    When I toggle comment lines
+    Then the contents should be "# foo\n# bar\nbaz"
+
+  Scenario: Commenting a single line with the cursor on the next line
+    When I replace the contents with "Two pieces\nof code"
+    And I switch the language to "Ruby"
+    And I select from 0 to 11
+    And I toggle comment lines
+    Then the contents should be "<s># Two pieces\n<c>of code"
+    When I toggle comment lines
+    Then the contents should be "<s>Two pieces\n<c>of code"
+
+  Scenario: Commenting a single line with the cursor and selection point on the same line
+    When I replace the contents with "Two pieces\nof code"
+    And I switch the language to "Ruby"
+    And I select from 3 to 0
+    And I toggle comment lines
+    Then the contents should be "<c># Two<s> pieces\nof code"
+    When I toggle comment lines
+    Then the contents should be "<c>Two<s> pieces\nof code"
+
+  Scenario: Inserting a single space after comments when a line has no indentation
+    When I replace the contents with "A few\nlines\nof unindented\ncode"
+    And I switch the language to "Ruby"
+    And I select from 2 to 27
+    And I toggle comment lines
+    Then the contents should be "A <s># few\n# lines\n# of unindented\n# c<c>ode"
+    When I toggle comment lines
+    Then the contents should be "A <s>few\nlines\nof unindented\nc<c>ode"
+    
+  Scenario: Commenting an indented single line
+    When I replace the contents with "  A piece of code"
+    And I switch the language to "C"
+    And I toggle comment lines
+    Then the contents should be "  // A piece of code"
+    When I toggle comment lines
+    Then the contents should be "  A piece of code"
+
+  Scenario: Commenting several lines, not from the start of one of them
+    When I replace the contents with "Two pieces\nof code"
+    And I switch the language to "Ruby"
+    And I select from 2 to 13
+    And I toggle comment lines
+    Then the contents should be "Tw<s># o pieces\n# of<c> code"
+    When I toggle comment lines
+    Then the contents should be "Tw<s>o pieces\nof<c> code"
+
+  Scenario: Commenting several lines, not from the start of one of them
+    When I replace the contents with "    foo\n    bar"
+    And I switch the language to "Ruby"
+    And I select from 2 to 15
+    And I toggle comment lines
+    Then the contents should be "  <s>  # foo\n    # bar<c>"
+    When I toggle comment lines
+    Then the contents should be "  <s>  foo\n    bar<c>"
+
+  Scenario: Commenting several lines, with mismatched indentation, beginning in the start
+    When I replace the contents with "    def foo\n      dfo\n    sdfj\n  asdf\nasdf"
+    And I switch the language to "Ruby"
+    And I select from 0 to 40
+    And I toggle comment lines
+    Then the contents should be "<s>#     def foo\n#       dfo\n#     sdfj\n#   asdf\n# as<c>df"
+
+  Scenario: Commenting several indented lines, beginning before the text starts
+    When I replace the contents with "      def foo\n        dfo"
+    And I switch the language to "Ruby"
+    And I select from 2 to 25
+    And I toggle comment lines
+    Then the contents should be "  <s>    # def foo\n      #   dfo<c>"
+
+  # This is pretty damn marginal, and I'm tired...
+  #Scenario: Commenting several lines, with mismatched indentation, beginning in the middle
+  #  When I replace the contents with "    def foo\n      dfo\n    sdfj\n  asdf\nasdf"
+  #  And I switch the language to "Ruby"
+  #  And I select from 6 to 40
+  #  And I toggle comment lines
+  #  Then the contents should be "    de<s># f foo\n    #       dfo\n    #     sdfj\n    #  asdf\n    # as<c>df"
+

data/plugins/comment/features/selection_comment.feature

@@ -0,0 +1,21 @@
+Feature: Commenting a selected area of text
+
+  Background:
+    When I open a new edit tab
+
+  Scenario: Commenting a part of a line
+    When I replace the contents with "a piece of code"
+    And I switch the language to "Java"
+    And I toggle block comment
+    Then I should see "/*a piece of code*/" in the edit tab
+    When I toggle block comment
+    Then I should see "a piece of code" in the edit tab
+
+  Scenario: Commenting a selection spanning several lines
+    When I replace the contents with "a piece\nof code"
+    And I switch the language to "C++"
+    And I select from 4 to 9
+    And I toggle block comment
+    Then I should see "a pi/*ece\no*/f code" in the edit tab
+    And I toggle block comment
+    Then I should see "a piece\nof code" in the edit tab

data/plugins/comment/features/step_definitions/comment_steps.rb

@@ -0,0 +1,7 @@
+When /^I toggle block comment$/ do
+  Redcar::Comment::ToggleSelectionCommentCommand.new.run
+end
+
+When /^I toggle comment lines$/ do
+  Redcar::Comment::ToggleLineCommentCommand.new.run
+end

data/plugins/comment/lib/comment.rb

@@ -0,0 +1,266 @@
+
+module Redcar
+  class Comment
+    def self.menus
+      Menu::Builder.build do
+        sub_menu "Edit" do
+          sub_menu "Formatting" do
+            item "Toggle Line Comment"     , ToggleLineCommentCommand
+            item "Toggle Selection Comment", ToggleSelectionCommentCommand
+          end
+        end
+      end
+    end
+
+    def self.storage
+      @storage ||=begin
+        storage = Plugin::Storage.new('comment_plugin')
+        storage.set_default('default_line_comment'       , "#")
+        storage.set_default('default_start_block'        , "/*")
+        storage.set_default('default_end_block'          , "*/")
+        storage.set_default('warning_for_using_defaults' , true)
+        storage
+      end
+    end
+
+    def self.comment_map
+      @map ||=begin
+        c = File.read(Comment.comment_lib_path)
+        map = JSON.parse(c)
+        Comment.comment_extension_paths.each do |path|
+          json = File.read(path)
+          JSON.parse(json).each do |item,content|
+            map[item] = content
+          end
+        end
+        map
+      end
+    end
+    
+    def self.extensions_file;"comment_extensions.json";end
+    
+    def self.comment_lib_path
+      File.dirname(__FILE__) + "/../vendor/comment_lib.json"
+    end
+    
+    def self.comment_extension_paths
+      project = Redcar::Project::Manager.focussed_project
+      if project
+        project.config_files(Comment.extensions_file)
+      else
+        Dir[File.join(Redcar.user_dir,Comment.extensions_file)]
+      end
+    end
+
+    def self.keymaps
+      osx = Redcar::Keymap.build("main", :osx) do
+        link "Cmd+/", ToggleLineCommentCommand
+        link "Cmd+.", ToggleSelectionCommentCommand
+      end
+      linwin = Redcar::Keymap.build("main", [:linux, :windows]) do
+        link "Ctrl+/", ToggleLineCommentCommand
+        link "Ctrl+.", ToggleSelectionCommentCommand
+      end
+      [osx, linwin]
+    end
+
+    def self.grammar_missing(grammar)
+      if Comment.storage['warning_for_using_defaults']
+        Application::Dialog.message_box("Comment type not found for #{grammar}. Using defaults instead.") unless @messaged
+        @messaged = true
+      end
+    end
+
+    class ToggleSelectionCommentCommand < Redcar::EditTabCommand
+      def execute
+        type = Comment.comment_map["#{tab.edit_view.grammar.gsub("\"","")}"]
+        if type
+          start  = type["start_block"]
+          ending = type["end_block"  ]
+          return unless start and ending
+        else
+          Comment.grammar_missing(tab.edit_view.grammar)
+          start  = Comment.storage['default_start_block']
+          ending = Comment.storage['default_end_block']
+        end
+        doc.controllers(Redcar::AutoIndenter::DocumentController).first.disable do
+          doc.compound do
+            if doc.selection?
+              text = doc.selected_text
+              if text[0,start.split(//).length] == start and
+                text[text.split(//).length-ending.split(//).length,text.split(//).length] == ending
+                text = text[start.split(//).length,text.split(//).length]
+                text = text[0,text.split(//).length-ending.split(//).length]
+                doc.replace_selection(text)
+              else
+                doc.replace_selection("#{start}#{text}#{ending}")
+              end
+            else
+              line                = doc.cursor_line
+              text                = doc.get_line_without_end_of_line(line)
+              start_idx           = text.index(start)
+              end_idx             = text.rindex(ending)
+              start_length        = start.split(//).length
+              ending_start_offset = text.split(//).length-ending.split(//).length
+              if text[0,start_length] == start and text[ending_start_offset,text.split(//).length] == ending
+                text = text[start.length,text.split(//).length]
+                text = text[0,ending_start_offset]
+                doc.replace_line(line,text)
+              else
+                replacement  = "#{start}#{text}#{ending}"
+                replacement += "\n" if doc.get_line(line) =~ /\n$/
+                doc.replace_line(line,replacement)
+              end
+            end
+          end
+        end
+      end
+    end
+
+    class ToggleLineCommentCommand < Redcar::EditTabCommand
+      
+      attr_reader :comment
+      
+      def line_start_regex
+        /^(\s*)#{comment}\s?/
+      end
+      
+      def starts_with_comment?(line)
+        line =~ line_start_regex
+      end
+      
+      def strip_comment(line, offset=nil)
+        new_line = line.clone
+        if offset and offset != 0 and 
+            new_line[0..offset] !~ /^\s*$/
+          new_line[offset..(offset + comment.length)] = ""
+          @point_comment_removed = offset
+          new_line
+        else
+          md = line.match(line_start_regex)
+          @point_comment_removed = md[1].length
+          md[1] + md.post_match
+        end
+      end
+      
+      def add_comment(line, offset)
+        if line.length < offset
+          line + " "*(offset - line.length) + comment + " "
+        else
+          line.clone.insert(offset, comment + " ")
+        end
+      end
+
+      def comment_insertion_point_for(line)
+        md = line.match(/^(\s*)([^\s])/)
+        md[1].length
+      end
+      
+	    def execute
+        type = Comment.comment_map["#{tab.edit_view.grammar.gsub("\"","")}"]
+        if type
+          @comment = type["line_comment"]
+          return unless comment
+        else
+          Comment.grammar_missing(tab.edit_view.grammar)
+          @comment = Comment.storage['default_line_comment']
+        end
+        selected              = doc.selection?
+        cursor_offset         = doc.cursor_offset
+        selection_offset      = doc.selection_offset
+        cursor_line           = doc.cursor_line
+        selection_line        = doc.selection_line
+        cursor_line_offset    = doc.cursor_line_offset
+        selection_line_offset = doc.selection_line_offset
+        if cursor_offset < selection_offset
+          start_point_offset      = cursor_offset
+          end_point_offset        = selection_offset
+          start_point_line        = cursor_line
+          start_point_line_offset = cursor_line_offset
+        else
+          start_point_offset      = selection_offset
+          end_point_offset        = cursor_offset
+          start_point_line        = selection_line
+          start_point_line_offset = selection_line_offset
+        end
+        start_line            = doc.line_at_offset(start_point_offset)
+        end_line              = doc.line_at_offset(end_point_offset)
+        
+        if doc.offset_at_line(end_line) == end_point_offset and start_line != end_line
+          end_line -= 1
+        end
+        
+        doc.controllers(Redcar::AutoIndenter::DocumentController).first.disable do
+          doc.compound do
+            all_lines_are_already_commented = true
+            start_line_comment_offset       = nil
+            insertion_column                = 1000
+            
+            (start_line..end_line).each do |line|
+              text = doc.get_line(line)
+              if text.length <= insertion_column + 1 and text =~ /^\s*$/
+              else
+                insertion_column = [insertion_column, comment_insertion_point_for(text)].min
+              end
+              
+              if line == start_point_line and selected
+                text = text[start_point_line_offset..-1]
+              end
+              
+              unless starts_with_comment?(text)
+                all_lines_are_already_commented = false
+              end
+            end
+            
+            if all_lines_are_already_commented
+              (start_line..end_line).each do |line|
+                doc.replace_line(line) do |text|
+                  new_text = 
+                    if line == start_point_line and selected
+                      strip_comment(text, start_point_line_offset)
+                    else
+                      strip_comment(text)
+                    end
+                  diff = text.length - new_text.length
+                  if cursor_offset < selection_offset
+                    selection_offset -= diff
+                  else
+                    if cursor_line > line or (cursor_line == line and cursor_line_offset > @point_comment_removed)
+                      cursor_offset -= diff
+                    end
+                  end
+                  new_text
+                end
+              end
+            else
+              (start_line..end_line).each do |line|
+                doc.replace_line(line) do |text|
+                  new_text = if line == start_point_line and selected
+                               add_comment(text, [start_point_line_offset, insertion_column].max)
+                             else
+                               add_comment(text, insertion_column)
+                             end
+                  diff = new_text.length - text.length
+                  if cursor_offset < selection_offset
+                    selection_offset += diff
+                  else
+                    if cursor_line > line or (cursor_line == line and cursor_line_offset > insertion_column)
+                      cursor_offset += diff
+                    end
+                  end
+                  new_text
+                end
+              end
+            end
+          end
+        end
+        
+        if selected
+          doc.set_selection_range(cursor_offset, selection_offset)
+        else
+          doc.set_selection_range(cursor_offset, cursor_offset)
+        end
+      end
+    end
+  end
+end