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

Auto-generate highlighter name if only path is given

Browse Source
This commit is contained in:
Maxime Coste 2018-06-28 20:48:44 +10:00
parent b0ccf97b44
commit 64d0fd91ae
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/commands.cc
View File

@ -749,21 +749,27 @@ const CommandDesc add_highlighter_cmd = {
auto begin = parser.begin(); auto begin = parser.begin();
StringView path = *begin++; StringView path = *begin++;
StringView name = *begin++; StringView type = *begin++;
Vector<String> highlighter_params; Vector<String> highlighter_params;
for (; begin != parser.end(); ++begin) for (; begin != parser.end(); ++begin)
highlighter_params.push_back(*begin); highlighter_params.push_back(*begin);
auto it = registry.find(name); auto it = registry.find(type);
if (it == registry.end()) if (it == registry.end())
throw runtime_error(format("no such highlighter factory: '{}'", name)); throw runtime_error(format("no such highlighter type: '{}'", type));
auto slash = find(path | reverse(), '/'); auto slash = find(path | reverse(), '/');
if (slash == path.rend()) if (slash == path.rend())
throw runtime_error("expected name in path"); throw runtime_error("no parent in path");
get_highlighter(context, {path.begin(), slash.base() - 1}).add_child( auto auto_name = [](ConstArrayView<String> params) {
{slash.base(), path.end()}, it->value.factory(highlighter_params)); return join(params | transform([](StringView s) { return replace(s, "/", "_"); }), "_");
};
const StringView parent{path.begin(), slash.base() - 1};
String name{slash.base(), path.end()};
get_highlighter(context, parent).add_child(name.empty() ? auto_name(parser.positionals_from(1)) : std::move(name),
it->value.factory(highlighter_params));
// TODO: better, this will fail if we touch scopes highlighters that impact multiple windows // TODO: better, this will fail if we touch scopes highlighters that impact multiple windows
if (context.has_window()) if (context.has_window())