fix: make search_count work with nohlsearch. Fixes #217

folke · Nov 13, 2022 · 80ec5b8 · 80ec5b8
1 parent d5594a8
commit 80ec5b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lua/noice/ui/msg.lua b/lua/noice/ui/msg.lua
@@ -103,6 +103,8 @@ end
 function M.on_clear()
   State.clear("msg_show")
   M.last = nil
+  local message = M.get(M.events.show, M.kinds.search_count)
+  Manager.remove(message)
 end
 
 -- mode like recording...

diff --git a/lua/noice/util/hacks.lua b/lua/noice/util/hacks.lua
@@ -40,13 +40,13 @@ end
 -- Clears search count and stops timer when hlsearch==0
 function M.fix_nohlsearch()
   M.fix_nohlsearch = Util.interval(30, function()
-    if vim.v.hlsearch == 0 then
+    if vim.o.hlsearch and vim.v.hlsearch == 0 then
       local m = require("noice.ui.msg").get("msg_show", "search_count")
       require("noice.message.manager").remove(m)
     end
   end, {
     enabled = function()
-      return vim.v.hlsearch == 1
+      return vim.o.hlsearch and vim.v.hlsearch == 1
     end,
   })
   M.fix_nohlsearch()