feat: added health checks to see if other plugins have overwritten No…

…ice handlers
folke · Oct 26, 2022 · 906c6c8 · 906c6c8
1 parent 4a46ba3
commit 906c6c8
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 7 deletions.
diff --git a/lua/noice/health.lua b/lua/noice/health.lua
@@ -2,6 +2,7 @@ local require = require("noice.util.lazy")
 
 local Util = require("noice.util")
 local Config = require("noice.config")
+local Lsp = require("noice.source.lsp")
 
 local M = {}
 
@@ -117,10 +118,40 @@ function M.check(opts)
   end
 
   if Config.is_running() then
-    if Config.options.notify.enabled and vim.notify ~= require("noice.source.notify").notify then
-      log.error("`vim.notify` has been overwritten by another plugin?")
+    if Config.options.notify.enabled then
+      if vim.notify ~= require("noice.source.notify").notify then
+        log.error("`vim.notify` has been overwritten by another plugin?")
+      else
+        log.ok("`vim.notify` is set to **Noice**")
+      end
+    else
+      if opts.checkhealth then
+        log.warn("Noice `vim.notify` is disabled")
+      end
+    end
+
+    if Config.options.lsp.hover.enabled then
+      if vim.lsp.handlers["textDocument/hover"] ~= Lsp.hover then
+        log.error([[`vim.lsp.handlers["textDocument/hover"]` has been overwritten by another plugin?]])
+      else
+        log.ok([[`vim.lsp.handlers["textDocument/hover"]` is handled by **Noice**]])
+      end
     else
-      log.ok("`vim.notify` is set to **Noice**")
+      if opts.checkhealth then
+        log.warn([[`vim.lsp.handlers["textDocument/hover"]` is not handled by **Noice**]])
+      end
+    end
+
+    if Config.options.lsp.signature.enabled then
+      if vim.lsp.handlers["textDocument/signatureHelp"] ~= Lsp.signature then
+        log.error([[`vim.lsp.handlers["textDocument/signatureHelp"]` has been overwritten by another plugin?]])
+      else
+        log.ok([[`vim.lsp.handlers["textDocument/signatureHelp"]` is handled by **Noice**]])
+      end
+    else
+      if opts.checkhealth then
+        log.warn([[`vim.lsp.handlers["textDocument/signatureHelp"]` is not handled by **Noice**]])
+      end
     end
   end
 

diff --git a/lua/noice/source/lsp/init.lua b/lua/noice/source/lsp/init.lua
@@ -32,16 +32,20 @@ function M.get(kind)
 end
 
 function M.setup()
-  -- vim.api.nvim_win_get_option(win,
+  M.hover = Util.protect(M.hover)
   if Config.options.lsp.hover.enabled then
-    vim.lsp.handlers["textDocument/hover"] = Util.protect(M.hover)
+    vim.lsp.handlers["textDocument/hover"] = M.hover
   end
+
+  M.signature = Util.protect(M.signature)
   if Config.options.lsp.signature.enabled then
-    vim.lsp.handlers["textDocument/signatureHelp"] = Util.protect(M.signature)
+    vim.lsp.handlers["textDocument/signatureHelp"] = M.signature
   end
+
   if Config.options.lsp.signature.auto_open then
     require("noice.source.lsp.signature").setup()
   end
+
   if Config.options.lsp.progress.enabled then
     require("noice.source.lsp.progress").setup()
   end

diff --git a/lua/noice/text/markdown.lua b/lua/noice/text/markdown.lua
@@ -51,7 +51,7 @@ function M.keys(buf)
       local pos = vim.api.nvim_win_get_cursor(0)
       local col = pos[2] + 1
 
-      for pattern, handler in pairs(require("noice.config").options.markdown.hover) do
+      for pattern, handler in pairs(Config.options.markdown.hover) do
         local from = 1
         local to, url
         while from do