diff options
| author | kylo252 <[email protected]> | 2021-10-20 20:01:51 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-20 20:01:51 +0200 |
| commit | 03e5760e59b5dd420956908b6f8b57c33f70f2cd (patch) | |
| tree | dd819f26ddd2609cfb712c6b50aa489c13726b75 /lua/lvim/lsp | |
| parent | cfdd5e61f9d92763994b41fa5b5e1daac2f2ab95 (diff) | |
fix(formatters): always select null-ls by default (#1810)
Diffstat (limited to 'lua/lvim/lsp')
| -rw-r--r-- | lua/lvim/lsp/init.lua | 7 | ||||
| -rw-r--r-- | lua/lvim/lsp/null-ls/formatters.lua | 2 | ||||
| -rw-r--r-- | lua/lvim/lsp/null-ls/linters.lua | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua index c8d583a9..45ba04e0 100644 --- a/lua/lvim/lsp/init.lua +++ b/lua/lvim/lsp/init.lua @@ -86,15 +86,14 @@ function M.common_capabilities() end local function select_default_formater(client) - local client_formatting = client.resolved_capabilities.document_formatting - or client.resolved_capabilities.document_range_formatting - if client.name == "null-ls" or not client_formatting then + if client.name == "null-ls" or not client.resolved_capabilities.document_formatting then return end Log:debug("Checking for formatter overriding for " .. client.name) + local formatters = require "lvim.lsp.null-ls.formatters" local client_filetypes = client.config.filetypes or {} for _, filetype in ipairs(client_filetypes) do - if lvim.lang[filetype] and #vim.tbl_keys(lvim.lang[filetype].formatters) > 0 then + if #vim.tbl_keys(formatters.list_registered_providers(filetype)) > 0 then Log:debug("Formatter overriding detected. Disabling formatting capabilities for " .. client.name) client.resolved_capabilities.document_formatting = false client.resolved_capabilities.document_range_formatting = false diff --git a/lua/lvim/lsp/null-ls/formatters.lua b/lua/lvim/lsp/null-ls/formatters.lua index 663e2586..87583abd 100644 --- a/lua/lvim/lsp/null-ls/formatters.lua +++ b/lua/lvim/lsp/null-ls/formatters.lua @@ -4,7 +4,7 @@ local null_ls = require "null-ls" local services = require "lvim.lsp.null-ls.services" local Log = require "lvim.core.log" -function M.list_supported_names(filetype) +function M.list_registered_providers(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) diff --git a/lua/lvim/lsp/null-ls/linters.lua b/lua/lvim/lsp/null-ls/linters.lua index 9ea2d55b..1069ac58 100644 --- a/lua/lvim/lsp/null-ls/linters.lua +++ b/lua/lvim/lsp/null-ls/linters.lua @@ -4,7 +4,7 @@ local null_ls = require "null-ls" local services = require "lvim.lsp.null-ls.services" local Log = require "lvim.core.log" -function M.list_supported_names(filetype) +function M.list_registered_providers(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) |