haml-edge 3.1.12 → 3.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/EDGE_GEM_VERSION +1 -1
- data/VERSION +1 -1
- data/lib/sass/script/parser.rb +2 -1
- data/test/sass/script_test.rb +5 -0
- metadata +1 -1
data/EDGE_GEM_VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
3.1.
|
|
1
|
+
3.1.13
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
3.1.
|
|
1
|
+
3.1.13
|
data/lib/sass/script/parser.rb
CHANGED
|
@@ -265,7 +265,7 @@ RUBY
|
|
|
265
265
|
def fn_arglist
|
|
266
266
|
return unless e = equals
|
|
267
267
|
return [e] unless try_tok(:comma)
|
|
268
|
-
[e, *fn_arglist]
|
|
268
|
+
[e, *assert_expr(:fn_arglist)]
|
|
269
269
|
end
|
|
270
270
|
|
|
271
271
|
def arglist
|
|
@@ -334,6 +334,7 @@ RUBY
|
|
|
334
334
|
:string => "string",
|
|
335
335
|
:default => "expression (e.g. 1px, bold)",
|
|
336
336
|
:arglist => "mixin argument",
|
|
337
|
+
:fn_arglist => "function argument",
|
|
337
338
|
}
|
|
338
339
|
|
|
339
340
|
def assert_expr(name)
|
data/test/sass/script_test.rb
CHANGED
|
@@ -329,6 +329,11 @@ SASS
|
|
|
329
329
|
assert_equal "#2", resolve('"##{1 + 1}"')
|
|
330
330
|
end
|
|
331
331
|
|
|
332
|
+
def test_misplaced_comma_in_funcall
|
|
333
|
+
assert_raise(Sass::SyntaxError,
|
|
334
|
+
'Invalid CSS after "foo(bar, ": expected function argument, was ")"') {eval('foo(bar, )')}
|
|
335
|
+
end
|
|
336
|
+
|
|
332
337
|
private
|
|
333
338
|
|
|
334
339
|
def resolve(str, opts = {}, environment = env)
|