haml-edge 2.3.212 → 2.3.213

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.212
+2.3.213

data/VERSION

@@ -1 +1 @@
-2.3.212
+2.3.213

data/lib/sass/engine.rb

@@ -408,11 +408,15 @@ WARNING
         return Tree::RuleNode.new(parse_interp(line.text))
       end
       res.unshift(hack_char) if hack_char
+      if comment = scanner.scan(Sass::SCSS::RX::COMMENT)
+        res << comment
+      end
 
       name = line.text[0...scanner.pos]
       if scanner.scan(/\s*([:=])(?:\s|$)/)
         parse_property(name, res, scanner[1], scanner.rest, :new, line)
       else
+        res.pop if comment
         Tree::RuleNode.new(res + parse_interp(scanner.rest))
       end
     end

data/lib/sass/scss/parser.rb

@@ -538,6 +538,9 @@ module Sass
           return unless name = interp_ident
           name = [name] if name.is_a?(String)
         end
+        if comment = tok(COMMENT)
+          name << comment
+        end
         ss
 
         tok!(/:/)

data/lib/sass/scss/static_parser.rb

@@ -15,7 +15,7 @@ module Sass
       #   Used for error reporting
       # @return [Selector::CommaSequence] The parsed selector
       # @raise [Sass::SyntaxError] if there's a syntax error in the selector
-      def parse_selector(line, filename)
+      def parse_selector(filename)
         init_scanner!
         selectors = [expr!(:_selector)]
         while tok(/,/)
@@ -25,7 +25,7 @@ module Sass
         end
         expected("selector") unless @scanner.eos?
         seq = Selector::CommaSequence.new(selectors)
-        seq.line = line
+        seq.line = @line
         seq.filename = filename
         seq
       end

data/lib/sass/tree/extend_node.rb

@@ -52,8 +52,8 @@ module Sass::Tree
     # @param environment [Sass::Environment] The lexical environment containing
     #   variable and mixin values
     def perform!(environment)
-      @resolved_selector = Sass::SCSS::CssParser.new(run_interp(@selector, environment)).
-        parse_selector(self.line, self.filename)
+      @resolved_selector = Sass::SCSS::CssParser.new(run_interp(@selector, environment), self.line).
+        parse_selector(self.filename)
       super
     end
   end

data/lib/sass/tree/rule_node.rb

@@ -191,8 +191,8 @@ module Sass::Tree
     # @param environment [Sass::Environment] The lexical environment containing
     #   variable and mixin values
     def perform!(environment)
-      @parsed_rules = Sass::SCSS::StaticParser.new(run_interp(@rule, environment)).
-        parse_selector(self.line, self.filename)
+      @parsed_rules = Sass::SCSS::StaticParser.new(run_interp(@rule, environment), self.line).
+        parse_selector(self.filename)
       super
     end
 

data/test/sass/conversion_test.rb

@@ -872,6 +872,8 @@ foo
   *name: val
   #name: val
   .name: val
+  name/**/: val
+  name/*\\**/: val
   name: val
 SASS
 foo {
@@ -879,6 +881,8 @@ foo {
   *name: val;
   #name: val;
   .name: val;
+  name/**/: val;
+  name/*\\**/: val;
   name: val; }
 SCSS
   end

data/test/sass/engine_test.rb

@@ -32,6 +32,8 @@ MSG
     "a\n  :b:c d" => 'Invalid property: ":b:c d".',
     "a\n  :b c;" => 'Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"',
     "a\n  b: c;" => 'Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"',
+    ".foo ^bar\n  a: b" => ['Invalid CSS after ".foo ": expected selector, was "^bar"', 1],
+    "a\n  @extend .foo ^bar" => 'Invalid CSS after ".foo ": expected selector, was "^bar"',
     "a: b" => 'Properties aren\'t allowed at the root of a document.',
     ":a b" => 'Properties aren\'t allowed at the root of a document.',
     "!" => 'Invalid variable: "!".',
@@ -599,6 +601,8 @@ foo {
   *name: val;
   #name: val;
   .name: val;
+  name/**/: val;
+  name/*\\**/: val;
   name: val; }
 CSS
 foo
@@ -606,6 +610,8 @@ foo
   *name: val
   #name: val
   .name: val
+  name/**/: val
+  name/*\\**/: val
   name: val
 SASS
   end

data/test/sass/scss/css_test.rb

@@ -349,6 +349,8 @@ foo {
   :name: val;
   .name: val;
   #name: val;
+  name/**/: val;
+  name/*\\**/: val;
   name: val; }
 SCSS
   end

data/test/sass/scss/scss_test.rb

@@ -942,9 +942,11 @@ SCSS
   end
 
   def test_post_resolution_selector_error
-    assert_raise(Sass::SyntaxError, 'Invalid CSS after "foo ": expected selector, was ") bar"') do
-      render 'foo #{") bar"} {a: b}'
-    end
+    render "\n\nfoo \#{\") bar\"} {a: b}"
+    assert(false, "Expected syntax error")
+  rescue Sass::SyntaxError => e
+    assert_equal 'Invalid CSS after "foo ": expected selector, was ") bar"', e.message
+    assert_equal 3, e.sass_line
   end
 
   def test_parent_in_mid_selector_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.212
+  version: 2.3.213
 platform: ruby
 authors: 
 - Nathan Weizenbaum