haml-edge 2.3.202 → 2.3.203

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.202
+2.3.203

data/VERSION

@@ -1 +1 @@
-2.3.202
+2.3.203

data/lib/sass/script/parser.rb

@@ -97,12 +97,7 @@ module Sass
       # @return [Array<Script::Node>] The root nodes of the arguments.
       # @raise [Sass::SyntaxError] if the argument list isn't valid SassScript
       def parse_mixin_definition_arglist
-        args = []
-
-        if try_tok(:lparen)
-          args = defn_arglist(false) || args
-          assert_tok(:rparen)
-        end
+        args = defn_arglist!(false)
         assert_done
 
         args.each do |k, v|
@@ -239,26 +234,33 @@ RUBY
         end
       end
 
-      def defn_arglist(must_have_default)
-        line = @lexer.line
-        offset = @lexer.offset + 1
-        return unless c = try_tok(:const)
-        var = Script::Variable.new(c.value)
-        if tok = (try_tok(:colon) || try_tok(:single_eq))
-          val = assert_expr(:concat)
-
-          if tok.type == :single_eq
-            val.context = :equals
-            val.options = @options
-            Script.equals_warning("mixin argument defaults", "$#{c.value}",
-              val.to_sass, false, line, offset, @options[:filename])
+      def defn_arglist!(must_have_default)
+        return [] unless try_tok(:lparen)
+        return [] if try_tok(:rparen)
+        res = []
+        loop do
+          line = @lexer.line
+          offset = @lexer.offset + 1
+          c = assert_tok(:const)
+          var = Script::Variable.new(c.value)
+          if tok = (try_tok(:colon) || try_tok(:single_eq))
+            val = assert_expr(:concat)
+
+            if tok.type == :single_eq
+              val.context = :equals
+              val.options = @options
+              Script.equals_warning("mixin argument defaults", "$#{c.value}",
+                val.to_sass, false, line, offset, @options[:filename])
+            end
+            must_have_default = true
+          elsif must_have_default
+            raise SyntaxError.new("Required argument #{var.inspect} must come before any optional arguments.")
           end
-        elsif must_have_default
-          raise SyntaxError.new("Required argument #{var.inspect} must come before any optional arguments.")
+          res << [var, val]
+          break unless try_tok(:comma)
         end
-
-        return [[var, val]] unless try_tok(:comma)
-        [[var, val], *defn_arglist(val)]
+        assert_tok(:rparen)
+        res
       end
 
       def fn_arglist

data/test/sass/engine_test.rb

@@ -81,10 +81,10 @@ MSG
     "a\n  b: c\na\n    d: e" => ["The line was indented 2 levels deeper than the previous line.", 4],
     "a\n  b: c\n  a\n        d: e" => ["The line was indented 3 levels deeper than the previous line.", 4],
     "a\n \tb: c" => ["Indentation can't use both tabs and spaces.", 2],
-    "=a(" => 'Invalid CSS after "(": expected ")", was ""',
-    "=a(b)" => 'Invalid CSS after "(": expected ")", was "b)"',
-    "=a(,)" => 'Invalid CSS after "(": expected ")", was ",)"',
-    "=a(!)" => 'Invalid CSS after "(": expected ")", was "!)"',
+    "=a(" => 'Invalid CSS after "(": expected variable (e.g. $foo), was ""',
+    "=a(b)" => 'Invalid CSS after "(": expected variable (e.g. $foo), was "b)"',
+    "=a(,)" => 'Invalid CSS after "(": expected variable (e.g. $foo), was ",)"',
+    "=a($)" => 'Invalid CSS after "(": expected variable (e.g. $foo), was "$)"',
     "=a($foo bar)" => 'Invalid CSS after "($foo ": expected ")", was "bar)"',
     "=foo\n  bar: baz\n+foo" => ["Properties aren't allowed at the root of a document.", 2],
     "a-\#{$b\n  c: d" => ['Invalid CSS after "a-#{$b": expected "}", was ""', 1],
@@ -940,7 +940,7 @@ SASS
   def test_equals_warning_for_mixin_args
     assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
 DEPRECATION WARNING:
-On line 1, character 6 of 'test_equals_warning_for_mixin_args_inline.sass'
+On line 1, character 10 of 'test_equals_warning_for_mixin_args_inline.sass'
 Setting mixin argument defaults with = has been deprecated and will be removed in version 3.2.
 Use "$arg: 1px" instead.
 
@@ -1901,6 +1901,15 @@ a
 SASS
   end
 
+  def test_mixin_no_arg_error
+    assert_raise(Sass::SyntaxError, 'Invalid CSS after "($bar,": expected variable name, was ")"') do
+      render(<<SASS)
+=foo($bar,)
+  bip: bap
+SASS
+    end
+  end
+
   # Encodings
 
   unless Haml::Util.ruby1_8?

metadata

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