sass 3.3.0.alpha.167 → 3.3.0.alpha.173

data/REVISION

@@ -1 +1 @@
-9aaeedb21f108c9ee8ca496ed018fdf3b0c5bd19
+d74a11c40b4dca010ffe13228fa8ddcf1364c1ce

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.167
+3.3.0.alpha.173

data/VERSION_DATE

@@ -1 +1 @@
-03 June 2013 17:31:15 GMT
+03 June 2013 21:51:16 GMT

data/lib/sass/error.rb

@@ -165,9 +165,9 @@ module Sass
 
         <<END
 /*
-#{header}
+#{header.gsub("*/", "*\\/")}
 
-Backtrace:\n#{e.backtrace.join("\n")}
+Backtrace:\n#{e.backtrace.join("\n").gsub("*/", "*\\/")}
 */
 body:before {
   white-space: pre;

data/lib/sass/tree/visitors/perform.rb

@@ -144,9 +144,9 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     res = node.expr.perform(@environment)
     res = res.value if res.is_a?(Sass::Script::Value::String)
     if node.filename
-      $stderr.puts "#{node.filename}:#{node.line} DEBUG: #{res}"
+      Sass::Util.sass_warn "#{node.filename}:#{node.line} DEBUG: #{res}"
     else
-      $stderr.puts "Line #{node.line} DEBUG: #{res}"
+      Sass::Util.sass_warn "Line #{node.line} DEBUG: #{res}"
     end
     []
   end

data/test/sass/plugin_test.rb

@@ -123,6 +123,23 @@ CSS
     File.delete(tempfile_loc('bork1'))
   end
 
+  def test_full_exception_with_block_comment
+    File.delete(tempfile_loc('bork5'))
+    check_for_updates!
+    File.open(tempfile_loc('bork5')) do |file|
+      assert_equal(<<CSS.strip, file.read.split("\n")[0...7].join("\n"))
+/*
+Syntax error: Undefined variable: "$bork".
+        on line 3 of #{template_loc('bork5')}
+
+1: bork
+2:   /* foo *\\/
+3:   :bork $bork
+CSS
+    end
+    File.delete(tempfile_loc('bork1'))
+  end
+
   def test_single_level_import_loop
     File.delete(tempfile_loc('single_import_loop'))
     check_for_updates!

data/test/sass/scss/scss_test.rb

@@ -1711,6 +1711,14 @@ SCSS
 
   # Regression
 
+  def test_loud_comment_in_compressed_mode
+    assert_equal(<<CSS, render(<<SCSS))
+/*! foo */
+CSS
+/*! foo */
+SCSS
+  end
+
   def test_parsing_decimals_followed_by_comments_doesnt_take_forever
     assert_equal(<<CSS, render(<<SCSS))
 .foo {

data/test/sass/templates/bork5.sass

@@ -0,0 +1,3 @@
+bork
+  /* foo */
+  :bork $bork

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302659
+  hash: 592302679
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 167
-  version: 3.3.0.alpha.167
+  - 173
+  version: 3.3.0.alpha.173
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -308,6 +308,7 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
+- test/sass/templates/bork5.sass
 - test/sass/test_helper.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb