refactor(lsp)!: specify option in deprecation msgfeat/handlers-override

4 files changed, 11 insertions, 22 deletions

diff --git a/lua/lvim/config/_deprecated.lua b/lua/lvim/config/_deprecated.lua
index 55412d6a..153a0815 100644
--- a/lua/lvim/config/_deprecated.lua
+++ b/lua/lvim/config/_deprecated.lua
@@ -62,13 +62,22 @@ function M.handle()
   })
 
   ---@deprecated
+  lvim.lsp.diagnostics = {}
+  setmetatable(lvim.lsp.diagnostics, {
+    __newindex = function(table, k, v)
+      deprecate("lvim.lsp.diagnostics." .. k, string.format("Use `vim.diagnostic.config({ %s = %s })` instead", k, v))
+      rawset(table, k, v)
+    end,
+  })
+
+  ---@deprecated
   lvim.lang = {}
   setmetatable(lvim.lang, mt)
 end
 
 function M.post_load()
   if lvim.lsp.diagnostics and not vim.tbl_isempty(lvim.lsp.diagnostics) then
-    deprecate("lvim.lsp.diagnostics", "Use `vim.diagnostic.config()` instead")
+    vim.diagnostic.config(lvim.lsp.diagnostics)
   end
 
   if lvim.lsp.override and not vim.tbl_isempty(lvim.lsp.override) then
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index b15ce14b..9ebc8e39 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -54,7 +54,7 @@ local join_paths = require("lvim.utils").join_paths
 
 return {
   templates_dir = join_paths(get_runtime_dir(), "site", "after", "ftplugin"),
-  ---@deprecated use vim.diagnostic.config() instead
+  ---@deprecated use vim.diagnostic.config({ ... }) instead
   diagnostics = {},
   document_highlight = false,
   code_lens_refresh = true,
diff --git a/lua/lvim/lsp/handlers.lua b/lua/lvim/lsp/handlers.lua
deleted file mode 100644
index 4a8c8319..00000000
--- a/lua/lvim/lsp/handlers.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- Set Default Prefix.
--- Note: You can set a prefix per lsp server in the lv-globals.lua file
-local M = {}
-
-function M.setup()
-  local config = { -- your config
-    virtual_text = lvim.lsp.diagnostics.virtual_text,
-    signs = lvim.lsp.diagnostics.signs,
-    underline = lvim.lsp.diagnostics.underline,
-    update_in_insert = lvim.lsp.diagnostics.update_in_insert,
-    severity_sort = lvim.lsp.diagnostics.severity_sort,
-    float = lvim.lsp.diagnostics.float,
-  }
-
-  vim.diagnostic.config(config)
-end
-
-return M
diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua
index 3531204a..6dea3f77 100644
--- a/lua/lvim/lsp/init.lua
+++ b/lua/lvim/lsp/init.lua
@@ -94,8 +94,6 @@ function M.setup()
     return
   end
 
-  require("lvim.lsp.handlers").setup()
-
   if lvim.use_icons then
     for _, sign in ipairs(vim.tbl_get(vim.diagnostic.config(), "signs", "values") or {}) do
       vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = sign.name })