sass 3.4.25 → 3.5.0.pre.rc.1

data/test/sass/engine_test.rb

@@ -288,10 +288,10 @@ ERROR
   def test_exception_line
     to_render = <<SASS
 rule
-  prop: val
+  :prop val
   // comment!
 
-  broken:
+  :broken
 SASS
     begin
       Sass::Engine.new(to_render).render
@@ -305,10 +305,10 @@ SASS
   def test_exception_location
     to_render = <<SASS
 rule
-  prop: val
+  :prop val
   // comment!
 
-  broken:
+  :broken
 SASS
     begin
       Sass::Engine.new(to_render, :filename => FAKE_FILE_NAME, :line => (__LINE__-7)).render
@@ -749,22 +749,22 @@ SASS
 
   def test_basic_multiline_selector
     assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
-                 render("#foo #bar,\n#baz #boom\n  foo: bar"))
+                 render("#foo #bar,\n#baz #boom\n  :foo bar"))
     assert_equal("#foo #bar,\n#foo #baz {\n  foo: bar; }\n",
-                 render("#foo\n  #bar,\n  #baz\n    foo: bar"))
+                 render("#foo\n  #bar,\n  #baz\n    :foo bar"))
     assert_equal("#foo,\n#bar {\n  foo: bar; }\n  #foo #baz,\n  #bar #baz {\n    foo: bar; }\n",
-                 render("#foo,\n#bar\n  foo: bar\n  #baz\n    foo: bar"))
+                 render("#foo,\n#bar\n  :foo bar\n  #baz\n    :foo bar"))
     assert_equal("#foo #bar, #baz #boom { foo: bar; }\n",
-                 render("#foo #bar,\n#baz #boom\n  foo: bar", :style => :compact))
+                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compact))
                  
     assert_equal("#foo #bar,#baz #boom{foo:bar}\n",
-                 render("#foo #bar,\n#baz #boom\n  foo: bar", :style => :compressed))
+                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compressed))
 
     assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
-                 render("#foo #bar,,\n,#baz #boom,\n  foo: bar"))
+                 render("#foo #bar,,\n,#baz #boom,\n  :foo bar"))
 
     assert_equal("#bip #bop {\n  foo: bar; }\n",
-                 render("#bip #bop,, ,\n  foo: bar"))
+                 render("#bip #bop,, ,\n  :foo bar"))
   end
 
   def test_complex_multiline_selector
@@ -783,7 +783,7 @@ SASS
     end
 
     begin
-      silence_warnings {render("a\n  :b c", :property_syntax => :new)}
+      render("a\n  :b c", :property_syntax => :new)
       assert_equal(2, e.sass_line)
     rescue Sass::SyntaxError => e
       assert_equal("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.",
@@ -806,53 +806,53 @@ SASS
   def test_directive
     assert_equal("@a b;\n", render("@a b"))
 
-    assert_equal("@a {\n  b: c; }\n", render("@a\n  b: c"))
-    assert_equal("@a { b: c; }\n", render("@a\n  b: c", :style => :compact))
-    assert_equal("@a {\n  b: c;\n}\n", render("@a\n  b: c", :style => :expanded))
-    assert_equal("@a{b:c}\n", render("@a\n  b: c", :style => :compressed))
+    assert_equal("@a {\n  b: c; }\n", render("@a\n  :b c"))
+    assert_equal("@a { b: c; }\n", render("@a\n  :b c", :style => :compact))
+    assert_equal("@a {\n  b: c;\n}\n", render("@a\n  :b c", :style => :expanded))
+    assert_equal("@a{b:c}\n", render("@a\n  :b c", :style => :compressed))
 
     assert_equal("@a {\n  b: c;\n  d: e; }\n",
-                 render("@a\n  b: c\n  d: e"))
+                 render("@a\n  :b c\n  :d e"))
     assert_equal("@a { b: c; d: e; }\n",
-                 render("@a\n  b: c\n  d: e", :style => :compact))
+                 render("@a\n  :b c\n  :d e", :style => :compact))
     assert_equal("@a {\n  b: c;\n  d: e;\n}\n",
-                 render("@a\n  b: c\n  d: e", :style => :expanded))
+                 render("@a\n  :b c\n  :d e", :style => :expanded))
     assert_equal("@a{b:c;d:e}\n",
-                 render("@a\n  b: c\n  d: e", :style => :compressed))
+                 render("@a\n  :b c\n  :d e", :style => :compressed))
 
     assert_equal("@a {\n  #b {\n    c: d; } }\n",
-                 render("@a\n  #b\n    c: d"))
+                 render("@a\n  #b\n    :c d"))
     assert_equal("@a { #b { c: d; } }\n",
-                 render("@a\n  #b\n    c: d", :style => :compact))
+                 render("@a\n  #b\n    :c d", :style => :compact))
     assert_equal("@a {\n  #b {\n    c: d;\n  }\n}\n",
-                 render("@a\n  #b\n    c: d", :style => :expanded))
+                 render("@a\n  #b\n    :c d", :style => :expanded))
     assert_equal("@a{#b{c:d}}\n",
-                 render("@a\n  #b\n    c: d", :style => :compressed))
+                 render("@a\n  #b\n    :c d", :style => :compressed))
 
     assert_equal("@a {\n  #b {\n    a: b; }\n    #b #c {\n      d: e; } }\n",
-                 render("@a\n  #b\n    a: b\n    #c\n      d: e"))
+                 render("@a\n  #b\n    :a b\n    #c\n      :d e"))
     assert_equal("@a { #b { a: b; }\n  #b #c { d: e; } }\n",
-                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :compact))
+                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compact))
     assert_equal("@a {\n  #b {\n    a: b;\n  }\n  #b #c {\n    d: e;\n  }\n}\n",
-                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :expanded))
+                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :expanded))
     assert_equal("@a{#b{a:b}#b #c{d:e}}\n",
-                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :compressed))
+                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compressed))
                  
     assert_equal("@a {\n  #foo,\n  #bar {\n    b: c; } }\n",
-                 render("@a\n  #foo, \n  #bar\n    b: c"))
+                 render("@a\n  #foo, \n  #bar\n    :b c"))
     assert_equal("@a { #foo, #bar { b: c; } }\n",
-                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :compact))
+                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compact))
     assert_equal("@a {\n  #foo,\n  #bar {\n    b: c;\n  }\n}\n",
-                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :expanded))
+                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :expanded))
     assert_equal("@a{#foo,#bar{b:c}}\n",
-                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :compressed))
+                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compressed))
 
     to_render = <<END
 @a
-  b: c
+  :b c
   #d
-    e: f
-  g: h
+    :e f
+  :g h
 END
     rendered = <<END
 @a { b: c;
@@ -1141,7 +1141,7 @@ black {
   color: #000; }
 CSS
 =foo($a: #FFF)
-  color: $a
+  :color $a
 white
   +foo
 black
@@ -1165,9 +1165,9 @@ three {
 CSS
 $a: 5px
 =foo($a, $b: 1px, $c: 3px + $b)
-  color: $a
-  padding: $b
-  margin: $c
+  :color $a
+  :padding $b
+  :margin $c
 one
   +foo(#fff)
 two
@@ -2598,29 +2598,29 @@ SASS
   border-style: solid; }
 RESULT
 .box
-  border:
-    //color: black
-    style: solid
+  :border
+    //:color black
+    :style solid
 SOURCE
 
     assert_equal(<<RESULT, render(<<SOURCE))
 .box {
-  /* color: black */
+  /* :color black */
   border-style: solid; }
 RESULT
 .box
-  border:
-    /* color: black
-    style: solid
+  :border
+    /* :color black
+    :style solid
 SOURCE
 
     assert_equal(<<RESULT, render(<<SOURCE, :style => :compressed))
 .box{border-style:solid}
 RESULT
 .box
-  border:
-    /*color: black
-    style: solid
+  :border
+    /*:color black
+    :style solid
 SOURCE
   end
 
@@ -2700,15 +2700,6 @@ a
 SASS
   end
 
-  def test_mixin_no_arg_error
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "($bar,": expected variable (e.g. $foo), was ")"') do
-      render(<<SASS)
-=foo($bar,)
-  bip: bap
-SASS
-    end
-  end
-
   def test_import_with_commas_in_url
     assert_equal <<CSS, render(<<SASS)
 @import url(foo.css?bar,baz);
@@ -3391,16 +3382,74 @@ CSS
 SASS
   end
 
+  def test_trailing_commas_in_arglists
+    assert_equal(<<CSS, render(<<SASS, :style => :nested))
+.includes {
+  one-positional-arg: positional 1 a;
+  two-positional-args: positional 2 a b;
+  one-keyword-arg: keyword 1 z;
+  two-keyword-args: keyword 2 y z;
+  mixed-args: mixed 2 y z; }
+
+.calls {
+  one-positional-arg: positional 1 a;
+  two-positional-args: positional 2 a b;
+  one-keyword-arg: keyword 1 z;
+  two-keyword-args: keyword 2 y z;
+  mixed-args: mixed 2 y z; }
+CSS
+=one-positional-arg($a,)
+  one-positional-arg: positional 1 $a
+
+=two-positional-args($a, $b,)
+  two-positional-args: positional 2 $a $b
+
+=one-keyword-arg($a: a,)
+  one-keyword-arg: keyword 1 $a
+
+=two-keyword-args($a: a, $b: b,)
+  two-keyword-args: keyword 2 $a $b
+
+=mixed-args($a, $b: b,)
+  mixed-args: mixed 2 $a $b
+
+@function one-positional-arg($a)
+  @return positional 1 $a
+
+@function two-positional-args($a, $b)
+  @return positional 2 $a $b
+
+@function one-keyword-arg($a: a)
+  @return keyword 1 $a
+
+@function two-keyword-args($a: a, $b: b)
+  @return keyword 2 $a $b
+
+@function mixed-args($a, $b: b)
+  @return mixed 2 $a $b
+
+
+.includes
+  +one-positional-arg(a,)
+  +two-positional-args(a, b,)
+  +one-keyword-arg($a: z,)
+  +two-keyword-args($a: y, $b: z,)
+  +mixed-args(y, $b: z,)
+
+
+.calls
+  one-positional-arg: one-positional-arg(a)
+  two-positional-args: two-positional-args(a, b)
+  one-keyword-arg: one-keyword-arg($a: z)
+  two-keyword-args: two-keyword-args($a: y, $b: z)
+  mixed-args: mixed-args(y, $b: z)
+SASS
+  end
+
   private
 
   def assert_hash_has(hash, expected)
-    expected.each do |k, v|
-      if v.nil?
-        assert_nil(hash[k])
-      else
-        assert_equal(v, hash[k])
-      end
-    end
+    expected.each {|k, v| assert_equal(v, hash[k])}
   end
 
   def assert_renders_encoded(css, sass)

data/test/sass/extend_test.rb

@@ -167,52 +167,42 @@ SCSS
   end
 
   def test_universal_unification_with_namespaceless_universal_target
-    assert_extend_doesnt_match('ns|*', '.foo', :failed_to_unify, 2) do
-      render_unification '*.foo', 'ns|* {@extend .foo}'
-    end
-
     assert_unification '*.foo', '* {@extend .foo}', '*'
     assert_unification '*.foo', '*|* {@extend .foo}', '*'
     assert_unification '*|*.foo', '* {@extend .foo}', '*|*.foo, *'
     assert_unification '*|*.foo', '*|* {@extend .foo}', '*|*'
+    assert_unification '*.foo', 'ns|* {@extend .foo}', '*.foo, ns|*'
     assert_unification '*|*.foo', 'ns|* {@extend .foo}', '*|*.foo, ns|*'
   end
 
   def test_universal_unification_with_namespaced_universal_target
-    assert_extend_doesnt_match('*', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns|*.foo', '* {@extend .foo}'
-    end
+    assert_unification 'ns|*.foo', '* {@extend .foo}', 'ns|*'
+    assert_unification 'ns|*.foo', '*|* {@extend .foo}', 'ns|*'
 
     assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
       render_unification 'ns1|*.foo', 'ns2|* {@extend .foo}'
     end
 
-    assert_unification 'ns|*.foo', '*|* {@extend .foo}', 'ns|*'
     assert_unification 'ns|*.foo', 'ns|* {@extend .foo}', 'ns|*'
   end
 
   def test_universal_unification_with_namespaceless_element_target
-    assert_extend_doesnt_match('ns|*', '.foo', :failed_to_unify, 2) do
-      render_unification 'a.foo', 'ns|* {@extend .foo}'
-    end
-
     assert_unification 'a.foo', '* {@extend .foo}', 'a'
     assert_unification 'a.foo', '*|* {@extend .foo}', 'a'
     assert_unification '*|a.foo', '* {@extend .foo}', '*|a.foo, a'
     assert_unification '*|a.foo', '*|* {@extend .foo}', '*|a'
+    assert_unification 'a.foo', 'ns|* {@extend .foo}', 'a.foo, ns|a'
     assert_unification '*|a.foo', 'ns|* {@extend .foo}', '*|a.foo, ns|a'
   end
 
   def test_universal_unification_with_namespaced_element_target
-    assert_extend_doesnt_match('*', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns|a.foo', '* {@extend .foo}'
-    end
+    assert_unification 'ns|a.foo', '* {@extend .foo}', 'ns|a'
+    assert_unification 'ns|a.foo', '*|* {@extend .foo}', 'ns|a'
 
     assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
       render_unification 'ns1|a.foo', 'ns2|* {@extend .foo}'
     end
 
-    assert_unification 'ns|a.foo', '*|* {@extend .foo}', 'ns|a'
     assert_unification 'ns|a.foo', 'ns|* {@extend .foo}', 'ns|a'
   end
 
@@ -224,56 +214,46 @@ SCSS
   end
 
   def test_element_unification_with_namespaceless_universal_target
-    assert_extend_doesnt_match('ns|a', '.foo', :failed_to_unify, 2) do
-      render_unification '*.foo', 'ns|a {@extend .foo}'
-    end
-
     assert_unification '*.foo', 'a {@extend .foo}', '*.foo, a'
     assert_unification '*.foo', '*|a {@extend .foo}', '*.foo, a'
     assert_unification '*|*.foo', 'a {@extend .foo}', '*|*.foo, a'
     assert_unification '*|*.foo', '*|a {@extend .foo}', '*|*.foo, *|a'
+    assert_unification '*.foo', 'ns|a {@extend .foo}', '*.foo, ns|a'
     assert_unification '*|*.foo', 'ns|a {@extend .foo}', '*|*.foo, ns|a'
   end
 
   def test_element_unification_with_namespaced_universal_target
-    assert_extend_doesnt_match('a', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns|*.foo', 'a {@extend .foo}'
-    end
+    assert_unification 'ns|*.foo', 'a {@extend .foo}', 'ns|*.foo, ns|a'
+    assert_unification 'ns|*.foo', '*|a {@extend .foo}', 'ns|*.foo, ns|a'
 
     assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
       render_unification 'ns1|*.foo', 'ns2|a {@extend .foo}'
     end
 
-    assert_unification 'ns|*.foo', '*|a {@extend .foo}', 'ns|*.foo, ns|a'
     assert_unification 'ns|*.foo', 'ns|a {@extend .foo}', 'ns|*.foo, ns|a'
   end
 
   def test_element_unification_with_namespaceless_element_target
-    assert_extend_doesnt_match('ns|a', '.foo', :failed_to_unify, 2) do
-      render_unification 'a.foo', 'ns|a {@extend .foo}'
-    end
-
-    assert_extend_doesnt_match('h1', '.foo', :failed_to_unify, 2) do
-      render_unification 'a.foo', 'h1 {@extend .foo}'
-    end
-
     assert_unification 'a.foo', 'a {@extend .foo}', 'a'
     assert_unification 'a.foo', '*|a {@extend .foo}', 'a'
     assert_unification '*|a.foo', 'a {@extend .foo}', '*|a.foo, a'
     assert_unification '*|a.foo', '*|a {@extend .foo}', '*|a'
+    assert_unification 'a.foo', 'ns|a {@extend .foo}', 'a.foo, ns|a'
     assert_unification '*|a.foo', 'ns|a {@extend .foo}', '*|a.foo, ns|a'
+
+    assert_extend_doesnt_match('h1', '.foo', :failed_to_unify, 2) do
+      render_unification 'a.foo', 'h1 {@extend .foo}'
+    end
   end
 
   def test_element_unification_with_namespaced_element_target
-    assert_extend_doesnt_match('a', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns|a.foo', 'a {@extend .foo}'
-    end
+    assert_unification 'ns|a.foo', 'a {@extend .foo}', 'ns|a'
+    assert_unification 'ns|a.foo', '*|a {@extend .foo}', 'ns|a'
 
     assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
       render_unification 'ns1|a.foo', 'ns2|a {@extend .foo}'
     end
 
-    assert_unification 'ns|a.foo', '*|a {@extend .foo}', 'ns|a'
     assert_unification 'ns|a.foo', 'ns|a {@extend .foo}', 'ns|a'
   end
 
@@ -315,6 +295,18 @@ SCSS
     assert_extends 'a.foo:bar', '.baz {@extend .foo}', 'a.foo:bar, a.baz:bar'
   end
 
+  def test_id_unification_again
+    assert_unification('#id.foo .bar', '#id.baz .qux {@extend .bar}',
+        '#id.foo .bar, #id.baz.foo .qux')
+  end
+
+  def test_root_unification
+    assert_extends(
+      ".foo:root .bar",
+      ".baz:root .qux {@extend .bar}",
+      ".foo:root .bar, .baz.foo:root .qux")
+  end
+
   def test_not_remains_at_end_of_selector
     assert_extends '.foo:not(.bar)', '.baz {@extend .foo}', '.foo:not(.bar), .baz:not(.bar)'
   end
@@ -573,27 +565,21 @@ SCSS
   ## Long Extendees
 
   def test_long_extendee
-    assert_warning(<<WARNING) {assert_extends '.foo.bar', '.baz {@extend .foo.bar}', '.foo.bar, .baz'}
-DEPRECATION WARNING on line 2 of test_long_extendee_inline.scss:
-Extending a compound selector, .foo.bar, is deprecated and will not be supported in a future release.
-See https://github.com/sass/sass/issues/1599 for details.
-WARNING
+    assert_extends '.foo.bar', '.baz {@extend .foo.bar}', '.foo.bar, .baz'
   end
 
   def test_long_extendee_requires_all_selectors
-    silence_warnings do
-      assert_extend_doesnt_match('.baz', '.foo.bar', :not_found, 2) do
-        render_extends '.foo', '.baz {@extend .foo.bar}'
-      end
+    assert_extend_doesnt_match('.baz', '.foo.bar', :not_found, 2) do
+      render_extends '.foo', '.baz {@extend .foo.bar}'
     end
   end
 
   def test_long_extendee_matches_supersets
-    silence_warnings {assert_extends '.foo.bar.bap', '.baz {@extend .foo.bar}', '.foo.bar.bap, .bap.baz'}
+    assert_extends '.foo.bar.bap', '.baz {@extend .foo.bar}', '.foo.bar.bap, .bap.baz'
   end
 
   def test_long_extendee_runs_unification
-    silence_warnings {assert_extends 'ns|*.foo.bar', '*|a.baz {@extend .foo.bar}', 'ns|*.foo.bar, ns|a.baz'}
+    assert_extends 'ns|*.foo.bar', 'a.baz {@extend .foo.bar}', 'ns|*.foo.bar, ns|a.baz'
   end
 
   ## Long Extenders
@@ -603,7 +589,7 @@ WARNING
   end
 
   def test_long_extender_runs_unification
-    assert_extends 'ns|*.foo.bar', '*|a.baz {@extend .foo}', 'ns|*.foo.bar, ns|a.bar.baz'
+    assert_extends 'ns|*.foo.bar', 'a.baz {@extend .foo}', 'ns|*.foo.bar, ns|a.bar.baz'
   end
 
   def test_long_extender_aborts_unification
@@ -689,9 +675,9 @@ WARNING
   end
 
   def test_nested_extender_doesnt_find_common_selectors_around_reference_selector
-    silence_warnings {assert_extends 'a /for/ b c .c1', 'a c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b a c .c2, a a /for/ b c .c2'}
-    silence_warnings {assert_extends 'a /for/ b c .c1', 'a b .c2 {@extend .c1}', 'a /for/ b c .c1, a a /for/ b c .c2'}
-    silence_warnings {assert_extends 'a /for/ b c .c1', 'b c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b c .c2'}
+    assert_extends 'a /for/ b c .c1', 'a c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b a c .c2, a a /for/ b c .c2'
+    assert_extends 'a /for/ b c .c1', 'a b .c2 {@extend .c1}', 'a /for/ b c .c1, a a /for/ b c .c2'
+    assert_extends 'a /for/ b c .c1', 'b c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b c .c2'
   end
 
   def test_nested_extender_with_early_child_selectors_doesnt_subseq_them