From b7c08147e0a725b0bed8dc9d313ee3f80d97e3b5 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Fri, 4 Apr 2025 15:56:23 +0200 Subject: [PATCH 1/2] language/ts: add conform and lint rules for tsx --- modules/plugins/languages/ts.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index 8589d7ec..1736af2b 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/ts.nix @@ -204,9 +204,13 @@ in { (mkIf cfg.format.enable { vim.formatter.conform-nvim = { enable = true; - setupOpts.formatters_by_ft.typescript = [cfg.format.type]; - setupOpts.formatters.${cfg.format.type} = { - command = getExe cfg.format.package; + setupOpts = { + formatters_by_ft.typescript = [cfg.format.type]; + # .tsx files + formatters_by_ft.typescriptreact = [cfg.format.type]; + formatters.${cfg.format.type} = { + command = getExe cfg.format.package; + }; }; }; }) @@ -215,6 +219,7 @@ in { vim.diagnostics.nvim-lint = { enable = true; linters_by_ft.typescript = cfg.extraDiagnostics.types; + linters_by_ft.typescriptreact = cfg.extraDiagnostics.types; linters = mkMerge (map (name: { ${name}.cmd = getExe diagnosticsProviders.${name}.package; From cb1d127d2f90e22fb8ad92ec94b71c5b88ce9c48 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Sat, 5 Apr 2025 15:51:35 +0200 Subject: [PATCH 2/2] docs: update release notes --- docs/release-notes/rl-0.8.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 8b87ae99..0ab84f45 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -106,6 +106,7 @@ - Add [blink.cmp] support. - Add `LazyFile` user event. - Migrate language modules from none-ls to conform/nvim-lint +- Add tsx support in conform and lint [diniamo](https://github.com/diniamo):