diff options
| author | kylo252 <[email protected]> | 2021-10-09 13:38:35 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-09 13:38:35 +0200 |
| commit | 195b07a464d37328892a502cf7ce3690b6a5b2e4 (patch) | |
| tree | 8ee1586508a711625ee520a9fcab8631533df349 | |
| parent | 5fef931d8720f2ef0d7a0fca18b96f31fd36689a (diff) | |
fix(lsp): use correct check for formatter override (#1726)
| -rw-r--r-- | lua/lsp/init.lua | 3 | ||||
| -rw-r--r-- | lua/lsp/utils.lua | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua index 18b27513..88111005 100644 --- a/lua/lsp/init.lua +++ b/lua/lsp/init.lua @@ -94,11 +94,10 @@ local function select_default_formater(client) Log:debug("Checking for formatter overriding for " .. client.name) local client_filetypes = client.config.filetypes or {} for _, filetype in ipairs(client_filetypes) do - if not vim.tbl_isempty(lvim.lang[filetype].formatters) then + if lvim.lang[filetype] and #vim.tbl_keys(lvim.lang[filetype].formatters) > 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 - return end end end diff --git a/lua/lsp/utils.lua b/lua/lsp/utils.lua index 1a5dd79d..87ba2337 100644 --- a/lua/lsp/utils.lua +++ b/lua/lsp/utils.lua @@ -10,12 +10,6 @@ function M.is_client_active(name) return false end -function M.disable_formatting_capability(client) - -- FIXME: figure out a reasonable way to do this - client.resolved_capabilities.document_formatting = false - require("core.log"):debug(string.format("Turning off formatting capability for language server [%s] ", client.name)) -end - function M.get_active_client_by_ft(filetype) local matches = {} local clients = vim.lsp.get_active_clients() |