sass 3.1.9 → 3.1.10

data/VERSION

@@ -1 +1 @@
-3.1.9
+3.1.10

data/lib/sass/scss/parser.rb

@@ -516,7 +516,7 @@ module Sass
 
           if sel =~ /^&/
             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
@@ -790,11 +790,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
@@ -877,6 +877,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

@@ -1095,6 +1095,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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 3
   - 1
-  - 9
-  version: 3.1.9
+  - 10
+  version: 3.1.10
 platform: ruby
 authors: 
 - Nathan Weizenbaum