fix: use proper namespace when clearing

code-biscuits · Jul 18, 2021 · 75ee66a · 75ee66a
1 parent c05824e
commit 75ee66a
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/lua/nvim-biscuits/init.lua b/lua/nvim-biscuits/init.lua
@@ -14,16 +14,12 @@ local nvim_biscuits = {}
 
 local should_render_biscuits = true
 
-local make_biscuit_hl_group = function(lang) return 'BiscuitColor' .. lang end
+local make_biscuit_hl_group_name =
+    function(lang) return 'BiscuitColor' .. lang end
 
 nvim_biscuits.decorate_nodes = function(bufnr, lang)
     if config.get_language_config(final_config, lang, "disabled") then return end
 
-    if not should_render_biscuits then
-        vim.api.nvim_buf_clear_namespace(bufnr, 0, 0, -1)
-        return
-    end
-
     utils.console_log("decorating nodes")
 
     local parser = ts_parsers.get_parser(bufnr, lang)
@@ -33,7 +29,15 @@ nvim_biscuits.decorate_nodes = function(bufnr, lang)
         return
     end
 
-    local biscuit_highlight_group = make_biscuit_hl_group(lang)
+    local biscuit_highlight_group_name = make_biscuit_hl_group_name(lang)
+    local biscuit_highlight_group = vim.api.nvim_create_namespace(
+                                        biscuit_highlight_group_name)
+
+    if not should_render_biscuits then
+        vim.api.nvim_buf_clear_namespace(bufnr, biscuit_highlight_group, 0, -1)
+        return
+    end
+
     local root = parser:parse()[1]:root()
 
     local nodes = ts_utils.get_named_children(root)
@@ -108,10 +112,13 @@ nvim_biscuits.decorate_nodes = function(bufnr, lang)
                 if utils.trim(text) ~= '' then
                     text = prefix_string .. text
 
-                    vim.api.nvim_buf_clear_namespace(bufnr, 0, end_line,
-                                                     end_line + 1)
-                    vim.api.nvim_buf_set_virtual_text(bufnr, 0, end_line, {
-                        {text, biscuit_highlight_group}
+                    vim.api.nvim_buf_clear_namespace(bufnr,
+                                                     biscuit_highlight_group,
+                                                     end_line, end_line + 1)
+                    vim.api.nvim_buf_set_virtual_text(bufnr,
+                                                      biscuit_highlight_group,
+                                                      end_line, {
+                        {text, biscuit_highlight_group_name}
                     }, {})
                 end
             else
@@ -157,7 +164,7 @@ nvim_biscuits.BufferAttach = function(bufnr)
 
     local on_lines = function() nvim_biscuits.decorate_nodes(bufnr, lang) end
 
-    vim.cmd("highlight default link " .. make_biscuit_hl_group(lang) ..
+    vim.cmd("highlight default link " .. make_biscuit_hl_group_name(lang) ..
                 " BiscuitColor")
 
     -- we need to fire once at the very start