From f392867fb0f328323702451ac6a742f494f8e445 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Sun, 13 Sep 2009 20:34:59 -0700
Subject: [PATCH] [Sass] Format the Sass backtrace string a little nicer.

---
 lib/sass/error.rb        | 11 ++++-------
 test/sass/plugin_test.rb |  5 +++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/sass/error.rb b/lib/sass/error.rb
index 9b9c5f5b..6d827287 100644
--- a/lib/sass/error.rb
+++ b/lib/sass/error.rb
@@ -103,14 +103,11 @@ module Sass
     # @see #sass_backtrace
     # @return [String]
     def sass_backtrace_str(default_filename = "an unknown file")
-      msg = "Syntax error on line #{sass_line}" +
-        " of #{sass_filename || default_filename}" +
-        ": #{message}"
-      sass_backtrace[1..-1].each do |entry|
-        msg << "\n        from line #{entry[:line]}" +
+      "Syntax error: #{message}" +
+        Haml::Util.enum_with_index(sass_backtrace).map do |entry, i|
+        "\n        #{i == 0 ? "on" : "from"} line #{entry[:line]}" +
           " of #{entry[:filename] || default_filename}"
-      end
-      msg
+      end.join
     end
   end
 
diff --git a/test/sass/plugin_test.rb b/test/sass/plugin_test.rb
index 09d7d9b4..15fcfd93 100644
--- a/test/sass/plugin_test.rb
+++ b/test/sass/plugin_test.rb
@@ -55,9 +55,10 @@ class SassPluginTest < Test::Unit::TestCase
     File.delete(tempfile_loc('bork1'))
     Sass::Plugin.update_stylesheets
     File.open(tempfile_loc('bork1')) do |file|
-      assert_equal(<<CSS, file.read.split("\n")[0...6].join("\n"))
+      assert_equal(<<CSS.strip, file.read.split("\n")[0...6].join("\n"))
 /*
-Syntax error on line 2 of #{template_loc('bork1')}: Undefined variable: "!bork".
+Syntax error: Undefined variable: "!bork".
+        on line 2 of #{template_loc('bork1')}
 
 1: bork
 2:   :bork= !bork