fix(lsp): remove conditional for eslint

This commit is contained in:
Matt Leong 2021-12-28 16:29:30 -08:00
parent 797cc4438a
commit 54018cd5a4
2 changed files with 4 additions and 14 deletions

View file

@ -28,7 +28,7 @@ function M.on_attach(client, bufnr)
vim.cmd(([[ vim.cmd(([[
augroup CosmicFormat augroup CosmicFormat
autocmd! autocmd!
autocmd BufWritePre %s lua vim.lsp.buf.formatting_sync(nil, 1200) autocmd BufWritePre %s lua vim.lsp.buf.formatting_sync(nil, 2000)
augroup end augroup end
]]):format(format_filetypes)) ]]):format(format_filetypes))
end end

View file

@ -3,29 +3,19 @@ local defaults = require('cosmic.lsp.providers.defaults')
local config = require('cosmic.config') local config = require('cosmic.config')
local null_ls = require('null-ls') local null_ls = require('null-ls')
local has_eslint_config = function(u)
return u.root_has_file('.eslintrc')
or u.root_has_file('.eslintrc.json')
or u.root_has_file('.eslintrc.js')
or u.root_has_file('package.json')
or u.root_has_file('.eslintrc.cjs')
or u.root_has_file('.eslintrc.yaml')
or u.root_has_file('.eslintrc.yml')
end
local config_opts = config.lsp.servers.null_ls or {} local config_opts = config.lsp.servers.null_ls or {}
require('null-ls').setup(utils.merge({ require('null-ls').setup(utils.merge({
-- you must define at least one source for the plugin to work -- you must define at least one source for the plugin to work
sources = { sources = {
null_ls.builtins.code_actions.eslint_d.with({ null_ls.builtins.code_actions.eslint_d.with({
condition = has_eslint_config, prefer_local = 'node_modules/.bin',
}), }),
null_ls.builtins.diagnostics.eslint_d.with({ null_ls.builtins.diagnostics.eslint_d.with({
condition = has_eslint_config, prefer_local = 'node_modules/.bin',
}), }),
null_ls.builtins.formatting.eslint_d.with({ null_ls.builtins.formatting.eslint_d.with({
condition = has_eslint_config, prefer_local = 'node_modules/.bin',
}), }),
null_ls.builtins.code_actions.gitsigns, null_ls.builtins.code_actions.gitsigns,
null_ls.builtins.formatting.prettier.with({ null_ls.builtins.formatting.prettier.with({