4 files changed, 20 insertions, 42 deletions
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index f4d084be..8c7a0dd9 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -65,13 +65,14 @@ return {
     "angularls",
     "ansiblels",
     "ccls",
-    "cssmodules_ls",
     "csharp_ls",
+    "cssmodules_ls",
     "denols",
     "ember",
     "emmet_ls",
     "eslint",
     "eslintls",
+    "grammarly",
     "graphql",
     "jedi_language_server",
     "ltex",
@@ -79,15 +80,17 @@ return {
     "pylsp",
     "quick_lint_js",
     "rome",
-    "sorbet",
-    "sqlls",
-    "sqls",
     "solang",
+    "solidity_ls",
+    "sorbet",
     "sourcekit",
     "spectral",
+    "sqlls",
+    "sqls",
     "stylelint_lsp",
     "tailwindcss",
     "tflint",
     "volar",
+    "zk",
   },
 }
diff --git a/lua/lvim/lsp/null-ls/code_actions.lua b/lua/lvim/lsp/null-ls/code_actions.lua
index ff59fabf..bf6492b5 100644
--- a/lua/lvim/lsp/null-ls/code_actions.lua
+++ b/lua/lvim/lsp/null-ls/code_actions.lua
@@ -14,20 +14,11 @@ local is_registered = function(name)
   return require("null-ls.sources").is_registered(query)
 end
 
-function M.list_registered_providers(filetype)
+function M.list_registered(filetype)
   local registered_providers = services.list_registered_providers_names(filetype)
   return registered_providers[METHOD] or {}
 end
 
-function M.list_available(filetype)
-  local availables = require("null-ls.sources").get_available(filetype, METHOD)
-  local actors = vim.tbl_map(function(src)
-    return src.name
-  end, availables)
-  table.sort(actors)
-  return actors
-end
-
 function M.list_configured(actions_configs)
   local actors, errors = {}, {}
 
diff --git a/lua/lvim/lsp/null-ls/formatters.lua b/lua/lvim/lsp/null-ls/formatters.lua
index b2e191c5..0613f16f 100644
--- a/lua/lvim/lsp/null-ls/formatters.lua
+++ b/lua/lvim/lsp/null-ls/formatters.lua
@@ -12,26 +12,18 @@ local is_registered = function(name)
   return require("null-ls.sources").is_registered(query)
 end
 
-function M.list_registered_providers(filetype)
+function M.list_registered(filetype)
   local null_ls_methods = require "null-ls.methods"
   local formatter_method = null_ls_methods.internal["FORMATTING"]
   local registered_providers = services.list_registered_providers_names(filetype)
   return registered_providers[formatter_method] or {}
 end
 
-function M.list_available(filetype)
-  local formatters = {}
-  local tbl = require "lvim.utils.table"
-  for _, provider in pairs(null_ls.builtins.formatting) do
-    if tbl.contains(provider.filetypes or {}, function(ft)
-      return ft == "*" or ft == filetype
-    end) then
-      table.insert(formatters, provider.name)
-    end
-  end
-
-  table.sort(formatters)
-  return formatters
+function M.list_supported(filetype)
+  local s = require "null-ls.sources"
+  local supported_formatters = s.get_supported(filetype, "formatting")
+  table.sort(supported_formatters)
+  return supported_formatters
 end
 
 function M.list_configured(formatter_configs)
diff --git a/lua/lvim/lsp/null-ls/linters.lua b/lua/lvim/lsp/null-ls/linters.lua
index 6a793d26..67e530a9 100644
--- a/lua/lvim/lsp/null-ls/linters.lua
+++ b/lua/lvim/lsp/null-ls/linters.lua
@@ -12,26 +12,18 @@ local is_registered = function(name)
   return require("null-ls.sources").is_registered(query)
 end
 
-function M.list_registered_providers(filetype)
+function M.list_registered(filetype)
   local null_ls_methods = require "null-ls.methods"
   local linter_method = null_ls_methods.internal["DIAGNOSTICS"]
   local registered_providers = services.list_registered_providers_names(filetype)
   return registered_providers[linter_method] or {}
 end
 
-function M.list_available(filetype)
-  local linters = {}
-  local tbl = require "lvim.utils.table"
-  for _, provider in pairs(null_ls.builtins.diagnostics) do
-    if tbl.contains(provider.filetypes or {}, function(ft)
-      return ft == "*" or ft == filetype
-    end) then
-      table.insert(linters, provider.name)
-    end
-  end
-
-  table.sort(linters)
-  return linters
+function M.list_supported(filetype)
+  local s = require "null-ls.sources"
+  local supported_linters = s.get_supported(filetype, "diagnostics")
+  table.sort(supported_linters)
+  return supported_linters
 end
 
 function M.list_configured(linter_configs)