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

properly error when attempting to display map

Browse Source
This commit is contained in:
ConnorSkees 2020-04-18 20:11:49 -04:00
parent 0a5c6b907c
commit 305581ad75
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/value/mod.rs
View File

@ -47,30 +47,23 @@ impl Value {
_ => false,
}
}
pub fn to_css_string(&self, span: Span) -> SassResult<String> {
Ok(match self {
Self::Important => format!("!important"),
Self::Dimension(num, unit) => match unit {
Unit::Mul(..) => {
return Err((
format!("Error: {}{} isn't a valid CSS value.", num, unit),
span,
)
.into());
return Err((format!("{}{} isn't a valid CSS value.", num, unit), span).into());
}
_ => format!("{}{}", num, unit),
},
Self::Map(map) => format!(
"({})",
map.iter()
.map(|(k, v)| Ok(format!(
"{}: {}",
k.to_css_string(span)?,
v.to_css_string(span)?
)))
.collect::<SassResult<Vec<String>>>()?
.join(", ")
),
Self::Map(..) => {
return Err((
format!("{} isn't a valid CSS value.", dbg!(self.inspect(span)?)),
span,
)
.into())
}
Self::Function(func) => format!("get-function(\"{}\")", func.name()),
Self::List(vals, sep, brackets) => match brackets {
Brackets::None => format!(
@ -195,6 +188,17 @@ impl Value {
},
Value::Function(f) => format!("get-function(\"{}\")", f.name()),
Value::Null => "null".to_string(),
Value::Map(map) => format!(
"({})",
map.iter()
.map(|(k, v)| Ok(format!(
"{}: {}",
k.to_css_string(span)?,
v.to_css_string(span)?
)))
.collect::<SassResult<Vec<String>>>()?
.join(", ")
),
v => v.to_css_string(span)?,
})
}

4
tests/map.rs
View File

@ -133,3 +133,7 @@ error!(
duplicate_key_in_declaration,
"a {\n $a: (foo: a, foo: b);;\n}\n", "Error: Duplicate key."
);
error!(
display_map,
"a {\n color: (a: b, c: d);\n}\n", "Error: (a: b, c: d) isn't a valid CSS value."
);