refactor!: remove diagnostics and signs configuration (moved to AstroCore)

Author: mehalter

README.md

@@ -52,7 +52,6 @@ local opts = {
   features = {
     autoformat = true, -- enable or disable auto formatting on start
     codelens = true, -- enable/disable codelens refresh on start
-    diagnostics_mode = 3, -- diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = off)
     inlay_hints = false, -- enable/disable inlay hints on start
     semantic_tokens = true, -- enable/disable semantic token highlighting
   },
@@ -112,10 +111,6 @@ local opts = {
       },
     },
   },
-  -- Configure diagnostics options (`:h vim.diagnostic.config()`)
-  diagnostics = {
-    update_in_insert = false,
-  },
   -- A custom flags table to be passed to all language servers  (`:h lspconfig-setup`)
   flags = {
     exit_timeout = 5000,

lua/astrolsp/config.lua

@@ -27,7 +27,6 @@
 
 ---@class AstroLSPFeatureOpts
 ---@field codelens boolean? enable/disable codelens refresh on start (boolean; default = true)
----@field diagnostics_mode integer? diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = off; default = 3)
 ---@field inlay_hints boolean? enable/disable inlay hints on start (boolean; default = false)
 ---@field semantic_tokens boolean? enable/disable semantic token highlighting (boolean; default = true)
 
@@ -99,7 +98,6 @@
 ---```lua
 ---features = {
 ---  codelens = true,
----  diagnostics_mode = 3,
 ---  inlay_hints = false,
 ---  semantic_tokens = true,
 ---}
@@ -132,13 +130,6 @@
 ---}
 ---```
 ---@field config lspconfig.options?
----Configure diagnostics options (`:h vim.diagnostic.config()`)
----Example:
---
----```lua
----diagnostics = { update_in_insert = false },
----```
----@field diagnostics vim.diagnostic.Opts?
 ---A custom flags table to be passed to all language servers  (`:h lspconfig-setup`)
 ---Example:
 --
@@ -253,15 +244,6 @@
 ---servers = { "dartls" }
 ---```
 ---@field servers string[]?
----Configure signs (`:h sign_define()`)
----Example:
---
----```lua
----signs = {
----  { name = "DapBreakPoint", text = "", texthl = "DiagnosticInfo" },
----},
----```
----@field signs table<string,vim.fn.sign_define.dict|false>?
 ---A custom `on_attach` function to be run after the default `on_attach` function, takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
 ---Example:
 --
@@ -278,14 +260,12 @@ local M = {
   commands = {},
   features = {
     codelens = true,
-    diagnostics_mode = 3,
     inlay_hints = false,
     semantic_tokens = true,
   },
   capabilities = {},
   ---@diagnostic disable-next-line: missing-fields
   config = {},
-  diagnostics = {},
   flags = {},
   formatting = { format_on_save = { enabled = true }, disabled = {} },
   handlers = {},

lua/astrolsp/init.lua

@@ -32,31 +32,6 @@ local function check_cond(cond, client, bufnr)
   return true
 end
 
---- A table of settings for different levels of diagnostics
-M.diagnostics = { [0] = {}, {}, {}, {} }
-
-local function setup_diagnostics()
-  for name, dict in pairs(M.config.signs or {}) do
-    if dict then vim.fn.sign_define(name, dict) end
-  end
-  M.diagnostics = {
-    -- diagnostics off
-    [0] = vim.tbl_deep_extend(
-      "force",
-      M.config.diagnostics,
-      { underline = false, virtual_text = false, signs = false, update_in_insert = false }
-    ),
-    -- status only
-    vim.tbl_deep_extend("force", M.config.diagnostics, { virtual_text = false, signs = false }),
-    -- virtual text off, signs on
-    vim.tbl_deep_extend("force", M.config.diagnostics, { virtual_text = false }),
-    -- all diagnostics on
-    M.config.diagnostics,
-  }
-
-  vim.diagnostic.config(M.diagnostics[M.config.features.diagnostics_mode])
-end
-
 --- Helper function to set up a given server with the Neovim LSP client
 ---@param server string The name of the server to be setup
 function M.lsp_setup(server)
@@ -224,25 +199,6 @@ end
 function M.setup(opts)
   M.config = vim.tbl_deep_extend("force", M.config, opts)
 
-  -- TODO: Remove when dropping support for Neovim v0.9
-  -- Backwards compatibility of new diagnostic sign API to Neovim v0.9
-  if vim.fn.has "nvim-0.10" ~= 1 then
-    local signs = vim.tbl_get(M.config, "diagnostics", "signs") or {}
-    if not M.config.signs then M.config.signs = {} end
-    for _, type in ipairs { "Error", "Hint", "Info", "Warn" } do
-      local name, severity = "DiagnosticSign" .. type, vim.diagnostic.severity[type:upper()]
-      if M.config.signs[name] == nil then M.config.signs[name] = { text = "" } end
-      if M.config.signs[name] then
-        if not M.config.signs[name].texthl then M.config.signs[name].texthl = name end
-        for attribute, severities in pairs(signs) do
-          if severities[severity] then M.config.signs[name][attribute] = severities[severity] end
-        end
-      end
-    end
-  end
-
-  setup_diagnostics()
-
   -- normalize format_on_save to table format
   if vim.tbl_get(M.config, "formatting", "format_on_save") == false then
     M.config.formatting.format_on_save = { enabled = false }

lua/astrolsp/toggles.lua

@@ -79,20 +79,4 @@ function M.codelens(silent)
   ui_notify(silent, ("CodeLens %s"):format(bool2str(features.codelens)))
 end
 
---- Toggle diagnostics
----@param silent? boolean if true then don't sent a notification
-function M.diagnostics(silent)
-  features.diagnostics_mode = (features.diagnostics_mode - 1) % 4
-  vim.diagnostic.config(require("astrolsp").diagnostics[features.diagnostics_mode])
-  if features.diagnostics_mode == 0 then
-    ui_notify(silent, "diagnostics off")
-  elseif features.diagnostics_mode == 1 then
-    ui_notify(silent, "only status diagnostics")
-  elseif features.diagnostics_mode == 2 then
-    ui_notify(silent, "virtual text off")
-  else
-    ui_notify(silent, "all diagnostics on")
-  end
-end
-
 return M