Use -group rather than -id in hooks to mirror highlighters closer

3 files changed, 13 insertions, 11 deletions

diff --git a/src/commands.cc b/src/commands.cc
index 77b3fed6..327c9986 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -496,7 +496,7 @@ const CommandDesc add_hook_cmd = {
     "            (and any window for that buffer)\n"
     "  * window: hook is executed only for the current window\n",
     ParameterDesc{
-        SwitchMap{ { "id", { true, "set hook id, see rmhooks" } } },
+        SwitchMap{ { "group", { true, "set hook group, see rmhooks" } } },
         ParameterDesc::Flags::None, 4, 4
     },
     CommandFlags::None,
@@ -523,15 +523,17 @@ const CommandDesc add_hook_cmd = {
                 CommandManager::instance().execute(command, context, {},
                                                    { { "hook_param", param } });
         };
-        String id = parser.has_option("id") ? parser.option_value("id") : "";
-        get_hook_manager(parser[0], context).add_hook(parser[1], id, hook_func);
+        StringView group;
+        if (parser.has_option("group"))
+            group = parser.option_value("group");
+        get_hook_manager(parser[0], context).add_hook(parser[1], group, hook_func);
     }
 };
 
 const CommandDesc rm_hook_cmd = {
     "rmhooks",
     nullptr,
-    "rmhooks <id>: remove all hooks whose id is <id>",
+    "rmhooks <group>: remove all hooks whose group is <group>",
     ParameterDesc{ SwitchMap{}, ParameterDesc::Flags::None, 2, 2 },
     CommandFlags::None,
     CommandCompleter{},
diff --git a/src/hook_manager.cc b/src/hook_manager.cc
index 47b52e00..9287e9ab 100644
--- a/src/hook_manager.cc
+++ b/src/hook_manager.cc
@@ -5,18 +5,18 @@
 namespace Kakoune
 {
 
-void HookManager::add_hook(const String& hook_name, String id, HookFunc hook)
+void HookManager::add_hook(const String& hook_name, String group, HookFunc hook)
 {
     auto& hooks = m_hook[hook_name];
-    hooks.append({std::move(id), std::move(hook)});
+    hooks.append({std::move(group), std::move(hook)});
 }
 
-void HookManager::remove_hooks(const String& id)
+void HookManager::remove_hooks(StringView group)
 {
-    if (id.empty())
+    if (group.empty())
         throw runtime_error("invalid id");
     for (auto& hooks : m_hook)
-        hooks.second.remove_all(id);
+        hooks.second.remove_all(group);
 }
 
 void HookManager::run_hook(const String& hook_name,
diff --git a/src/hook_manager.hh b/src/hook_manager.hh
index 794f8077..d0def2de 100644
--- a/src/hook_manager.hh
+++ b/src/hook_manager.hh
@@ -17,8 +17,8 @@ class HookManager
 public:
     HookManager(HookManager& parent) : m_parent(&parent) {}
 
-    void add_hook(const String& hook_name, String id, HookFunc hook);
-    void remove_hooks(const String& id);
+    void add_hook(const String& hook_name, String group, HookFunc hook);
+    void remove_hooks(StringView group);
     void run_hook(const String& hook_name, const String& param,
                   Context& context) const;