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

properly emit separator in join when both are under 2 length

Browse Source
This commit is contained in:
ConnorSkees 2020-04-02 18:19:54 -04:00
parent dbf699a991
commit a9230b7877
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/builtin/list.rs
View File

@ -162,9 +162,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
) { ) {
Value::Ident(s, ..) => match s.as_str() { Value::Ident(s, ..) => match s.as_str() {
"auto" => { "auto" => {
if list1.len() < 2 && list2.len() < 2 { if list1.is_empty() {
ListSeparator::Space
} else if list1.is_empty() {
sep2 sep2
} else { } else {
sep1 sep1

5
tests/list.rs
View File

@ -212,6 +212,11 @@ test!(
"a {\n color: join((), (a, b, c));\n}\n", "a {\n color: join((), (a, b, c));\n}\n",
"a {\n color: a, b, c;\n}\n" "a {\n color: a, b, c;\n}\n"
); );
test!(
join_single_comma_both,
"a {\n color: join((a,), (b,));\n}\n",
"a {\n color: a, b;\n}\n"
);
test!(bracketed_ident, "a {\n color: [a];\n}\n"); test!(bracketed_ident, "a {\n color: [a];\n}\n");
test!(bracketed_space_list, "a {\n color: [a b];\n}\n"); test!(bracketed_space_list, "a {\n color: [a b];\n}\n");
test!(bracketed_comma_list, "a {\n color: [a, b];\n}\n"); test!(bracketed_comma_list, "a {\n color: [a, b];\n}\n");