From 55a5ec3bbdf7c605265859b5fde8ea1d4c02f15d Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 2 Jul 2018 21:09:31 +1000 Subject: [PATCH] Tweak how highlighter names are auto-generated --- src/commands.cc | 2 +- src/highlighter_group.cc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/commands.cc b/src/commands.cc index b2839f10..edf60c44 100644 --- a/src/commands.cc +++ b/src/commands.cc @@ -763,7 +763,7 @@ const CommandDesc add_highlighter_cmd = { throw runtime_error("no parent in path"); auto auto_name = [](ConstArrayView params) { - return join(params | transform([](StringView s) { return replace(s, "/", "_"); }), "_"); + return join(params | transform([](StringView s) { return replace(s, "/", ""); }), ""); }; String name{slash.base(), path.end()}; diff --git a/src/highlighter_group.cc b/src/highlighter_group.cc index a686fc4d..e98ab4aa 100644 --- a/src/highlighter_group.cc +++ b/src/highlighter_group.cc @@ -29,8 +29,6 @@ void HighlighterGroup::add_child(String name, std::unique_ptr&& hl) if ((hl->passes() & passes()) != hl->passes()) throw runtime_error{"cannot add that highlighter to this group, passes don't match"}; - name = replace(name, "/", ""); - if (m_highlighters.contains(name)) throw runtime_error(format("duplicate id: '{}'", name));