haml-edge 3.1.8 → 3.1.9
Sign up to get free protection for your applications and to get access to all the features.
- data/EDGE_GEM_VERSION +1 -1
- data/VERSION +1 -1
- data/lib/sass/script/parser.rb +2 -1
- data/test/sass/scss/scss_test.rb +14 -0
- metadata +1 -1
data/EDGE_GEM_VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.1.
|
1
|
+
3.1.9
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.1.
|
1
|
+
3.1.9
|
data/lib/sass/script/parser.rb
CHANGED
@@ -271,7 +271,7 @@ RUBY
|
|
271
271
|
def arglist
|
272
272
|
return unless e = interpolation
|
273
273
|
return [e] unless try_tok(:comma)
|
274
|
-
[e, *arglist]
|
274
|
+
[e, *assert_expr(:arglist)]
|
275
275
|
end
|
276
276
|
|
277
277
|
def raw
|
@@ -333,6 +333,7 @@ RUBY
|
|
333
333
|
EXPR_NAMES = {
|
334
334
|
:string => "string",
|
335
335
|
:default => "expression (e.g. 1px, bold)",
|
336
|
+
:arglist => "mixin argument",
|
336
337
|
}
|
337
338
|
|
338
339
|
def assert_expr(name)
|
data/test/sass/scss/scss_test.rb
CHANGED
@@ -1022,6 +1022,20 @@ $value : bip;
|
|
1022
1022
|
foo {
|
1023
1023
|
bar: -moz-\#{$value};
|
1024
1024
|
}
|
1025
|
+
SCSS
|
1026
|
+
end
|
1027
|
+
|
1028
|
+
def test_extra_comma_in_mixin_arglist_error
|
1029
|
+
assert_raise(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
|
1030
|
+
Invalid CSS after "@include foo(bar, ": expected mixin argument, was ")"
|
1031
|
+
MESSAGE
|
1032
|
+
@mixin foo($a1, $a2) {
|
1033
|
+
baz: $a1 $a2;
|
1034
|
+
}
|
1035
|
+
|
1036
|
+
.bar {
|
1037
|
+
@include foo(bar, );
|
1038
|
+
}
|
1025
1039
|
SCSS
|
1026
1040
|
end
|
1027
1041
|
end
|