sass 3.2.9 → 3.2.10

data/lib/sass/scss/parser.rb

@@ -120,7 +120,6 @@ module Sass
           value = [text.sub(/^\s*\/\//, '/*').gsub(/^\s*\/\//, ' *') + ' */']
         else
           value = Sass::Engine.parse_interp(text, line, @scanner.pos - text.size, :filename => @filename)
-          value[0].slice!(2) if loud # get rid of the "!"
           value.unshift(@scanner.
             string[0...@scanner.pos].
             reverse[/.*?\*\/(.*?)($|\Z)/, 1].

data/lib/sass/selector/sequence.rb

@@ -437,15 +437,21 @@ module Sass
       # @param seqses [Array<Array<Array<SimpleSequence or String>>>]
       # @return [Array<Array<Array<SimpleSequence or String>>>]
       def trim(seqses)
-        # Avoid truly horrific quadratic behavior. TOOD: I think there
+        # Avoid truly horrific quadratic behavior. TODO: I think there
         # may be a way to get perfect trimming without going quadratic.
         return seqses if seqses.size > 100
+
+        # Keep the results in a separate array so we can be sure we aren't
+        # comparing against an already-trimmed selector. This ensures that two
+        # identical selectors don't mutually trim one another.
+        result = seqses.dup
+
         # This is n^2 on the sequences, but only comparing between
         # separate sequences should limit the quadratic behavior.
-        seqses.map do |seqs1|
-          seqs1.reject do |seq1|
+        seqses.each_with_index do |seqs1, i|
+          result[i] = seqs1.reject do |seq1|
             min_spec = _sources(seq1).map {|seq| seq.specificity}.min || 0
-            seqses.any? do |seqs2|
+            result.any? do |seqs2|
               next if seqs1.equal?(seqs2)
               # Second Law of Extend: the specificity of a generated selector
               # should never be less than the specificity of the extending
@@ -456,6 +462,7 @@ module Sass
             end
           end
         end
+        result
       end
 
       def _hash

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

@@ -89,7 +89,6 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       end.gsub(/^/, spaces) + "\n"
       content
     end
-    content.sub!(%r{^\s*(/\*)}, '/*!') if node.type == :loud #'
     content
   end
 

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::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/lib/sass/util/test.rb

@@ -0,0 +1,10 @@
+module Sass
+  module Util
+    module Test
+      def skip(msg = nil, bt = caller)
+        super if defined?(super)
+        return
+      end
+    end
+  end
+end

data/test/sass/engine_test.rb

@@ -557,7 +557,7 @@ ERR
     importer.add_import("bar", "@import 'foo'")
 
     engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,
-      :load_paths => [importer])
+      :load_paths => [importer], :importer => importer)
 
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
 An @import loop has been found:
@@ -574,7 +574,7 @@ ERR
     importer.add_import("baz", "@import 'foo'")
 
     engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,
-      :load_paths => [importer])
+      :load_paths => [importer], :importer => importer)
 
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
 An @import loop has been found:
@@ -730,7 +730,7 @@ SASS
     importer.add_import("imported", "div{color:red}")
     Sass.load_paths << importer
 
-    assert_equal "div {\n  color: red; }\n", Sass::Engine.new('@import "imported"').render
+    assert_equal "div {\n  color: red; }\n", Sass::Engine.new('@import "imported"', :importer => importer).render
   ensure
     Sass.load_paths.clear
   end
@@ -1804,7 +1804,7 @@ SASS
 
   def test_loud_comment_in_compressed_mode
     assert_equal <<CSS, render(<<SASS, :style => :compressed)
-foo{color:blue;/* foo
+foo{color:blue;/*! foo
  * bar
  */}
 CSS
@@ -1818,7 +1818,8 @@ SASS
 
   def test_loud_comment_is_evaluated
     assert_equal <<CSS, render(<<SASS)
-/* Hue: 327.21649deg */
+/*!
+ * Hue: 327.21649deg */
 CSS
 /*!
   Hue: \#{hue(#f836a0)}
@@ -2486,15 +2487,15 @@ SASS
 
   def test_interpolated_comment_in_mixin
     assert_equal <<CSS, render(<<SASS)
-/* color: red */
+/*! color: red */
 .foo {
   color: red; }
 
-/* color: blue */
+/*! color: blue */
 .foo {
   color: blue; }
 
-/* color: green */
+/*! color: green */
 .foo {
   color: green; }
 CSS
@@ -2789,7 +2790,7 @@ CSS
 /* \\\#{foo}
 SASS
     assert_equal <<CSS, render(<<SASS)
-/* \#{foo} */
+/*! \#{foo} */
 CSS
 /*! \\\#{foo}
 SASS
@@ -2972,7 +2973,7 @@ SCSS
 
     original_filename = filename_for_test
     engine = Sass::Engine.new('@import "imported"; div{color:blue}',
-      :filename => original_filename, :load_paths => [importer], :syntax => :scss)
+      :filename => original_filename, :load_paths => [importer], :syntax => :scss, :importer => importer)
     engine.render
 
     assert_equal original_filename, engine.options[:original_filename]
@@ -3207,6 +3208,7 @@ SASS
 
   def render(sass, options = {})
     munge_filename options
+    options[:importer] ||= MockImporter.new
     Sass::Engine.new(sass, options).render
   end
 

data/test/sass/exec_test.rb

@@ -0,0 +1,86 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../test_helper'
+require 'sass/util/test'
+require 'tmpdir'
+
+class ExecTest < Test::Unit::TestCase
+  include Sass::Util::Test
+
+  def setup
+    @dir = Dir.mktmpdir
+  end
+
+  def teardown
+    FileUtils.rm_rf(@dir)
+    clean_up_sassc
+  end
+
+  def test_scss_t_expanded
+    src = get_path("src.scss")
+    dest = get_path("dest.css")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[scss -t expanded --unix-newlines].push(src, dest)))
+    assert_equal(".ruleset {\n  margin: 0;\n}\n", read(dest))
+  end
+
+  def test_sass_convert_T_sass
+    src = get_path("src.scss")
+    dest = get_path("dest.css")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[sass-convert -T sass --unix-newlines].push(src, dest)))
+    assert_equal(".ruleset\n  margin: 0\n", read(dest))
+  end
+
+  def test_sass_convert_T_sass_in_place
+    src = get_path("src.scss")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[sass-convert -T sass --in-place --unix-newlines].push(src)))
+    assert_equal(".ruleset\n  margin: 0\n", read(src))
+  end
+
+  def test_scss_t_expanded_no_unix_newlines
+    return skip "Can be run on Windows only" unless Sass::Util.windows?
+    src = get_path("src.scss")
+    dest = get_path("dest.css")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[scss -t expanded].push(src, dest)))
+    assert_equal(".ruleset {\r\n  margin: 0;\r\n}\r\n", read(dest))
+  end
+
+  def test_sass_convert_T_sass_no_unix_newlines
+    return skip "Can be run on Windows only" unless Sass::Util.windows?
+    src = get_path("src.scss")
+    dest = get_path("dest.sass")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[sass-convert -T sass].push(src, dest)))
+    assert_equal(".ruleset\r\n  margin: 0\r\n", read(dest))
+  end
+
+  def test_sass_convert_T_sass_in_place_no_unix_newlines
+    return skip "Can be run on Windows only" unless Sass::Util.windows?
+    src = get_path("src.scss")
+    write(src, ".ruleset { margin: 0 }")
+    assert(exec(*%w[sass-convert -T sass --in-place].push(src)))
+    assert_equal(".ruleset\r\n  margin: 0\r\n", read(src))
+  end
+
+  private
+
+  def get_path(name)
+    File.join(@dir, name)
+  end
+
+  def read(file)
+    open(file, 'rb') {|f| f.read}
+  end
+
+  def write(file, content)
+    open(file, 'wb') {|f| f.write(content)}
+  end
+
+  def exec(script, *args)
+    script = File.dirname(__FILE__) + '/../../bin/' + script
+    ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT'])
+    system(ruby, script, *args)
+  end
+end

data/test/sass/extend_test.rb

@@ -489,7 +489,7 @@ CSS
 SCSS
   end
 
-  def test_nested_extender_with_early_child_selectors_doesnt_subseq_them
+  def test_another_nested_extender_with_early_child_selectors_doesnt_subseq_them
     assert_equal <<CSS, render(<<SCSS)
 .foo .bar, .foo .bip > .baz {
   a: b; }
@@ -1145,20 +1145,6 @@ SCSS
 a.bar {
   a: b; }
 
-.bar, b.foo {
-  c: d; }
-CSS
-a.bar {a: b}
-.bar {c: d}
-b.foo {@extend .bar}
-SCSS
-  end
-
-  def test_extend_does_not_warn_when_one_extension_fails_but_others_dont
-    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
-a.bar {
-  a: b; }
-
 .bar, b.foo {
   c: d; }
 CSS
@@ -1186,6 +1172,43 @@ SCSS
 
   # Regression Tests
 
+  def test_nested_sibling_extend
+    assert_equal <<CSS, render(<<SCSS)
+.parent .bar, .parent .foo {
+  width: 2000px; }
+CSS
+.foo {@extend .bar}
+
+.parent {
+  .bar {
+    width: 2000px;
+  }
+  .foo {
+    @extend .bar
+  }
+}
+SCSS
+  end
+
+  def test_parent_and_sibling_extend
+    assert_equal <<CSS, render(<<SCSS)
+.parent1 .parent2 .child1.child2, .parent2 .parent1 .child1.child2 {
+  c: d; }
+CSS
+%foo %bar%baz {c: d}
+
+.parent1 {
+  @extend %foo;
+  .child1 {@extend %bar}
+}
+
+.parent2 {
+  @extend %foo;
+  .child2 {@extend %baz}
+}
+SCSS
+  end
+
   def test_nested_extend_specificity
     assert_equal <<CSS, render(<<SCSS)
 a :b, a :b:c {

data/test/sass/functions_test.rb

@@ -84,9 +84,9 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_hsl_checks_types
-    assert_error_message("\"foo\" is not a number for `hsl'", "hsl(\"foo\", 10, 12)");
-    assert_error_message("\"foo\" is not a number for `hsl'", "hsl(10, \"foo\", 12)");
-    assert_error_message("\"foo\" is not a number for `hsl'", "hsl(10, 10, \"foo\")");
+    assert_error_message("$hue: \"foo\" is not a number for `hsl'", "hsl(\"foo\", 10, 12)");
+    assert_error_message("$saturation: \"foo\" is not a number for `hsl'", "hsl(10, \"foo\", 12)");
+    assert_error_message("$lightness: \"foo\" is not a number for `hsl'", "hsl(10, 10, \"foo\")");
   end
 
   def test_hsla
@@ -104,10 +104,10 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_hsla_checks_types
-    assert_error_message("\"foo\" is not a number for `hsla'", "hsla(\"foo\", 10, 12, 0.3)");
-    assert_error_message("\"foo\" is not a number for `hsla'", "hsla(10, \"foo\", 12, 0)");
-    assert_error_message("\"foo\" is not a number for `hsla'", "hsla(10, 10, \"foo\", 1)");
-    assert_error_message("\"foo\" is not a number for `hsla'", "hsla(10, 10, 10, \"foo\")");
+    assert_error_message("$hue: \"foo\" is not a number for `hsla'", "hsla(\"foo\", 10, 12, 0.3)");
+    assert_error_message("$saturation: \"foo\" is not a number for `hsla'", "hsla(10, \"foo\", 12, 0)");
+    assert_error_message("$lightness: \"foo\" is not a number for `hsla'", "hsla(10, 10, \"foo\", 1)");
+    assert_error_message("$alpha: \"foo\" is not a number for `hsla'", "hsla(10, 10, 10, \"foo\")");
   end
 
   def test_percentage
@@ -118,9 +118,9 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_percentage_checks_types
-    assert_error_message("25px is not a unitless number for `percentage'", "percentage(25px)")
-    assert_error_message("#cccccc is not a unitless number for `percentage'", "percentage(#ccc)")
-    assert_error_message("\"string\" is not a unitless number for `percentage'", %Q{percentage("string")})
+    assert_error_message("$value: 25px is not a unitless number for `percentage'", "percentage(25px)")
+    assert_error_message("$value: #cccccc is not a unitless number for `percentage'", "percentage(#ccc)")
+    assert_error_message("$value: \"string\" is not a unitless number for `percentage'", %Q{percentage("string")})
   end
 
   def test_round
@@ -129,7 +129,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("5px", evaluate("round(5.49px)"))
     assert_equal("5px", evaluate("round($value: 5.49px)"))
 
-    assert_error_message("#cccccc is not a number for `round'", "round(#ccc)")
+    assert_error_message("$value: #cccccc is not a number for `round'", "round(#ccc)")
   end
 
   def test_floor
@@ -137,7 +137,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("4px", evaluate("floor(4.8px)"))
     assert_equal("4px", evaluate("floor($value: 4.8px)"))
 
-    assert_error_message("\"foo\" is not a number for `floor'", "floor(\"foo\")")
+    assert_error_message("$value: \"foo\" is not a number for `floor'", "floor(\"foo\")")
   end
 
   def test_ceil
@@ -145,7 +145,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("5px", evaluate("ceil(4.8px)"))
     assert_equal("5px", evaluate("ceil($value: 4.8px)"))
 
-    assert_error_message("\"a\" is not a number for `ceil'", "ceil(\"a\")")
+    assert_error_message("$value: \"a\" is not a number for `ceil'", "ceil(\"a\")")
   end
 
   def test_abs
@@ -155,7 +155,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("5px", evaluate("abs(5px)"))
     assert_equal("5px", evaluate("abs($value: 5px)"))
 
-    assert_error_message("#aaaaaa is not a number for `abs'", "abs(#aaa)")
+    assert_error_message("$value: #aaaaaa is not a number for `abs'", "abs(#aaa)")
   end
 
   def test_min
@@ -193,31 +193,31 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgb_tests_bounds
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("$red: Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(256, 1, 1)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("$green: Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(1, 256, 1)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("$blue: Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(1, 1, 256)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("$green: Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(1, 256, 257)")
-    assert_error_message("Color value -1 must be between 0 and 255 for `rgb'",
+    assert_error_message("$red: Color value -1 must be between 0 and 255 for `rgb'",
       "rgb(-1, 1, 1)")
   end
 
   def test_rgb_test_percent_bounds
-    assert_error_message("Color value 100.1% must be between 0% and 100% for `rgb'",
+    assert_error_message("$red: Color value 100.1% must be between 0% and 100% for `rgb'",
       "rgb(100.1%, 0, 0)")
-    assert_error_message("Color value -0.1% must be between 0% and 100% for `rgb'",
+    assert_error_message("$green: Color value -0.1% must be between 0% and 100% for `rgb'",
       "rgb(0, -0.1%, 0)")
-    assert_error_message("Color value 101% must be between 0% and 100% for `rgb'",
+    assert_error_message("$blue: Color value 101% must be between 0% and 100% for `rgb'",
       "rgb(0, 0, 101%)")
   end
 
   def test_rgb_tests_types
-    assert_error_message("\"foo\" is not a number for `rgb'", "rgb(\"foo\", 10, 12)");
-    assert_error_message("\"foo\" is not a number for `rgb'", "rgb(10, \"foo\", 12)");
-    assert_error_message("\"foo\" is not a number for `rgb'", "rgb(10, 10, \"foo\")");
+    assert_error_message("$red: \"foo\" is not a number for `rgb'", "rgb(\"foo\", 10, 12)");
+    assert_error_message("$green: \"foo\" is not a number for `rgb'", "rgb(10, \"foo\", 12)");
+    assert_error_message("$blue: \"foo\" is not a number for `rgb'", "rgb(10, 10, \"foo\")");
   end
 
   def test_rgba
@@ -228,15 +228,15 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgba_tests_bounds
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("$red: Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(256, 1, 1, 0.3)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("$green: Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(1, 256, 1, 0.3)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("$blue: Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(1, 1, 256, 0.3)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("$green: Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(1, 256, 257, 0.3)")
-    assert_error_message("Color value -1 must be between 0 and 255 for `rgba'",
+    assert_error_message("$red: Color value -1 must be between 0 and 255 for `rgba'",
       "rgba(-1, 1, 1, 0.3)")
     assert_error_message("Alpha channel -0.2 must be between 0 and 1 for `rgba'",
       "rgba(1, 1, 1, -0.2)")
@@ -245,10 +245,10 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgba_tests_types
-    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(\"foo\", 10, 12, 0.2)");
-    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(10, \"foo\", 12, 0.1)");
-    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(10, 10, \"foo\", 0)");
-    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(10, 10, 10, \"foo\")");
+    assert_error_message("$red: \"foo\" is not a number for `rgba'", "rgba(\"foo\", 10, 12, 0.2)");
+    assert_error_message("$green: \"foo\" is not a number for `rgba'", "rgba(10, \"foo\", 12, 0.1)");
+    assert_error_message("$blue: \"foo\" is not a number for `rgba'", "rgba(10, 10, \"foo\", 0)");
+    assert_error_message("$alpha: \"foo\" is not a number for `rgba'", "rgba(10, 10, 10, \"foo\")");
   end
 
   def test_rgba_with_color
@@ -258,8 +258,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgba_with_color_tests_types
-    assert_error_message("\"foo\" is not a color for `rgba'", "rgba(\"foo\", 0.2)");
-    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(blue, \"foo\")");
+    assert_error_message("$color: \"foo\" is not a color for `rgba'", "rgba(\"foo\", 0.2)");
+    assert_error_message("$alpha: \"foo\" is not a number for `rgba'", "rgba(blue, \"foo\")");
   end
 
   def test_rgba_tests_num_args
@@ -275,7 +275,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_red_exception
-    assert_error_message("12 is not a color for `red'", "red(12)")
+    assert_error_message("$color: 12 is not a color for `red'", "red(12)")
   end
 
   def test_green
@@ -284,7 +284,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_green_exception
-    assert_error_message("12 is not a color for `green'", "green(12)")
+    assert_error_message("$color: 12 is not a color for `green'", "green(12)")
   end
 
   def test_blue
@@ -293,7 +293,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_blue_exception
-    assert_error_message("12 is not a color for `blue'", "blue(12)")
+    assert_error_message("$color: 12 is not a color for `blue'", "blue(12)")
   end
 
   def test_hue
@@ -302,7 +302,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_hue_exception
-    assert_error_message("12 is not a color for `hue'", "hue(12)")
+    assert_error_message("$color: 12 is not a color for `hue'", "hue(12)")
   end
 
   def test_saturation
@@ -312,7 +312,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_saturation_exception
-    assert_error_message("12 is not a color for `saturation'", "saturation(12)")
+    assert_error_message("$color: 12 is not a color for `saturation'", "saturation(12)")
   end
 
   def test_lightness
@@ -322,7 +322,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_lightness_exception
-    assert_error_message("12 is not a color for `lightness'", "lightness(12)")
+    assert_error_message("$color: 12 is not a color for `lightness'", "lightness(12)")
   end
 
   def test_alpha
@@ -333,7 +333,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_alpha_exception
-    assert_error_message("12 is not a color for `alpha'", "alpha(12)")
+    assert_error_message("$color: 12 is not a color for `alpha'", "alpha(12)")
   end
 
   def test_opacity
@@ -345,7 +345,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_opacity_exception
-    assert_error_message("\"foo\" is not a color for `opacity'", "opacity(foo)")
+    assert_error_message("$color: \"foo\" is not a color for `opacity'", "opacity(foo)")
   end
 
   def test_opacify
@@ -367,8 +367,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_opacify_tests_types
-    assert_error_message("\"foo\" is not a color for `opacify'", "opacify(\"foo\", 10%)")
-    assert_error_message("\"foo\" is not a number for `opacify'", "opacify(#fff, \"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `opacify'", "opacify(\"foo\", 10%)")
+    assert_error_message("$amount: \"foo\" is not a number for `opacify'", "opacify(#fff, \"foo\")")
   end
 
   def test_transparentize
@@ -390,8 +390,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_transparentize_tests_types
-    assert_error_message("\"foo\" is not a color for `transparentize'", "transparentize(\"foo\", 10%)")
-    assert_error_message("\"foo\" is not a number for `transparentize'", "transparentize(#fff, \"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `transparentize'", "transparentize(\"foo\", 10%)")
+    assert_error_message("$amount: \"foo\" is not a number for `transparentize'", "transparentize(#fff, \"foo\")")
   end
 
   def test_lighten
@@ -412,8 +412,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_lighten_tests_types
-    assert_error_message("\"foo\" is not a color for `lighten'", "lighten(\"foo\", 10%)")
-    assert_error_message("\"foo\" is not a number for `lighten'", "lighten(#fff, \"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `lighten'", "lighten(\"foo\", 10%)")
+    assert_error_message("$amount: \"foo\" is not a number for `lighten'", "lighten(#fff, \"foo\")")
   end
 
   def test_darken
@@ -434,8 +434,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_darken_tests_types
-    assert_error_message("\"foo\" is not a color for `darken'", "darken(\"foo\", 10%)")
-    assert_error_message("\"foo\" is not a number for `darken'", "darken(#fff, \"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `darken'", "darken(\"foo\", 10%)")
+    assert_error_message("$amount: \"foo\" is not a number for `darken'", "darken(#fff, \"foo\")")
   end
 
   def test_saturate
@@ -458,8 +458,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_saturate_tests_types
-    assert_error_message("\"foo\" is not a color for `saturate'", "saturate(\"foo\", 10%)")
-    assert_error_message("\"foo\" is not a number for `saturate'", "saturate(#fff, \"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `saturate'", "saturate(\"foo\", 10%)")
+    assert_error_message("$amount: \"foo\" is not a number for `saturate'", "saturate(#fff, \"foo\")")
   end
 
   def test_desaturate
@@ -481,8 +481,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_desaturate_tests_types
-    assert_error_message("\"foo\" is not a color for `desaturate'", "desaturate(\"foo\", 10%)")
-    assert_error_message("\"foo\" is not a number for `desaturate'", "desaturate(#fff, \"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `desaturate'", "desaturate(\"foo\", 10%)")
+    assert_error_message("$amount: \"foo\" is not a number for `desaturate'", "desaturate(#fff, \"foo\")")
   end
 
   def test_adjust_hue
@@ -498,8 +498,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_adjust_hue_tests_types
-    assert_error_message("\"foo\" is not a color for `adjust-hue'", "adjust-hue(\"foo\", 10%)")
-    assert_error_message("\"foo\" is not a number for `adjust-hue'", "adjust-hue(#fff, \"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `adjust-hue'", "adjust-hue(\"foo\", 10%)")
+    assert_error_message("$degrees: \"foo\" is not a number for `adjust-hue'", "adjust-hue(#fff, \"foo\")")
   end
 
   def test_adjust_color
@@ -557,7 +557,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_adjust_color_tests_types
-    assert_error_message("\"foo\" is not a color for `adjust-color'", "adjust-color(foo, $hue: 10)")
+    assert_error_message("$color: \"foo\" is not a color for `adjust-color'", "adjust-color(foo, $hue: 10)")
     # HSL
     assert_error_message("$hue: \"foo\" is not a number for `adjust-color'",
       "adjust-color(blue, $hue: foo)")
@@ -663,7 +663,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_scale_color_tests_types
-    assert_error_message("\"foo\" is not a color for `scale-color'", "scale-color(foo, $red: 10%)")
+    assert_error_message("$color: \"foo\" is not a color for `scale-color'", "scale-color(foo, $red: 10%)")
     # HSL
     assert_error_message("$saturation: \"foo\" is not a number for `scale-color'",
       "scale-color(blue, $saturation: foo)")
@@ -734,7 +734,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_change_color_tests_types
-    assert_error_message("\"foo\" is not a color for `change-color'", "change-color(foo, $red: 10%)")
+    assert_error_message("$color: \"foo\" is not a color for `change-color'", "change-color(foo, $red: 10%)")
     # HSL
     assert_error_message("$saturation: \"foo\" is not a number for `change-color'",
       "change-color(blue, $saturation: foo)")
@@ -797,9 +797,9 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_mix_tests_types
-    assert_error_message("\"foo\" is not a color for `mix'", "mix(\"foo\", #f00, 10%)")
-    assert_error_message("\"foo\" is not a color for `mix'", "mix(#f00, \"foo\", 10%)")
-    assert_error_message("\"foo\" is not a number for `mix'", "mix(#f00, #baf, \"foo\")")
+    assert_error_message("$color-1: \"foo\" is not a color for `mix'", "mix(\"foo\", #f00, 10%)")
+    assert_error_message("$color-2: \"foo\" is not a color for `mix'", "mix(#f00, \"foo\", 10%)")
+    assert_error_message("$weight: \"foo\" is not a number for `mix'", "mix(#f00, #baf, \"foo\")")
   end
 
   def test_mix_tests_bounds
@@ -822,7 +822,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def tets_grayscale_tests_types
-    assert_error_message("\"foo\" is not a color for `grayscale'", "grayscale(\"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `grayscale'", "grayscale(\"foo\")")
   end
 
   def test_complement
@@ -835,7 +835,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def tets_complement_tests_types
-    assert_error_message("\"foo\" is not a color for `complement'", "complement(\"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `complement'", "complement(\"foo\")")
   end
 
   def test_invert
@@ -845,7 +845,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_invert_tests_types
-    assert_error_message("\"foo\" is not a color for `invert'", "invert(\"foo\")")
+    assert_error_message("$color: \"foo\" is not a color for `invert'", "invert(\"foo\")")
   end
 
   def test_unquote
@@ -861,7 +861,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_quote_tests_type
-    assert_error_message("#ff0000 is not a string for `quote'", "quote(#f00)")
+    assert_error_message("$string: #ff0000 is not a string for `quote'", "quote(#f00)")
   end
 
   def test_user_defined_function
@@ -900,14 +900,14 @@ MSG
     assert_equal(%Q{"em/rem"}, evaluate("unit(10px * 5em / 30cm / 1rem)"))
     assert_equal(%Q{"em*vh/cm*rem"}, evaluate("unit(10vh * 5em / 30cm / 1rem)"))
     assert_equal(%Q{"px"}, evaluate("unit($number: 100px)"))
-    assert_error_message("#ff0000 is not a number for `unit'", "unit(#f00)")
+    assert_error_message("$number: #ff0000 is not a number for `unit'", "unit(#f00)")
   end
 
   def test_unitless
     assert_equal(%Q{true}, evaluate("unitless(100)"))
     assert_equal(%Q{false}, evaluate("unitless(100px)"))
     assert_equal(%Q{false}, evaluate("unitless($number: 100px)"))
-    assert_error_message("#ff0000 is not a number for `unitless'", "unitless(#f00)")
+    assert_error_message("$number: #ff0000 is not a number for `unitless'", "unitless(#f00)")
   end
 
   def test_comparable
@@ -915,8 +915,8 @@ MSG
     assert_equal(%Q{true}, evaluate("comparable(10cm, 3mm)"))
     assert_equal(%Q{false}, evaluate("comparable(100px, 3em)"))
     assert_equal(%Q{false}, evaluate("comparable($number-1: 100px, $number-2: 3em)"))
-    assert_error_message("#ff0000 is not a number for `comparable'", "comparable(#f00, 1px)")
-    assert_error_message("#ff0000 is not a number for `comparable'", "comparable(1px, #f00)")
+    assert_error_message("$number-1: #ff0000 is not a number for `comparable'", "comparable(#f00, 1px)")
+    assert_error_message("$number-2: #ff0000 is not a number for `comparable'", "comparable(1px, #f00)")
   end
 
   def test_length
@@ -941,6 +941,7 @@ MSG
     assert_error_message("List index is 5 but list is only 4 items long for `nth'", "nth(1 2 3 4, 5)")
     assert_error_message("List index is 2 but list is only 1 item long for `nth'", "nth(foo, 2)")
     assert_error_message("List index is 1 but list has no items for `nth'", "nth((), 1)")
+    assert_error_message("$n: \"foo\" is not a number for `nth'", "nth(1 2 3, foo)")
   end
 
   def test_join
@@ -979,6 +980,7 @@ MSG
     assert_equal("false", evaluate("(1, 2, ()) == join((), (1, 2))"))
 
     assert_error_message("Separator name must be space, comma, or auto for `join'", "join(1, 2, baboon)")
+    assert_error_message("$separator: 12 is not a string for `join'", "join(1, 2, 12)")
   end
 
   def test_append
@@ -1013,6 +1015,7 @@ MSG
     assert_equal("true", evaluate("(1 2) == nth(append((), 1 2), 1)"))
 
     assert_error_message("Separator name must be space, comma, or auto for `append'", "append(1, 2, baboon)")
+    assert_error_message("$separator: 12 is not a string for `append'", "append(1, 2, 12)")
   end
 
   def test_zip