diff --git a/lua/cosmic/config/init.lua b/lua/cosmic/config/init.lua index 401eaac..4864e3e 100644 --- a/lua/cosmic/config/init.lua +++ b/lua/cosmic/config/init.lua @@ -33,15 +33,17 @@ local default_config = { local config = vim.tbl_deep_extend('force', default_config, user_config) -- default servers that can be formatted -local formatting_servers = { 'efm', 'eslint', 'tsserver', 'sumneko_lua', 'rust_analyzer', 'gopls', 'pyright' } local user_servers = vim.tbl_keys(config.lsp.servers) - function config.lsp.can_client_format(client_name) - if not user_servers[client_name] or vim.tbl_contains(formatting_servers, client_name) then - return false + if (config.lsp.servers[client_name] == true) then + return true end - return (user_servers[client_name].format == true) + if vim.tbl_contains(user_servers, client_name) and config.lsp.servers[client_name] then + return (config.lsp.servers[client_name].format == true) + end + + return true end return config diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua index 265eccb..4c2af60 100644 --- a/lua/cosmic/lsp/providers/defaults.lua +++ b/lua/cosmic/lsp/providers/defaults.lua @@ -25,7 +25,7 @@ function M.on_attach(client, bufnr) else format_filetypes = '*' end - vim.cmd(string.format('autocomd BufWritePre %s lua vim.lsp.buf.formatting()', format_filetypes)) + vim.cmd(string.format('autocmd BufWritePre %s lua vim.lsp.buf.formatting()', format_filetypes)) end else client.resolved_capabilities.document_formatting = false