Compare commits

..

No commits in common. "36abe5b79d93dc5c1238935410f2be5e264df9a0" and "6e82a568f2c2565839eb4fda8be818adbaeb2498" have entirely different histories.

2 changed files with 3 additions and 9 deletions

View file

@ -106,7 +106,6 @@
- Add [blink.cmp] support. - Add [blink.cmp] support.
- Add `LazyFile` user event. - Add `LazyFile` user event.
- Migrate language modules from none-ls to conform/nvim-lint - Migrate language modules from none-ls to conform/nvim-lint
- Add tsx support in conform and lint
[diniamo](https://github.com/diniamo): [diniamo](https://github.com/diniamo):

View file

@ -204,22 +204,17 @@ in {
(mkIf cfg.format.enable { (mkIf cfg.format.enable {
vim.formatter.conform-nvim = { vim.formatter.conform-nvim = {
enable = true; enable = true;
setupOpts = { setupOpts.formatters_by_ft.typescript = [cfg.format.type];
formatters_by_ft.typescript = [cfg.format.type]; setupOpts.formatters.${cfg.format.type} = {
# .tsx files
formatters_by_ft.typescriptreact = [cfg.format.type];
formatters.${cfg.format.type} = {
command = getExe cfg.format.package; command = getExe cfg.format.package;
}; };
}; };
};
}) })
(mkIf cfg.extraDiagnostics.enable { (mkIf cfg.extraDiagnostics.enable {
vim.diagnostics.nvim-lint = { vim.diagnostics.nvim-lint = {
enable = true; enable = true;
linters_by_ft.typescript = cfg.extraDiagnostics.types; linters_by_ft.typescript = cfg.extraDiagnostics.types;
linters_by_ft.typescriptreact = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: { linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package; ${name}.cmd = getExe diagnosticsProviders.${name}.package;