xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lenormf/fix-face-format-check'

Browse Source
This commit is contained in:
Maxime Coste 2015-12-12 16:53:18 +00:00
commit 37210218fd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/face_registry.cc
View File

@ -9,10 +9,15 @@ namespace Kakoune
static Face parse_face(StringView facedesc) static Face parse_face(StringView facedesc)
{ {
constexpr StringView invalid_face_error = "invalid face description, expected <fg>[,<bg>][+<attr>]";
auto bg_it = find(facedesc, ','); auto bg_it = find(facedesc, ',');
auto attr_it = find(facedesc, '+'); auto attr_it = find(facedesc, '+');
if (bg_it != facedesc.end() and attr_it < bg_it) if (bg_it != facedesc.end()
throw runtime_error("invalid face description, expected <fg>[,<bg>][+<attr>]"); and (attr_it < bg_it or (bg_it + 1) == facedesc.end()))
throw runtime_error(invalid_face_error.str());
if (attr_it != facedesc.end()
and (attr_it + 1) == facedesc.end())
throw runtime_error(invalid_face_error.str());
Face res; Face res;
res.fg = attr_it != facedesc.begin() ? res.fg = attr_it != facedesc.begin() ?
str_to_color({facedesc.begin(), std::min(attr_it, bg_it)}) : Color::Default; str_to_color({facedesc.begin(), std::min(attr_it, bg_it)}) : Color::Default;