feat: fix eslint - moved to lspconfig setup

This commit is contained in:
Matthew Leong 2024-03-06 10:38:27 -08:00
parent 290c00be62
commit 7eda72ff16
6 changed files with 18 additions and 7 deletions

View file

@ -1,6 +1,6 @@
if vim.fn.has('nvim-0.10') == 0 then -- if vim.fn.has('nvim-0.10') == 0 then
error('Need Neovim v0.10+ (Nightly) in order to run Cosmic!') -- error('Need Neovim v0.10+ (Nightly) in order to run Cosmic!')
end -- end
local ok, err = pcall(require, 'cosmic') local ok, err = pcall(require, 'cosmic')

View file

@ -17,6 +17,7 @@
"mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
"neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
"noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
"none-ls-extras.nvim": { "branch": "main", "commit": "c226aca7a506dd4325fb96188bffe804d24bbf18" },
"none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" }, "none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" },
"nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" }, "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" },
"nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" },

View file

@ -28,7 +28,7 @@ local default_config = {
-- lsp servers that should be installed -- lsp servers that should be installed
ensure_installed = { ensure_installed = {
'astro', 'astro',
'eslint_d', 'eslint',
'prettierd', 'prettierd',
'cssls', 'cssls',
'gopls', 'gopls',
@ -46,6 +46,7 @@ local default_config = {
servers = { servers = {
astro = true, astro = true,
tailwindcss = true, tailwindcss = true,
eslint = true,
jsonls = { jsonls = {
format = false, format = false,
}, },

View file

@ -0,0 +1,10 @@
local default_on_attach = require('cosmic.lsp.providers.defaults').on_attach
return {
on_attach = function(client, bufnr)
default_on_attach(client, bufnr)
vim.api.nvim_create_autocmd("BufWritePre", {
buffer = bufnr,
command = "EslintFixAll",
})
end,
}

View file

@ -31,6 +31,8 @@ return {
opts = u.merge(opts, require('cosmic.lsp.providers.jsonls')) opts = u.merge(opts, require('cosmic.lsp.providers.jsonls'))
elseif server == 'pyright' then elseif server == 'pyright' then
opts = u.merge(opts, require('cosmic.lsp.providers.pyright')) opts = u.merge(opts, require('cosmic.lsp.providers.pyright'))
elseif server == 'eslint' then
opts = u.merge(opts, require('cosmic.lsp.providers.eslint'))
elseif server == 'lua_ls' then elseif server == 'lua_ls' then
opts = u.merge(opts, require('cosmic.lsp.providers.lua_ls')) opts = u.merge(opts, require('cosmic.lsp.providers.lua_ls'))
end end

View file

@ -20,10 +20,7 @@ return {
config_opts.sources = u.merge_list({ config_opts.sources = u.merge_list({
null_ls.builtins.code_actions.gitsigns, null_ls.builtins.code_actions.gitsigns,
null_ls.builtins.code_actions.eslint_d,
null_ls.builtins.diagnostics.eslint_d,
null_ls.builtins.diagnostics.markdownlint, null_ls.builtins.diagnostics.markdownlint,
null_ls.builtins.formatting.eslint_d,
null_ls.builtins.formatting.prettierd.with({ null_ls.builtins.formatting.prettierd.with({
env = { env = {
PRETTIERD_LOCAL_PRETTIER_ONLY = 1, PRETTIERD_LOCAL_PRETTIER_ONLY = 1,