mirror of
https://github.com/LunarVim/LunarVim.git
synced 2025-09-01 08:15:20 +02:00
refactor(null-ls): allow passing full list of options for sources (#2137)
This commit is contained in:
parent
b10e18a213
commit
8fd71b5084
4 changed files with 68 additions and 153 deletions
|
@ -1,22 +1,14 @@
|
|||
local M = {}
|
||||
|
||||
local Log = require "lvim.core.log"
|
||||
|
||||
local null_ls = require "null-ls"
|
||||
local services = require "lvim.lsp.null-ls.services"
|
||||
local Log = require "lvim.core.log"
|
||||
|
||||
local is_registered = function(name)
|
||||
local query = {
|
||||
name = name,
|
||||
method = require("null-ls").methods.FORMATTING,
|
||||
}
|
||||
return require("null-ls.sources").is_registered(query)
|
||||
end
|
||||
local method = null_ls.methods.FORMATTING
|
||||
|
||||
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 {}
|
||||
return registered_providers[method] or {}
|
||||
end
|
||||
|
||||
function M.list_supported(filetype)
|
||||
|
@ -26,47 +18,16 @@ function M.list_supported(filetype)
|
|||
return supported_formatters
|
||||
end
|
||||
|
||||
function M.list_configured(formatter_configs)
|
||||
local formatters, errors = {}, {}
|
||||
|
||||
for _, fmt_config in ipairs(formatter_configs) do
|
||||
local name = fmt_config.exe:gsub("-", "_")
|
||||
local formatter = null_ls.builtins.formatting[name]
|
||||
|
||||
if not formatter then
|
||||
Log:error("Not a valid formatter: " .. fmt_config.exe)
|
||||
errors[name] = {} -- Add data here when necessary
|
||||
elseif is_registered(fmt_config.exe) then
|
||||
Log:trace "Skipping registering the source more than once"
|
||||
else
|
||||
local formatter_cmd = services.find_command(formatter._opts.command)
|
||||
if not formatter_cmd then
|
||||
Log:warn("Not found: " .. formatter._opts.command)
|
||||
errors[name] = {} -- Add data here when necessary
|
||||
else
|
||||
Log:debug("Using formatter: " .. formatter_cmd)
|
||||
table.insert(
|
||||
formatters,
|
||||
formatter.with {
|
||||
command = formatter_cmd,
|
||||
extra_args = fmt_config.args,
|
||||
filetypes = fmt_config.filetypes,
|
||||
}
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return { supported = formatters, unsupported = errors }
|
||||
end
|
||||
|
||||
function M.setup(formatter_configs)
|
||||
if vim.tbl_isempty(formatter_configs) then
|
||||
return
|
||||
end
|
||||
|
||||
local formatters = M.list_configured(formatter_configs)
|
||||
null_ls.register { sources = formatters.supported }
|
||||
local registered = services.register_sources(formatter_configs, method)
|
||||
|
||||
if #registered > 0 then
|
||||
Log:debug("Registered the following formatters: " .. unpack(registered))
|
||||
end
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue