Merge pull request #419 from RobertLowe/master

Make textmate formtatter run prettier

Author: justinko

lib/rspec/core/formatters/snippet_extractor.rb

@@ -8,6 +8,10 @@ class NullConverter; def convert(code, pre); code; end; end #:nodoc:
 
         def snippet(error)
           raw_code, line = snippet_for(error.backtrace[0])
+
+          # skip over whiny_nils in the backtrace
+          raw_code, line = snippet_for(error.backtrace[1]) if error.backtrace[0] =~ /active_support\/whiny_nil\.rb/
+
           highlighted = @@converter.convert(raw_code, false)
           highlighted << "\n<span class=\"comment\"># gem install syntax to get syntax highlighting</span>" if @@converter.is_a?(NullConverter)
           post_process(highlighted, line)

lib/rspec/core/formatters/text_mate_formatter.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'rspec/core/formatters/html_formatter'
 
 module RSpec
@@ -7,6 +8,7 @@ module Formatters
       class TextMateFormatter < HtmlFormatter
         def backtrace_line(line)
           if line = super(line)
+            line = CGI.escapeHTML(line)
             line.sub!(/([^:]*\.e?rb):(\d*)/) do
               "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
             end