From 7ea9bfcce1c9b2cbf829d8e9d723623639f335af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Mon, 8 Apr 2024 10:17:47 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(nvim):=20use=20ts-error-transl?= =?UTF-8?q?ator=20on=20svelte,=20astro,=20vue,=20ts=20and=20js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lua/plugins/extras/lang/web/astro.lua | 13 ++++++++- .../lua/plugins/extras/lang/web/svelte.lua | 13 ++++++++- .../extras/lang/web/typescript-extended.lua | 28 ++++++++----------- .../lua/plugins/extras/lang/web/vue-3.lua | 13 ++++++++- 4 files changed, 48 insertions(+), 19 deletions(-) diff --git a/.config/nvim/lua/plugins/extras/lang/web/astro.lua b/.config/nvim/lua/plugins/extras/lang/web/astro.lua index b959780c..cae9989e 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/astro.lua +++ b/.config/nvim/lua/plugins/extras/lang/web/astro.lua @@ -11,10 +11,21 @@ return { "neovim/nvim-lspconfig", opts = { servers = { - astro = {}, + astro = { + handlers = { + ["textDocument/publishDiagnostics"] = function(err, result, ctx, config) + require("ts-error-translator").translate_diagnostics(err, result, ctx, config) + vim.lsp.diagnostic.on_publish_diagnostics(err, result, ctx, config) + end, + }, + }, }, }, }, + { + "dmmulroy/ts-error-translator.nvim", + opts = {}, + }, { "williamboman/mason.nvim", opts = function(_, opts) diff --git a/.config/nvim/lua/plugins/extras/lang/web/svelte.lua b/.config/nvim/lua/plugins/extras/lang/web/svelte.lua index 3ac9bfcd..c89520f1 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/svelte.lua +++ b/.config/nvim/lua/plugins/extras/lang/web/svelte.lua @@ -11,7 +11,14 @@ return { "neovim/nvim-lspconfig", opts = { servers = { - svelte = {}, + svelte = { + handlers = { + ["textDocument/publishDiagnostics"] = function(err, result, ctx, config) + require("ts-error-translator").translate_diagnostics(err, result, ctx, config) + vim.lsp.diagnostic.on_publish_diagnostics(err, result, ctx, config) + end, + }, + }, }, }, }, @@ -22,6 +29,10 @@ return { vim.list_extend(opts.ensure_installed, { "svelte-language-server" }) end, }, + { + "dmmulroy/ts-error-translator.nvim", + opts = {}, + }, { "luckasRanarison/nvim-devdocs", optional = true, diff --git a/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua b/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua index e6ce4e76..ac9098e4 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua +++ b/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua @@ -39,6 +39,12 @@ return { opts = { servers = { tsserver = { + handlers = { + ["textDocument/publishDiagnostics"] = function(err, result, ctx, config) + require("ts-error-translator").translate_diagnostics(err, result, ctx, config) + vim.lsp.diagnostic.on_publish_diagnostics(err, result, ctx, config) + end, + }, enabled = ts_server_activated, init_options = { preferences = { @@ -96,6 +102,12 @@ return { ft = ft, opts = { cmd = { "typescript-language-server", "--stdio" }, + handlers = { + ["textDocument/publishDiagnostics"] = function(err, result, ctx, config) + require("ts-error-translator").translate_diagnostics(err, result, ctx, config) + vim.lsp.diagnostic.on_publish_diagnostics(err, result, ctx, config) + end, + }, settings = { code_lens = "all", expose_as_code_action = "all", @@ -160,22 +172,6 @@ return { }, { "dmmulroy/ts-error-translator.nvim", - ft = { "typescript", "typescriptreact" }, - dependencies = { - "neovim/nvim-lspconfig", - opts = { - servers = { - tsserver = { - handlers = { - ["textDocument/publishDiagnostics"] = function(err, result, ctx, config) - require("ts-error-translator").translate_diagnostics(err, result, ctx, config) - vim.lsp.diagnostic.on_publish_diagnostics(err, result, ctx, config) - end, - }, - }, - }, - }, - }, opts = {}, }, { diff --git a/.config/nvim/lua/plugins/extras/lang/web/vue-3.lua b/.config/nvim/lua/plugins/extras/lang/web/vue-3.lua index 892402f5..060723ff 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/vue-3.lua +++ b/.config/nvim/lua/plugins/extras/lang/web/vue-3.lua @@ -11,7 +11,14 @@ return { "neovim/nvim-lspconfig", opts = { servers = { - volar = {}, + volar = { + handlers = { + ["textDocument/publishDiagnostics"] = function(err, result, ctx, config) + require("ts-error-translator").translate_diagnostics(err, result, ctx, config) + vim.lsp.diagnostic.on_publish_diagnostics(err, result, ctx, config) + end, + }, + }, tsserver = {}, }, setup = { @@ -34,6 +41,10 @@ return { }, }, }, + { + "dmmulroy/ts-error-translator.nvim", + opts = {}, + }, { "williamboman/mason.nvim", opts = function(_, opts)