From 2e808049b7f9b8d19486d7e52af2b82f8200d576 Mon Sep 17 00:00:00 2001 From: Andrzej Stepien Date: Sun, 17 Mar 2024 23:03:40 +0100 Subject: [PATCH] revert to default eslint config --- lua/config/lsp/servers/eslint.lua | 60 ++++++++++++++++--------------- lua/setup/lsp.lua | 16 ++++----- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/lua/config/lsp/servers/eslint.lua b/lua/config/lsp/servers/eslint.lua index c491003..3bc25a3 100644 --- a/lua/config/lsp/servers/eslint.lua +++ b/lua/config/lsp/servers/eslint.lua @@ -1,40 +1,42 @@ local M = {} local on_attach = function(client, bufnr) - client.server_capabilities.documentFormattingProvider = true - local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end + client.server_capabilities.documentFormattingProvider = true + local function buf_set_option(...) + vim.api.nvim_buf_set_option(bufnr, ...) + end - buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") + buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") end -M.on_attach = on_attach; +M.on_attach = on_attach M.settings = { - codeAction = { - disableRuleComment = { - enable = true, - location = "separateLine" - }, - showDocumentation = { - enable = true - } - }, - codeActionOnSave = { - enable = false, - mode = "all" - }, - format = true, - nodePath = "", - onIgnoredFiles = "off", - packageManager = "npm", - quiet = false, - rulesCustomizations = {}, - run = "onType", - useESLintClass = false, - validate = "on", - workingDirectory = { - mode = "location" - } + codeAction = { + disableRuleComment = { + enable = true, + location = "separateLine", + }, + showDocumentation = { + enable = true, + }, + }, + codeActionOnSave = { + enable = false, + mode = "all", + }, + format = true, + nodePath = "", + onIgnoredFiles = "off", + packageManager = "npm", + quiet = false, + rulesCustomizations = {}, + run = "onType", + useESLintClass = false, + validate = "on", + workingDirectory = { + mode = "location", + }, } return M diff --git a/lua/setup/lsp.lua b/lua/setup/lsp.lua index 5ada2b4..f4941ea 100644 --- a/lua/setup/lsp.lua +++ b/lua/setup/lsp.lua @@ -43,17 +43,15 @@ require("mason-lspconfig").setup_handlers({ require("lspconfig")[server_name].setup({ on_attach = on_attach, capabilities = lsp_capabilities, - --handlers = handlers, - }) - end, - ["eslint"] = function() - lspconfig.eslint.setup({ - capabilities = lsp_capabilities, - --handlers = handlers, - on_attach = require("config.lsp.servers.eslint").on_attach, - settings = require("config.lsp.servers.eslint").settings, }) end, + -- ["eslint"] = function() + -- lspconfig.eslint.setup({ + -- capabilities = lsp_capabilities, + -- on_attach = require("config.lsp.servers.eslint").on_attach, + -- settings = require("config.lsp.servers.eslint").settings, + -- }) + -- end, ["lua_ls"] = function() lspconfig.lua_ls.setup({ capabilities = lsp_capabilities,