Move highlighters into Scopes

That means we can now have highlighters active at global, buffer, and
window scope. The add-highlighter and remove-highlighter syntax changed
to take the parent path (scope/group/...) as a mandatory argument,
superseeding the previous -group switch.

1 files changed, 17 insertions, 1 deletions

diff --git a/src/highlighter_group.hh b/src/highlighter_group.hh
index 12fc07d3..95a88a6b 100644
--- a/src/highlighter_group.hh
+++ b/src/highlighter_group.hh
@@ -5,6 +5,7 @@
 #include "hash_map.hh"
 #include "highlighter.hh"
 #include "utils.hh"
+#include "safe_ptr.hh"
 
 namespace Kakoune
 {
@@ -27,7 +28,7 @@ public:
 
     Completions complete_child(StringView path, ByteCount cursor_pos, bool group) const override;
 
-private:
+protected:
     void do_highlight(const Context& context, HighlightPass pass, DisplayBuffer& display_buffer, BufferRange range) override;
     void do_compute_display_setup(const Context& context, HighlightPass pass, DisplaySetup& setup) override;
 
@@ -35,6 +36,21 @@ private:
     HighlighterMap m_highlighters;
 };
 
+class Highlighters : public HighlighterGroup, public SafeCountable
+{
+public:
+    Highlighters(Highlighters& parent) : HighlighterGroup{HighlightPass::All}, SafeCountable{}, m_parent(&parent) {}
+
+private:
+    void do_highlight(const Context& context, HighlightPass pass, DisplayBuffer& display_buffer, BufferRange range) override;
+    void do_compute_display_setup(const Context& context, HighlightPass pass, DisplaySetup& setup) override;
+
+    friend class Scope;
+    Highlighters() : HighlighterGroup{HighlightPass::All} {}
+
+    SafePtr<Highlighters> m_parent;
+};
+
 struct DefinedHighlighters : public HighlighterGroup,
                              public Singleton<DefinedHighlighters>
 {