Merge branch 'master' of github.com:drnic/ruby-tmbundle

drnic · Oct 10, 2010 · 9be85aa · 9be85aa
2 parents c99e353 + 78035a4
commit 9be85aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Support/RubyMate/catch_exception.rb b/Support/RubyMate/catch_exception.rb
@@ -10,7 +10,7 @@
     io = IO.for_fd(ENV['TM_ERROR_FD'].to_i)
 
     io.write "<div id='exception_report' class='framed'>\n"
-    io.write "<p id='exception'><strong>#{e.class.name}:</strong> #{CGI.escapeHTML e.message.sub(/`(\w+)'/, '‘\1’').sub(/ -- /, ' — ')}</p>\n"
+    io.write "<p id='exception'><strong>#{e.class.name}:</strong> #{CGI.escapeHTML e.message.sub(/`(\w+)'/, "\1")}</p>\n"
 
     io.write "<blockquote><table border='0' cellspacing='4' cellpadding='0'>\n"
 

diff --git a/Support/RubyMate/run_script.rb b/Support/RubyMate/run_script.rb
@@ -31,7 +31,7 @@
       htmlize(str).gsub(/[EF]+/, "<span style=\"color: red\">\\&</span>") +
             "<br style=\"display: none\"/>"
     elsif is_test_script
-      out = str.map do |line|
+      out = str.chars.map do |line|
         if line =~ /^(\s+)(\S.*?):(\d+)(?::in\s*`(.*?)')?/
           indent, file, line, method = $1, $2, $3, $4
           url, display_name = '', 'untitled document';

diff --git a/Tests/simple.rb b/Tests/simple.rb
@@ -0,0 +1 @@
+puts "Simple."