sass 3.1.0.alpha.36 → 3.1.0.alpha.37

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.36
+3.1.0.alpha.37

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.36
+3.1.0.alpha.37

data/lib/sass/engine.rb

@@ -459,23 +459,21 @@ MSG
       children.each do |line|
         child = build_tree(parent, line, root)
 
-        if child.is_a?(Tree::RuleNode) && child.continued?
-          raise SyntaxError.new("Rules can't end in commas.",
-            :line => child.line) unless child.children.empty?
-          if continued_rule
+        if child.is_a?(Tree::RuleNode)
+          if child.continued? && child.children.empty?
+            if continued_rule
+              continued_rule.add_rules child
+            else
+              continued_rule = child
+            end
+            next
+          elsif continued_rule
             continued_rule.add_rules child
-          else
-            continued_rule = child
+            continued_rule.children = child.children
+            continued_rule, child = nil, continued_rule
           end
-          next
-        end
-
-        if continued_rule
-          raise SyntaxError.new("Rules can't end in commas.",
-            :line => continued_rule.line) unless child.is_a?(Tree::RuleNode)
-          continued_rule.add_rules child
-          continued_rule.children = child.children
-          continued_rule, child = nil, continued_rule
+        elsif continued_rule
+          continued_rule = nil
         end
 
         if child.is_a?(Tree::CommentNode) && child.silent
@@ -493,9 +491,6 @@ MSG
         validate_and_append_child(parent, child, line, root)
       end
 
-      raise SyntaxError.new("Rules can't end in commas.",
-        :line => continued_rule.line) if continued_rule
-
       parent
     end
 

data/lib/sass/scss/parser.rb

@@ -427,9 +427,14 @@ module Sass
         return unless v = selector
         rules.concat v
 
+        ws = ''
         while tok(/,/)
-          rules << ',' << str {ss}
-          rules.concat expr!(:selector)
+          ws << str {ss}
+          if v = selector
+            rules << ',' << ws
+            rules.concat v
+            ws = ''
+          end
         end
         rules
       end
@@ -442,10 +447,14 @@ module Sass
       def selector_comma_sequence
         return unless sel = _selector
         selectors = [sel]
+        ws = ''
         while tok(/,/)
-          ws = str{ss}
-          selectors << expr!(:_selector)
-          selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members) if ws.include?("\n")
+          ws << str{ss}
+          if sel = _selector
+            selectors << sel
+            selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members) if ws.include?("\n")
+            ws = ''
+          end
         end
         Selector::CommaSequence.new(selectors)
       end
@@ -790,6 +799,7 @@ MESSAGE
         :interp_ident => "identifier",
         :interp_name => "identifier",
         :expr => "expression (e.g. 1px, bold)",
+        :_selector => "selector",
         :selector_comma_sequence => "selector",
         :simple_selector_sequence => "selector",
         :import_arg => "file to import (string or url())",

data/test/sass/engine_test.rb

@@ -56,12 +56,8 @@ MSG
     "$a: #ccc + 2px" => "Cannot add a number with units (2px) to a color (#cccccc).",
     "& a\n  :b c" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  :b\n    c" => "Illegal nesting: Only properties may be nested beneath properties.",
-    "a,\n  :b c" => ["Rules can\'t end in commas.", 1],
-    "a," => "Rules can\'t end in commas.",
-    "a,\n$b: 1" => ["Rules can\'t end in commas.", 1],
     "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
     "@import foo.sass" => "File to import not found or unreadable: foo.sass.",
-    "a,\n$b: 1" => ["Rules can\'t end in commas.", 1],
     "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
     "@import foo.sass" => <<MSG,
 File to import not found or unreadable: foo.sass.
@@ -610,6 +606,12 @@ SASS
                  
     assert_equal("#foo #bar,#baz #boom{foo:bar}\n",
                  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"))
+
+    assert_equal("#bip #bop {\n  foo: bar; }\n",
+                 render("#bip #bop,, ,\n  :foo bar"))
   end
 
   def test_complex_multiline_selector

data/test/sass/scss/scss_test.rb

@@ -468,6 +468,22 @@ baz {
 SCSS
   end
 
+  def test_trailing_comma_in_selector
+    assert_equal <<CSS, render(<<SCSS)
+#foo #bar,
+#baz #boom {
+  a: b; }
+
+#bip #bop {
+  c: d; }
+CSS
+#foo #bar,,
+,#baz #boom, {a: b}
+
+#bip #bop, ,, {c: d}
+SCSS
+  end
+
   def test_parent_selectors
     assert_equal <<CSS, render(<<SCSS)
 foo:hover {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.36
+  version: 3.1.0.alpha.37
 platform: ruby
 authors: 
 - Nathan Weizenbaum