From 54018cd5a45de5705c20847334b41c82e83bb6b7 Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Tue, 28 Dec 2021 16:29:30 -0800
Subject: [PATCH] fix(lsp): remove conditional for eslint
---
lua/cosmic/lsp/providers/defaults.lua | 2 +-
lua/cosmic/lsp/providers/null_ls.lua | 16 +++-------------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua
index b46ce02..469d43f 100644
--- a/lua/cosmic/lsp/providers/defaults.lua
+++ b/lua/cosmic/lsp/providers/defaults.lua
@@ -28,7 +28,7 @@ function M.on_attach(client, bufnr)
vim.cmd(([[
augroup CosmicFormat
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
]]):format(format_filetypes))
end
diff --git a/lua/cosmic/lsp/providers/null_ls.lua b/lua/cosmic/lsp/providers/null_ls.lua
index 0e23b7a..2801165 100644
--- a/lua/cosmic/lsp/providers/null_ls.lua
+++ b/lua/cosmic/lsp/providers/null_ls.lua
@@ -3,29 +3,19 @@ local defaults = require('cosmic.lsp.providers.defaults')
local config = require('cosmic.config')
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 {}
require('null-ls').setup(utils.merge({
-- you must define at least one source for the plugin to work
sources = {
null_ls.builtins.code_actions.eslint_d.with({
- condition = has_eslint_config,
+ prefer_local = 'node_modules/.bin',
}),
null_ls.builtins.diagnostics.eslint_d.with({
- condition = has_eslint_config,
+ prefer_local = 'node_modules/.bin',
}),
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.formatting.prettier.with({