maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

allow a single item as a list with length 1

Browse source
This commit is contained in:
Mike Griese 2021-10-14 15:12:53 -05:00
parent 4c4fde9da3
commit cc9487e2b8
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cascadia/TerminalSettingsModel/JsonUtils.h
View file

@ -307,9 +307,16 @@ namespace Microsoft::Terminal::Settings::Model::JsonUtils
val.reserve(json.size());
ConversionTrait<T> trait;
for (const auto& element : json)
if (json.isArray())
{
val.push_back(trait.FromJson(element));
for (const auto& element : json)
{
val.push_back(trait.FromJson(element));
}
}
else
{
val.push_back(trait.FromJson(json));
}
return val;
@ -318,7 +325,9 @@ namespace Microsoft::Terminal::Settings::Model::JsonUtils
bool CanConvert(const Json::Value& json) const
{
ConversionTrait<T> trait;
return json.isArray() && std::all_of(json.begin(), json.end(), [trait](const auto& json) mutable -> bool { return trait.CanConvert(json); });
// If there's only one element provided, then see if we can convert
// that single element into a length-1 array
return (json.isArray() && std::all_of(json.begin(), json.end(), [trait](const auto& json) mutable -> bool { return trait.CanConvert(json); })) || trait.CanConvert(json);
}
Json::Value ToJson(const std::vector<T>& val)