From 03e5760e59b5dd420956908b6f8b57c33f70f2cd Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Wed, 20 Oct 2021 20:01:51 +0200 Subject: fix(formatters): always select null-ls by default (#1810) --- lua/lvim/lsp/init.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lua/lvim/lsp/init.lua') 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 -- cgit v1.2.3