From 715f6fb94a21c684cdc91ea4a25eca6189d30e37 Mon Sep 17 00:00:00 2001 From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com> Date: Mon, 20 Apr 2020 02:55:55 -0400 Subject: [PATCH] inspect single value lists --- src/value/mod.rs | 10 ++++++++++ tests/meta.rs | 15 +++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/value/mod.rs b/src/value/mod.rs index c934f79..36f6b89 100644 --- a/src/value/mod.rs +++ b/src/value/mod.rs @@ -263,6 +263,16 @@ impl Value { Brackets::None => "()".to_string(), Brackets::Bracketed => "[]".to_string(), }, + Value::List(v, sep, brackets) if v.len() == 1 => match brackets { + Brackets::None => match sep { + ListSeparator::Space => format!("{}", v[0].inspect(span)?), + ListSeparator::Comma => format!("({},)", v[0].inspect(span)?), + }, + Brackets::Bracketed => match sep { + ListSeparator::Space => format!("[{}]", v[0].inspect(span)?), + ListSeparator::Comma => format!("[{},]", v[0].inspect(span)?), + }, + }, Value::Function(f) => format!("get-function(\"{}\")", f.name()), Value::Null => "null".to_string(), Value::Map(map) => format!( diff --git a/tests/meta.rs b/tests/meta.rs index 72353b5..3f21c20 100644 --- a/tests/meta.rs +++ b/tests/meta.rs @@ -244,6 +244,21 @@ test!( "a {\n color: inspect([]);\n}\n", "a {\n color: [];\n}\n" ); +test!( + inspect_comma_separated_one_val, + "a {\n color: inspect((1, ));\n}\n", + "a {\n color: (1,);\n}\n" +); +test!( + inspect_comma_separated_one_val_bracketed, + "a {\n color: inspect([1, ]);\n}\n", + "a {\n color: [1,];\n}\n" +); +test!( + inspect_space_separated_one_val_bracketed, + "a {\n color: inspect(append((), 1, space));\n}\n", + "a {\n color: 1;\n}\n" +); test!( variable_does_exist, "$a: red; a {\n color: variable-exists(a)\n}\n",