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, 1 insertions, 7 deletions

diff --git a/src/window.cc b/src/window.cc
index 09652a9b..e1bd3ee5 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -22,8 +22,7 @@ void setup_builtin_highlighters(HighlighterGroup& group);
 Window::Window(Buffer& buffer)
     : Scope(buffer),
       m_buffer(&buffer),
-      m_highlighters{HighlightPass::All},
-      m_builtin_highlighters{HighlightPass::All}
+      m_builtin_highlighters{highlighters()}
 {
     run_hook_in_own_context("WinCreate", buffer.name());
 
@@ -144,10 +143,7 @@ const DisplayBuffer& Window::update_display_buffer(const Context& context)
     m_display_buffer.compute_range();
     BufferRange range{{0,0}, buffer().end_coord()};
     for (auto pass : { HighlightPass::Wrap, HighlightPass::Move, HighlightPass::Colorize })
-    {
-        m_highlighters.highlight(context, pass, m_display_buffer, range);
         m_builtin_highlighters.highlight(context, pass, m_display_buffer, range);
-    }
 
     m_display_buffer.optimize();
 
@@ -204,8 +200,6 @@ DisplaySetup Window::compute_display_setup(const Context& context)
         false
     };
     for (auto pass : { HighlightPass::Move, HighlightPass::Wrap })
-        m_highlighters.compute_display_setup(context, pass, setup);
-    for (auto pass : { HighlightPass::Move, HighlightPass::Wrap })
         m_builtin_highlighters.compute_display_setup(context, pass, setup);
 
     // now ensure the cursor column is visible