🐛 fix: highlighting not working properly

Author: LazyYuuki

lua/notice-me/init.lua

@@ -15,7 +15,7 @@ function M.setup(opts)
   -- Merge user config with defaults
   opts = opts or {}
   M.config = vim.tbl_deep_extend("force", M.config, opts)
-  
+
   -- Initialize your plugin here
   M.setup_highlights()
   M.setup_autocmds()
@@ -28,7 +28,7 @@ end
 function M.setup_highlights()
   local ns_id = vim.api.nvim_create_namespace("notice_me")
   M.namespace = ns_id
-  
+
   -- Create highlight groups
   for keyword, color in pairs(M.config.keywords) do
     vim.api.nvim_set_hl(0, "NoticeMe" .. keyword, color)
@@ -37,17 +37,38 @@ end
 
 -- Set up autocommands to apply highlighting
 function M.setup_autocmds()
-  vim.api.nvim_create_autocmd({"BufEnter", "BufWritePost"}, {
+  -- Apply on buffer events
+  vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "TextChanged", "TextChangedI" }, {
     callback = function(args)
       if not M.config.enable then return end
-      M.highlight_keywords(args.buf)
+      vim.schedule(function()
+        M.highlight_keywords(args.buf)
+      end)
     end,
-    desc = "Notice-me highlight keywords on buffer enter/write",
+    desc = "Notice-me highlight keywords on buffer events",
   })
-  
+
+  -- Apply on colorscheme change to ensure highlights are preserved
+  vim.api.nvim_create_autocmd("ColorScheme", {
+    callback = function()
+      M.setup_highlights()
+      -- Re-highlight all buffers
+      for _, buf in ipairs(vim.api.nvim_list_bufs()) do
+        if vim.api.nvim_buf_is_valid(buf) and vim.bo[buf].modifiable then
+          vim.schedule(function()
+            if M.config.enable then
+              M.highlight_keywords(buf)
+            end
+          end)
+        end
+      end
+    end,
+    desc = "Notice-me re-apply highlights after colorscheme change",
+  })
+
   -- Also highlight current buffer immediately
   vim.schedule(function()
-    if vim.api.nvim_get_current_buf() then
+    if M.config.enable and vim.api.nvim_get_current_buf() then
       M.highlight_keywords(vim.api.nvim_get_current_buf())
     end
   end)
@@ -56,31 +77,37 @@ end
 -- Highlight keywords in a buffer
 function M.highlight_keywords(bufnr)
   if not bufnr or not vim.api.nvim_buf_is_valid(bufnr) then return end
-  
+
+  -- Skip if the buffer is not modifiable or in a special mode
+  if vim.bo[bufnr].buftype ~= "" then return end
+
   -- Clear previous highlights
   vim.api.nvim_buf_clear_namespace(bufnr, M.namespace, 0, -1)
-  
+
   -- Get buffer content
   local lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
-  
+
   -- Highlight keywords
   for i, line in ipairs(lines) do
     for keyword, _ in pairs(M.config.keywords) do
+      -- Find exact keywords, not partial matches
       local start_idx = 1
       while true do
-        local match_start, match_end = line:find(keyword, start_idx)
+        -- Find using pattern to ensure we match whole words
+        local pattern = "%f[%w_]" .. keyword .. "%f[^%w_]"
+        local match_start, match_end = line:find(pattern, start_idx)
         if not match_start then break end
-        
+
         -- Apply highlight
-        vim.api.nvim_buf_add_highlight(
+        pcall(vim.api.nvim_buf_add_highlight,
           bufnr,
           M.namespace,
           "NoticeMe" .. keyword,
           i - 1,
           match_start - 1,
           match_end
         )
-        
+
         start_idx = match_end + 1
       end
     end
@@ -93,4 +120,4 @@ function M.example_function()
   print("Keywords being highlighted:", vim.inspect(vim.tbl_keys(M.config.keywords)))
 end
 
-return M
+return M

plugin/notice-me.lua

@@ -14,15 +14,39 @@ end, { desc = "Example notice-me command" })
 vim.api.nvim_create_user_command("NoticeMeToggle", function()
   local notice_me = require("notice-me")
   notice_me.config.enable = not notice_me.config.enable
-  
+
   if notice_me.config.enable then
-    -- Reapply highlights on current buffer
-    notice_me.highlight_keywords(vim.api.nvim_get_current_buf())
+    -- Reapply highlights on all buffers
+    for _, buf in ipairs(vim.api.nvim_list_bufs()) do
+      if vim.api.nvim_buf_is_valid(buf) and vim.bo[buf].modifiable then
+        vim.schedule(function()
+          notice_me.highlight_keywords(buf)
+        end)
+      end
+    end
     vim.notify("Keyword highlighting enabled")
   else
-    -- Clear highlights on current buffer
-    local bufnr = vim.api.nvim_get_current_buf()
-    vim.api.nvim_buf_clear_namespace(bufnr, notice_me.namespace, 0, -1)
+    -- Clear highlights on all buffers
+    for _, buf in ipairs(vim.api.nvim_list_bufs()) do
+      if vim.api.nvim_buf_is_valid(buf) then
+        vim.api.nvim_buf_clear_namespace(buf, notice_me.namespace, 0, -1)
+      end
+    end
     vim.notify("Keyword highlighting disabled")
   end
-end, { desc = "Toggle notice-me keyword highlighting" })
+end, { desc = "Toggle notice-me keyword highlighting" })
+
+-- Add command to refresh highlights
+vim.api.nvim_create_user_command("NoticeMeRefresh", function()
+  local notice_me = require("notice-me")
+  if not notice_me.config.enable then
+    vim.notify("Notice-me is disabled, enable it first with :NoticeMeToggle")
+    return
+  end
+
+  -- Force refresh highlights on current buffer
+  local bufnr = vim.api.nvim_get_current_buf()
+  notice_me.highlight_keywords(bufnr)
+  vim.notify("Refreshed keyword highlights")
+end, { desc = "Refresh notice-me keyword highlighting" })
+