shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve code coverage

Browse Source
This commit is contained in:
Connor Skees 2021-07-21 09:12:50 -04:00
parent 26ec16a802
commit d360af2cd6
16 changed files with 322 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@
- fix bug in `hue(...)` function in which the value would be incorrect in when the `red` channel was the highest and the green channel was lower than the blue channel
- no longer round output from `saturation(...)` function
- improve handling of newlines inside and around `@media`
- arglists can be equal to comma separated lists
# 0.10.5

7
src/args.rs
View File

@ -229,10 +229,13 @@ impl CallArgs {
Ok(v) => v,
Err(e) => return Err((format!("No argument named ${}.", e), self.1).into()),
};
args.sort_by(|(a1, _), (a2, _)| a1.cmp(a2));
for arg in args {
vals.push(arg.1?);
for (_, arg) in args {
vals.push(arg?);
}
Ok(vals)
}
}

10
src/builtin/functions/meta.rs
View File

@ -304,11 +304,15 @@ pub(crate) fn content_exists(args: CallArgs, parser: &mut Parser<'_>) -> SassRes
))
}
#[allow(unused_variables)]
#[allow(unused_variables, clippy::needless_pass_by_value)]
pub(crate) fn keywords(args: CallArgs, parser: &mut Parser<'_>) -> SassResult<Value> {
args.max_args(1)?;
drop(args);
todo!("builtin function `keywords` blocked on better handling of call args")
Err((
"Builtin function `keywords` is not yet implemented",
args.span(),
)
.into())
}
pub(crate) fn declare(f: &mut GlobalFunctionMap) {

6
src/parse/args.rs
View File

@ -357,6 +357,11 @@ impl<'a> Parser<'a> {
args.max_args(0)?;
return Ok(scope);
}
if !fn_args.0.iter().any(|arg| arg.is_variadic) {
args.max_args(fn_args.len())?;
}
self.scopes.enter_new_scope();
for (idx, mut arg) in fn_args.0.into_iter().enumerate() {
if arg.is_variadic {
@ -364,6 +369,7 @@ impl<'a> Parser<'a> {
scope.insert_var(arg.name, arg_list);
break;
}
let val = match args.get(idx, arg.name) {
Some(v) => v,
None => match arg.default.as_mut() {

6
src/parse/mod.rs
View File

@ -591,10 +591,8 @@ impl<'a> Parser<'a> {
self.toks.next();
#[allow(clippy::while_let_on_iterator)]
while let Some(tok) = self.toks.next() {
if tok.kind == '*' {
if self.consume_char_if_exists('/') {
break;
}
if tok.kind == '*' && self.consume_char_if_exists('/') {
break;
}
}
}

28
src/value/mod.rs
View File

@ -103,13 +103,23 @@ impl PartialEq for Value {
false
}
}
Value::ArgList(list1) => {
if let Value::ArgList(list2) = other {
list1 == list2
} else {
false
Value::ArgList(list1) => match other {
Value::ArgList(list2) => list1 == list2,
Value::List(list2, ListSeparator::Comma, ..) => {
if list1.len() != list2.len() {
return false;
}
for (el1, el2) in list1.iter().zip(list2) {
if &el1.node != el2 {
return false;
}
}
true
}
}
_ => false,
},
}
}
}
@ -348,11 +358,11 @@ impl Value {
num.cmp(&num2.clone().convert(unit2, unit))
}
}
v => {
_ => {
return Err((
format!(
"Undefined operation \"{} {} {}\".",
v.inspect(span)?,
self.inspect(span)?,
op,
other.inspect(span)?
),
@ -371,7 +381,7 @@ impl Value {
),
span,
)
.into())
.into());
}
})
}

1
src/value/number/mod.rs
View File

@ -149,6 +149,7 @@ impl Number {
/// Invariants: `from.comparable(&to)` must be true
pub fn convert(self, from: &Unit, to: &Unit) -> Self {
debug_assert!(from.comparable(to));
self * UNIT_CONVERSION_TABLE[to][from].clone()
}
}

18
tests/args.rs
View File

@ -5,6 +5,10 @@ error!(
variable_after_varargs,
"@function foo($a..., $b) {\n @return $a;\n}\n", "Error: expected \")\"."
);
error!(
two_varargs,
"@function foo($a..., $b...) {\n @return $a;\n}\n", "Error: expected \")\"."
);
error!(
varargs_one_period,
"@function foo($a.) {\n @return $a;\n}\n", "Error: expected \".\"."
@ -48,6 +52,20 @@ test!(
"a {\n color: if(false, unit(foo), red);\n}\n",
"a {\n color: red;\n}\n"
);
test!(
silent_comments_in_arg_with_default_val,
"@function foo($a//
://
red//
) {
@return $a;
}
a {
color: foo();
}",
"a {\n color: red;\n}\n"
);
error!(
#[ignore = "expects incorrect char, '{'"]
nothing_after_open,

189
tests/equality.rs
View File

@ -61,3 +61,192 @@ test!(
"a {\n color: (0mm: a)==(0cm: a);\n}\n",
"a {\n color: true;\n}\n"
);
test!(
true_true_eq,
"a {\n color: true == true;\n}\n",
"a {\n color: true;\n}\n"
);
test!(
false_false_eq,
"a {\n color: false == false;\n}\n",
"a {\n color: true;\n}\n"
);
test!(
true_false_eq,
"a {\n color: true == false;\n}\n",
"a {\n color: false;\n}\n"
);
test!(
false_true_eq,
"a {\n color: false == true;\n}\n",
"a {\n color: false;\n}\n"
);
test!(
true_true_ne,
"a {\n color: true != true;\n}\n",
"a {\n color: false;\n}\n"
);
test!(
false_false_ne,
"a {\n color: false != false;\n}\n",
"a {\n color: false;\n}\n"
);
test!(
true_false_ne,
"a {\n color: true != false;\n}\n",
"a {\n color: true;\n}\n"
);
test!(
false_true_ne,
"a {\n color: true != false;\n}\n",
"a {\n color: true;\n}\n"
);
test!(
important_important_eq,
"a {\n color: !important == !important;\n}\n",
"a {\n color: true;\n}\n"
);
test!(
important_important_ne,
"a {\n color: !important != !important;\n}\n",
"a {\n color: false;\n}\n"
);
test!(
map_color_eq,
"a {\n color: (a: b) == red;\n}\n",
"a {\n color: false;\n}\n"
);
test!(
map_color_ne,
"a {\n color: (a: b) != red;\n}\n",
"a {\n color: true;\n}\n"
);
test!(
bracketed_list_color_eq,
"a {\n color: [] == red;\n}\n",
"a {\n color: false;\n}\n"
);
test!(
bracketed_list_color_ne,
"a {\n color: [] != red;\n}\n",
"a {\n color: true;\n}\n"
);
test!(
function_ref_color_eq,
"a {\n color: get-function(\"red\") == red;\n}\n",
"a {\n color: false;\n}\n"
);
test!(
function_ref_color_ne,
"a {\n color: get-function(\"red\") != red;\n}\n",
"a {\n color: true;\n}\n"
);
test!(
nan_nan_eq,
"a {\n color: (0/0) == (0/0);\n}\n",
"a {\n color: false;\n}\n"
);
test!(
nan_nan_ne,
"a {\n color: (0/0) != (0/0);\n}\n",
"a {\n color: true;\n}\n"
);
test!(
string_bool_ne,
"a {\n color: hi != false;\n}\n",
"a {\n color: true;\n}\n"
);
test!(
lists_differ_only_in_separator_eq,
"a {\n color: (1 2 3) == (1, 2, 3);\n}\n",
"a {\n color: false;\n}\n"
);
test!(
lists_differ_only_in_separator_ne,
"a {\n color: (1 2 3) != (1, 2, 3);\n}\n",
"a {\n color: true;\n}\n"
);
test!(
maps_differ_in_length_eq,
"a {\n color: (a: b) == (a: b, c: d);\n}\n",
"a {\n color: false;\n}\n"
);
test!(
maps_differ_in_length_ne,
"a {\n color: (a: b) != (a: b, c: d);\n}\n",
"a {\n color: true;\n}\n"
);
test!(
arglist_unquoted_string_eq,
"@function foo($a...) {
@return $a == bar;
}
a {
color: foo(1, 2, 3);
}",
"a {\n color: false;\n}\n"
);
test!(
arglist_equals_self,
"@function foo($a...) {
@return $a == $a;
}
a {
color: foo(1, 2, 3);
}",
"a {\n color: true;\n}\n"
);
test!(
arglist_equals_self_when_splat_through_other_function,
"@function bar($a, $b...) {
@return $a == $b;
}
@function foo($a...) {
@return bar($a, $a...);
}
a {
color: foo(1, 2, 3);
}",
"a {\n color: true;\n}\n"
);
test!(
arglist_equals_does_not_equal_self_when_not_splat,
"@function bar($a, $b...) {
@return $a == $b;
}
@function foo($a...) {
@return bar($a, $a);
}
a {
color: foo(1, 2, 3);
}",
"a {\n color: false;\n}\n"
);
test!(
arglist_equals_comma_separated_list,
"@function foo($a...) {
@return $a == (1, 2, 3);
}
a {
color: foo(1, 2, 3);
}",
"a {\n color: true;\n}\n"
);
test!(
arglist_does_not_equal_space_separated_list,
"@function foo($a...) {
@return $a == (1 2 3);
}
a {
color: foo(1, 2, 3);
}",
"a {\n color: false;\n}\n"
);

22
tests/functions.rs
View File

@ -316,6 +316,28 @@ error!(
}",
"Error: Functions can only contain variable declarations and control directives."
);
error!(
pass_one_arg_to_fn_that_accepts_zero,
"@function foo() {
@return red;
}
a {
color: foo(1);
}",
"Error: Only 0 arguments allowed, but 1 was passed."
);
error!(
pass_two_args_to_fn_that_accepts_one,
"@function foo($a) {
@return red;
}
a {
color: foo(1, 2);
}",
"Error: Only 1 argument allowed, but 2 were passed."
);
test!(
allows_multiline_comment,
"@function foo($a) {

15
tests/list.rs
View File

@ -372,6 +372,21 @@ test!(
"a {\n color: [ /**/ ];\n}\n",
"a {\n color: [];\n}\n"
);
test!(
space_separated_inside_comma_separated,
"$a: 1 2 3 == 1, 2, 3;
a {
color: $a;
color: nth($a, 1);
color: nth($a, 2);
}",
"a {\n color: 1 2 false, 2, 3;\n color: 1 2 false;\n color: 2;\n}\n"
);
test!(
whitespace_space_list_number,
"a {\n color: 1 2 3 ;\n}\n",
"a {\n color: 1 2 3;\n}\n"
);
error!(
invalid_item_in_space_separated_list,
"a {\n color: red color * #abc;\n}\n", "Error: Undefined operation \"color * #abc\"."

8
tests/meta.rs
View File

@ -302,3 +302,11 @@ error!(
mixin_exists_non_string,
"a {color: mixin-exists(12px)}", "Error: $name: 12px is not a string."
);
test!(
local_mixin_exists,
"a {
@mixin a {}
color: mixin-exists($name: a);
}",
"a {\n color: true;\n}\n"
);

8
tests/ordering.rs
View File

@ -66,3 +66,11 @@ test!(
"a {\n color: 2in > 1cm;\n}\n",
"a {\n color: true;\n}\n"
);
error!(
strings_not_comparable,
"a {\n color: a > b;\n}\n", "Error: Undefined operation \"a > b\"."
);
error!(
number_and_string_not_comparable,
"a {\n color: 1 > b;\n}\n", "Error: Undefined operation \"1 > b\"."
);

11
tests/selectors.rs
View File

@ -818,6 +818,17 @@ test!(
".foo bar[val=\"//\"] {\n color: &;\n}\n",
".foo bar[val=\"//\"] {\n color: .foo bar[val=\"//\"];\n}\n"
);
test!(
attribute_value_escape_ends_before_non_hex_char,
"[a=\"a\\\\66\"] {\n color: &;\n}\n",
"[a=a\\66] {\n color: [a=a\\66];\n}\n"
);
test!(
#[ignore = "we have to rewrite quoted attribute value parsing somewhat"]
attribute_value_escape_ends_with_whitespace,
"[a=\"a\\\\66 \"] {\n color: &;\n}\n",
"[a=\"a\\\\66 \"] {\n color: [a=\"a\\\\66 \"];\n}\n"
);
error!(
a_n_plus_b_n_invalid_odd,
":nth-child(ofdd) {\n color: &;\n}\n", "Error: Expected \"odd\"."

10
tests/str-escape.rs
View File

@ -185,6 +185,16 @@ test!(
"a {\n color: \"foo\\\nbar\";\n}\n",
"a {\n color: \"foobar\";\n}\n"
);
test!(
escaped_value_over_0xf_in_quoted_string,
"a {\n color: \"#{\"\\1f\"}\";\n}\n",
"a {\n color: \"\\1f\";\n}\n"
);
test!(
escaped_value_over_0xf_in_quoted_string_with_trailing_space,
"a {\n color: \"#{\"\\1f\"} \";\n}\n",
"a {\n color: \"\\1f \";\n}\n"
);
error!(
newline_after_escape,
"a {\n color: \\\n", "Error: Expected escape sequence."

5
tests/values.rs
View File

@ -110,11 +110,6 @@ test!(
"a {\n color: \"'foo' \\\"bar\\\"\";\n}\n",
"a {\n color: \"'foo' \\\"bar\\\"\";\n}\n"
);
test!(
whitespace_space_list_number,
"a {\n color: 1 2 3 ;\n}\n",
"a {\n color: 1 2 3;\n}\n"
);
test!(
whitespace_comma_list_number,
"a {\n color: 1 , 2 , 3 ;\n}\n",