sass 3.1.0.alpha.221 → 3.1.0.alpha.246

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

@@ -59,8 +59,20 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     return if node.invisible?
     spaces = ('  ' * [@tabs - node.value[/^ */].size, 0].max)
 
-    content = node.value.gsub(/^/, spaces)
-    content.gsub!(/\n +(\* *(?!\/))?/, ' ') if node.style == :compact
+    content = node.value.gsub(/^/, spaces).gsub(%r{^(\s*)//(.*)$}) do |md|
+      "#{$1}/*#{$2} */"
+    end
+    if content =~ /[^\\]\#\{.*\}/
+      Sass::Util.sass_warn <<MESSAGE
+WARNING:
+On line #{node.line}#{" of '#{node.filename}'" if node.filename}
+Comments will evaluate the contents of interpolations (\#{ ... }) in Sass 3.2.
+Please escape the interpolation by adding a backslash before the hash sign.
+MESSAGE
+    elsif content =~ /\\\#\{.*\}/
+      content.gsub!(/\\(\#\{.*\})/, '\1')
+    end
+    content.gsub!(/\n +(\* *(?!\/))?/, ' ') if (node.style == :compact || node.style == :compressed) && !node.loud
     content
   end
 
@@ -110,9 +122,9 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
   def visit_prop(node)
     tab_str = '  ' * (@tabs + node.tabs)
     if node.style == :compressed
-      "#{tab_str}#{node.resolved_name}:#{node.resolved_value}"
+      "#{tab_str}#{node.resolved_name}:#{node.resolved_value}#{'!important' if node.important}"
     else
-      "#{tab_str}#{node.resolved_name}: #{node.resolved_value};"
+      "#{tab_str}#{node.resolved_name}: #{node.resolved_value}#{' !important' if node.important};"
     end
   end
 
@@ -192,7 +204,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
                 [Sass::Selector::Element.new(k.to_s.gsub(/[^\w-]/, "\\\\\\0"), nil)])
             ])
         ])
-      prop = Sass::Tree::PropNode.new([""], "", :new)
+      prop = Sass::Tree::PropNode.new([""], "", false, :new)
       prop.resolved_name = "font-family"
       prop.resolved_value = Sass::SCSS::RX.escape_ident(v.to_s)
       rule << prop

data/test/sass/conversion_test.rb

@@ -165,14 +165,6 @@ SASS
 foo bar {
   baz: 12 $bang "bip"; }
 SCSS
-
-    assert_sass_to_scss <<SCSS, <<SASS
-foo bar {
-  baz: 12 $bang bip; }
-SCSS
-foo bar
-  baz= 12 $bang "bip"
-SASS
   end
 
   def test_dynamic_properties_with_old
@@ -183,14 +175,6 @@ SASS
 foo bar {
   baz: 12 $bang "bip"; }
 SCSS
-
-    assert_sass_to_scss <<SCSS, <<SASS, :old => true
-foo bar {
-  baz: 12 $bang bip; }
-SCSS
-foo bar
-  :baz= 12 $bang "bip"
-SASS
   end
 
   def test_multiline_properties
@@ -842,22 +826,12 @@ SASS
     a: $baz $bang; } }
 SCSS
 
-    assert_scss_to_sass <<SASS, <<SCSS
-=foo-bar($baz, $bang: foo)
-  baz
-    a: $baz $bang
-SASS
-@mixin foo-bar($baz, $bang = "foo") {
-  baz {
-    a: $baz $bang; } }
-SCSS
-
     assert_sass_to_scss <<SCSS, <<SASS
 @mixin foo-bar($baz, $bang: foo) {
   baz {
     a: $baz $bang; } }
 SCSS
-=foo-bar($baz, $bang = "foo")
+=foo-bar($baz, $bang: foo)
   baz
     a: $baz $bang
 SASS
@@ -951,8 +925,6 @@ foo {
   $var2: flaz(#abcdef);
   val: $var1 $var2; }
 SCSS
-
-    assert_sass_to_scss '$var: 12px $bar baz;', '$var = 12px $bar "baz"'
   end
 
   def test_guarded_variable_definition
@@ -969,8 +941,6 @@ foo {
   $var2: flaz(#abcdef) !default;
   val: $var1 $var2; }
 SCSS
-
-    assert_sass_to_scss '$var: 12px $bar baz !default;', '$var ||= 12px $bar "baz"'
   end
 
   def test_multiple_variable_definitions
@@ -1114,62 +1084,6 @@ SCSS
     end
   end
 
-  # Sass 3 Deprecation conversions
-
-  def test_simple_quoted_strings_unquoted_with_equals
-    assert_sass_to_scss '$var: 1px foo + bar baz;', '!var = 1px "foo" + "bar" baz'
-    assert_sass_to_scss '$var: -foo-bar;', '!var = "-foo-bar"'
-  end
-
-  def test_complex_quoted_strings_explicitly_unquoted_with_equals
-    assert_sass_to_scss '$var: 1px unquote("foo + bar") baz;', '!var = 1px "foo + bar" baz'
-    assert_sass_to_scss "$var: unquote('foo\"bar');", '!var = "foo\"bar"'
-  end
-
-  def test_division_asserted_with_equals
-    assert_sass_to_scss <<SCSS, <<SASS
-foo {
-  a: (1px / 2px); }
-SCSS
-foo
-  a = 1px / 2px
-SASS
-  end
-
-  def test_division_not_asserted_with_equals_when_unnecessary
-    assert_sass_to_scss <<SCSS, <<SASS
-$var: 1px / 2px;
-
-foo {
-  a: $var; }
-SCSS
-!var = 1px / 2px
-
-foo
-  a = !var
-SASS
-
-    assert_sass_to_scss <<SCSS, <<SASS
-$var: 1px;
-
-foo {
-  a: $var / 2px; }
-SCSS
-!var = 1px
-
-foo
-  a = !var / 2px
-SASS
-
-    assert_sass_to_scss <<SCSS, <<SASS
-foo {
-  a: 1 + 1px / 2px; }
-SCSS
-foo
-  a = 1 + 1px / 2px
-SASS
-  end
-
   def test_nested_properties
     assert_renders <<SASS, <<SCSS
 div
@@ -1217,24 +1131,25 @@ div
 SASS
   end
 
-  def test_sass2_var_in_property_interpolation
-assert_sass_to_scss <<SCSS, <<SASS
-foo {
-  a: b \#{$c} d; }
-SCSS
-foo
-  a: b \#{!c} d
+  def test_loud_comment_conversion
+    assert_renders(<<SASS, <<SCSS)
+/*! \#{"interpolated"}
+/*!
+ *  \#{"also interpolated"}
 SASS
-  end
-
-  def test_sass2_var_in_selector_interpolation
-assert_sass_to_scss <<SCSS, <<SASS
-foo-\#{$c} {
-  a: b; }
+/*! \#{"interpolated"} */
+/*!
+ *  \#{"also interpolated"} */
 SCSS
-foo-\#{!c}
-  a: b
+    assert_renders(<<SASS, <<SCSS)
+//! \#{"interpolated"}
+//!
+//! \#{"also interpolated"}
 SASS
+//! \#{"interpolated"}
+//!
+//! \#{"also interpolated"}
+SCSS
   end
 
   private

data/test/sass/engine_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
+require 'sass/test_helper'
 require 'sass/engine'
 require 'stringio'
 require 'mock_importer'
@@ -41,9 +41,9 @@ MSG
     "a\n  @extend .foo ^bar" => 'Invalid CSS after ".foo ": expected selector, was "^bar"',
     "a: b" => 'Properties are only allowed within rules, directives, or other properties.',
     ":a b" => 'Properties are only allowed within rules, directives, or other properties.',
-    "!" => 'Invalid variable: "!".',
+    "$" => 'Invalid variable: "$".',
     "$a" => 'Invalid variable: "$a".',
-    "! a" => 'Invalid variable: "! a".',
+    "$ a" => 'Invalid variable: "$ a".',
     "$a b" => 'Invalid variable: "$a b".',
     "$a: 1b + 2c" => "Incompatible units: 'c' and 'b'.",
     "$a: 1b < 2c" => "Incompatible units: 'c' and 'b'.",
@@ -68,6 +68,7 @@ MSG
     "@if true\n  @import foo" => "Import directives may not be used within control directives or mixins.",
     "@mixin foo\n  @import foo" => "Import directives may not be used within control directives or mixins.",
     '$foo: "bar" "baz" !' => %Q{Invalid CSS after ""bar" "baz" ": expected expression (e.g. 1px, bold), was "!"},
+    '$foo: "bar" "baz" $' => %Q{Invalid CSS after ""bar" "baz" ": expected expression (e.g. 1px, bold), was "$"},
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",
     "=foo\n  :color red\n.bar\n  +bang_bop" => "Undefined mixin 'bang_bop'.",
     "=foo\n  :color red\n.bar\n  +bang-bop" => "Undefined mixin 'bang-bop'.",
@@ -90,8 +91,8 @@ MSG
     "=a($foo bar)" => 'Invalid CSS after "($foo ": expected ")", was "bar)"',
     "=foo\n  bar: baz\n+foo" => ["Properties are only allowed within rules, directives, or other properties.", 2],
     "a-\#{$b\n  c: d" => ['Invalid CSS after "a-#{$b": expected "}", was ""', 1],
-    "=a($b = 1, $c)" => "Required argument $c must come before any optional arguments.",
-    "=a($b = 1)\n  a: $b\ndiv\n  +a(1,2)" => "Mixin a takes 1 argument but 2 were passed.",
+    "=a($b: 1, $c)" => "Required argument $c must come before any optional arguments.",
+    "=a($b: 1)\n  a: $b\ndiv\n  +a(1,2)" => "Mixin a takes 1 argument but 2 were passed.",
     "=a($b: 1)\n  a: $b\ndiv\n  +a(1,$c: 3)" => "Mixin a doesn't have an argument named $c",
     "=a($b)\n  a: $b\ndiv\n  +a" => "Mixin a is missing parameter $b.",
     "@function foo()\n  1 + 2" => "Functions can only contain variable declarations and control directives.",
@@ -113,7 +114,6 @@ MSG
     "@else\n  a\n    b: c" => ["@else must come after @if.", 1],
     "@if false\n@else foo" => "Invalid else directive '@else foo': expected 'if <expr>'.",
     "@if false\n@else if " => "Invalid else directive '@else if': expected 'if <expr>'.",
-    "a\n  !b: 12\nc\n  d: !b" => 'Undefined variable: "$b".',
     "a\n  $b: 12\nc\n  d: $b" => 'Undefined variable: "$b".',
     "=foo\n  $b: 12\nc\n  +foo\n  d: $b" => 'Undefined variable: "$b".',
     "c\n  d: $b-foo" => 'Undefined variable: "$b-foo".',
@@ -968,77 +968,6 @@ foo
 SASS
   end
 
-  def test_equals_warning_for_properties
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 3, character 3 of 'test_equals_warning_for_properties_inline.sass'
-Setting properties with = has been deprecated and will be removed in version 3.2.
-Use "a: $var" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-foo {
-  a: 2px 3px; }
-CSS
-$var: 2px 3px
-foo
-  a = $var
-SASS
-  end
-
-  def test_equals_warning_for_dynamic_properties
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 4, character 3 of 'test_equals_warning_for_dynamic_properties_inline.sass'
-Setting properties with = has been deprecated and will be removed in version 3.2.
-Use "a-\#{$i}: $var" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-foo {
-  a-12: 2px 3px; }
-CSS
-$var: 2px 3px
-$i: 12
-foo
-  a-\#{$i} = $var
-SASS
-  end
-
-  def test_equals_warning_for_property_with_string
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 2, character 3 of 'test_equals_warning_for_property_with_string_inline.sass'
-Setting properties with = has been deprecated and will be removed in version 3.2.
-Use "a: foo" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-foo {
-  a: foo; }
-CSS
-foo
-  a = "foo"
-SASS
-  end
-
-  def test_equals_warning_for_property_with_division
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 2, character 3 of 'test_equals_warning_for_property_with_division_inline.sass'
-Setting properties with = has been deprecated and will be removed in version 3.2.
-Use "a: (1px / 2px)" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-foo {
-  a: 0.5; }
-CSS
-foo
-  a = 1px/2px
-SASS
-  end
-
   def test_guarded_assign
     assert_equal("foo {\n  a: b; }\n", render(%Q{$foo: b\n$foo: c !default\nfoo\n  a: $foo}))
     assert_equal("foo {\n  a: b; }\n", render(%Q{$foo: b !default\nfoo\n  a: $foo}))
@@ -1148,26 +1077,6 @@ a
 SASS
   end
 
-  def test_equals_warning_for_mixin_args
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 1, character 10 of 'test_equals_warning_for_mixin_args_inline.sass'
-Setting mixin argument defaults with = has been deprecated and will be removed in version 3.2.
-Use "$arg: 1px" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-bar {
-  a: 1px; }
-CSS
-=foo($arg = 1px)
-  a: $arg
-
-bar
-  +foo
-SASS
-  end
-
   def test_css_identifier_mixin
     assert_equal(<<CSS, render(<<SASS))
 a {
@@ -1336,30 +1245,6 @@ $a: 3
 SASS
   end
 
-  def test_for_with_bang_var
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 1, character 6 of 'test_for_with_bang_var_inline.sass'
-Variables with ! have been deprecated and will be removed in version 3.2.
-Use "$bar" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-a-0 {
-  b: c; }
-
-a-1 {
-  b: c; }
-
-a-2 {
-  b: c; }
-CSS
-@for !bar from 0 to 3
-  a-\#{$bar}
-    b: c
-SASS
-  end
-
   def test_while
     assert_equal(<<CSS, render(<<SASS))
 a-5 {
@@ -1462,78 +1347,6 @@ a
 SASS
   end
 
-  def test_bang_variables
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 1, character 1 of 'test_bang_variables_inline.sass'
-Variables with ! have been deprecated and will be removed in version 3.2.
-Use "$bang-var" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-foo {
-  a: 1px; }
-CSS
-!bang-var: 1px
-foo
-  a: $bang-var
-SASS
-
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 3, character 6 of 'test_bang_variables_inline.sass'
-Variables with ! have been deprecated and will be removed in version 3.2.
-Use "$dollar-var" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-foo {
-  a: 1px; }
-CSS
-$dollar-var: 1px
-foo
-  a: !dollar-var
-SASS
-  end
-
-  def test_equals_warning_for_variables
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 2, character 1 of 'test_equals_warning_for_variables_inline.sass'
-Setting variables with = has been deprecated and will be removed in version 3.2.
-Use "$equals-var: 2px 3px" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-foo {
-  a: 2px 3px; }
-CSS
-
-$equals-var = 2px 3px
-foo
-  a: $equals-var
-SASS
-  end
-
-  def test_equals_warning_for_guarded_variables
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
-DEPRECATION WARNING:
-On line 2, character 1 of 'test_equals_warning_for_guarded_variables_inline.sass'
-Setting variable defaults with ||= has been deprecated and will be removed in version 3.2.
-Use "$equals-var: 2px 3px !default" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-foo {
-  a: 2px 3px; }
-CSS
-
-$equals-var ||= 2px 3px
-foo
-  a: $equals-var
-SASS
-  end
-
   def test_variable_scope
     assert_equal(<<CSS, render(<<SASS))
 a {
@@ -1715,6 +1528,47 @@ foo
 SASS
   end
 
+  def test_loud_comment_in_compressed_mode
+    assert_equal <<CSS, render(<<SASS, :style => :compressed)
+foo{color:blue;/* foo
+ * bar
+ */}
+CSS
+foo
+  color: blue
+  /*! foo
+   * bar
+   */
+SASS
+  end
+  def test_loud_comment_in_silent_comment
+    assert_equal <<CSS, render(<<SASS, :style => :compressed)
+foo{color:blue;/* foo */
+/* bar */
+/* */
+/* bip */
+/* baz */}
+CSS
+foo
+  color: blue
+  //! foo
+  //! bar
+  //!
+    bip
+    baz
+SASS
+  end
+
+  def test_loud_comment_is_evaluated
+    assert_equal <<CSS, render(<<SASS)
+/*
+ * Hue: 327.216deg */
+CSS
+/*!
+  Hue: \#{hue(#f836a0)}
+SASS
+  end
+
   def test_attribute_selector_with_spaces
     assert_equal(<<CSS, render(<<SASS))
 a b[foo=bar] {
@@ -1919,182 +1773,6 @@ CSS
 SASS
   end
 
-  # Deprecated equals behavior
-
-  def test_equals_properties_unquote_strings
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: foo;
-  b: bar;
-  c: foo bar;
-  d: foo, bar baz;
-  e: foo bar, bar; }
-CSS
-foo
-  a= "foo"
-  b= bar
-  c= "foo" bar
-  d= foo, "bar baz"
-  e= "foo bar", bar
-SASS
-    end
-  end
-
-  def test_equals_properties_unquote_value
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: foo; }
-CSS
-$var: "foo"
-
-foo
-  a= $var
-SASS
-    end
-  end
-
-  def test_equals_properties_deep_unquote_vars
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: foo bar;
-  b: bar foo; }
-CSS
-$var: "foo"
-
-foo
-  a= $var "bar"
-  b= "bar" $var
-SASS
-    end
-  end
-
-  def test_equals_vars_unquote_strings
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: foo;
-  b: bar;
-  c: foo bar;
-  d: foo, bar; }
-CSS
-$a = "foo"
-$b = bar
-$c = "foo" bar
-$d = foo, "bar"
-
-foo
-  a: $a
-  b: $b
-  c: $c
-  d: $d
-SASS
-    end
-  end
-
-  def test_equals_vars_unquote_value
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: foo; }
-CSS
-$var1: "foo"
-$var2 = $var1
-
-foo
-  a: $var2
-SASS
-    end
-  end
-
-  def test_equals_vars_deep_unquote_vars
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: foo bar;
-  b: bar foo; }
-CSS
-$var: "foo"
-$a = $var "bar"
-$b = "bar" $var
-
-foo
-  a: $a
-  b: $b
-SASS
-    end
-  end
-
-  def test_equals_args_unquote_strings
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: foo;
-  b: bar;
-  c: foo bar;
-  d: foo, bar; }
-CSS
-=foo($a = "foo", $b = bar, $c = "foo" bar, $d = (foo, "bar"))
-  foo
-    a: $a
-    b: $b
-    c: $c
-    d: $d
-
-+foo
-SASS
-    end
-  end
-
-  def test_equals_args_unquote_value
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: foo; }
-CSS
-$var1: "foo"
-
-=foo($var2 = $var1)
-  foo
-    a: $var2
-
-+foo
-SASS
-    end
-  end
-
-  def test_equals_args_deep_unquote_vars
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: foo bar;
-  b: bar foo; }
-CSS
-$var: "foo"
-=foo($a = $var "bar", $b = "bar" $var)
-  foo
-    a: $a
-    b: $b
-
-+foo
-SASS
-    end
-  end
-
-  def test_equals_properties_force_division
-    silence_warnings do
-      assert_equal(<<CSS, render(<<SASS))
-foo {
-  a: 0.5; }
-CSS
-foo
-  a = 1px/2px
-SASS
-    end
-  end
-
   def test_warn_directive
   expected_warning = <<EXPECTATION
 WARNING: this is a warning
@@ -2569,6 +2247,28 @@ CSS
 SASS
   end
 
+  def test_comment_interpolation_warning
+    assert_warning(<<END) {render("/* \#{foo}")}
+WARNING:
+On line 1 of 'test_comment_interpolation_warning_inline.sass'
+Comments will evaluate the contents of interpolations (\#{ ... }) in Sass 3.2.
+Please escape the interpolation by adding a backslash before the hash sign.
+END
+  end
+
+  def test_loud_comment_interpolations_can_be_escaped
+    assert_equal <<CSS, render(<<SASS)
+/* \#{foo} */
+CSS
+/* \\\#{foo}
+SASS
+    assert_equal <<CSS, render(<<SASS)
+/* \#{foo} */
+CSS
+/*! \\\#{foo}
+SASS
+  end
+
   # Encodings
 
   unless Sass::Util.ruby1_8?