diff --git a/lua/plugins.lua b/lua/plugins.lua index 147ed43..605ba32 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -156,7 +156,7 @@ return require("packer").startup( "onsails/lspkind-nvim", "ray-x/lsp_signature.nvim", "jose-elias-alvarez/nvim-lsp-ts-utils", - "jose-elias-alvarez/null-ls.nvim", + -- "jose-elias-alvarez/null-ls.nvim", "nvim-lua/lsp-status.nvim" } } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 6892e4c..844e800 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -31,48 +31,10 @@ lsp_status.register_progress() require("lspkind").init({}) --- Languages -require "lspconfig".bashls.setup {} require "lspconfig".ccls.setup {} -require "lspconfig".clangd.setup {} -require "lspconfig".cssls.setup {} require "lspconfig".html.setup {} -require "lspconfig".pyright.setup {} require "lspconfig".vimls.setup {} require "lspconfig".yamlls.setup {} -require "lspconfig".texlab.setup {} - ---- ESLINT - -local eslint = { - lintCommand = "eslint_d -f visualstudio --stdin --stdin-filename ${INPUT}", - lintIgnoreExitCode = true, - lintStdin = true, - lintFormats = { - "%f(%l,%c): %tarning %m", - "%f(%l,%c): %rror %m" - } -} - ---- ESLINT Actions -require("null-ls").config {} -require("lspconfig")["null-ls"].setup {} - -require "lspconfig".efm.setup { - init_options = {documentFormatting = true}, - filetypes = {"javascript", "typescript", "javascriptreact", "typescriptreact"}, - init_options = {documentFormatting = true}, - settings = { - rootMarkers = {".eslintrc.js", ".git/"}, - languages = { - javascript = {eslint}, - typescript = {eslint}, - typescriptreact = {eslint}, - javascriptreact = {eslint} - } - } -} - ---- Keybindings local nvim_lsp = require("lspconfig") @@ -121,7 +83,7 @@ require "lspconfig".tsserver.setup { local ts_utils = require("nvim-lsp-ts-utils") ts_utils.setup { - eslint_bin = "eslint_d", + -- eslint_bin = "eslint_d", eslint_enable_diagnostics = false } ts_utils.setup_client(client) @@ -133,6 +95,20 @@ require "lspconfig".tsserver.setup { capabilities = lsp_status.capabilities } +require "lspconfig".eslint.setup { + on_attach = on_attach, + handlers = { + ["eslint/openDoc"] = function(_, result) + if not result then + return + end + print(result.url) + return {} + end + }, + capabilities = lsp_status.capabilities +} + --[[ require "lspconfig".java_language_server.setup { on_attach = on_attach, cmd = {"java-language-server"} diff --git a/setup.sh b/setup.sh index a46aab2..284cdfc 100755 --- a/setup.sh +++ b/setup.sh @@ -10,5 +10,4 @@ vscode-css-languageserver-bin \ vscode-html-languageserver-bin \ vscode-json-languageserver \ vscode-langservers-extracted \ -vscode-langservers-extracted \ bash-language-server