sass 3.2.0.alpha.34 → 3.2.0.alpha.35

data/REVISION

@@ -1 +1 @@
-f6addd2e834a5464f5ab01327c0d7a9900138ccb
+ac7e4266b54b32610016a4b8b651c9d4e18b1e62

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.34
+3.2.0.alpha.35

data/lib/sass/scss/parser.rb

@@ -521,7 +521,7 @@ module Sass
           @scanner.pos = pos
           @line = line
           begin
-            expected('"{"')
+            throw_error {expected('"{"')}
           rescue Sass::SyntaxError => e
             e.message << "\n\n\"#{sel}\" may only be used at the beginning of a selector."
             raise e
@@ -788,11 +788,11 @@ MESSAGE
         @strs.pop
       end
 
-      def str?
+      def str?(&block)
         pos = @scanner.pos
         line = @line
         @strs.push ""
-        yield && @strs.last
+        throw_error(&block) && @strs.last
       rescue Sass::SyntaxError => e
         @scanner.pos = pos
         @line = line
@@ -875,6 +875,13 @@ MESSAGE
         raise Sass::SyntaxError.new(msg, :line => @line)
       end
 
+      def throw_error
+        old_throw_error, @throw_error = @throw_error, false
+        yield
+      ensure
+        @throw_error = old_throw_error
+      end
+
       def catch_error(&block)
         old_throw_error, @throw_error = @throw_error, true
         pos = @scanner.pos

data/test/sass/scss/scss_test.rb

@@ -1094,6 +1094,15 @@ SCSS
 
   # Regression
 
+  def test_star_plus_and_parent
+    assert_equal <<CSS, render(<<SCSS)
+* + html foo {
+  a: b; }
+CSS
+foo {*+html & {a: b}}
+SCSS
+  end
+
   def test_weird_added_space
     assert_equal <<CSS, render(<<SCSS)
 foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.2.0.alpha.34
+  version: 3.2.0.alpha.35
 platform: ruby
 authors: 
 - Nathan Weizenbaum