From 1d90b8deb57a277eeccf7a4057d49f82497fe587 Mon Sep 17 00:00:00 2001 From: Matt Leong Date: Wed, 20 Oct 2021 14:43:46 -0700 Subject: [PATCH] fix(efm): cleaner formatting conditionals --- lua/cosmic/lsp/providers/defaults.lua | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua index 1d906a2..3d81fa5 100644 --- a/lua/cosmic/lsp/providers/defaults.lua +++ b/lua/cosmic/lsp/providers/defaults.lua @@ -8,19 +8,16 @@ function M.on_attach(client, bufnr) -- Enable completion triggered by buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') - require('cosmic.lsp.mappings') - - -- So that the only client with format capabilities is efm - if client.name ~= 'efm' then + local formatting_servers = { 'efm', 'eslint' } + if vim.tbl_contains(formatting_servers, client.name) then + client.resolved_capabilities.document_formatting = true + client.resolved_capabilities.document_range_formatting = true + else client.resolved_capabilities.document_formatting = false client.resolved_capabilities.document_range_formatting = false end - -- need to set eslint formatting manually - if client.name == 'eslint' then - client.resolved_capabilities.document_formatting = true - client.resolved_capabilities.document_range_formatting = true - end + require('cosmic.lsp.mappings') require('lsp_signature').on_attach({ bind = true, -- This is mandatory, otherwise border config won't get registered.