NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-04-03 11:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

language/ts: migrate to conform/nvim-lint

Browse source
This commit is contained in:
Ching Pei Yang 2025-03-28 12:12:22 +01:00
parent bc76ced636
commit 6f5738da0c
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
1 changed files with 36 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
modules/plugins/languages/ts.nix
View file

@ -9,10 +9,10 @@
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.lists) isList;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.generators) mkLuaInline;
inherit (lib.types) enum either listOf package str bool; inherit (lib.types) enum either listOf package str bool;
inherit (lib.nvim.lua) expToLua toLuaObject; inherit (lib.nvim.lua) expToLua toLuaObject;
inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption; inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption;
inherit (lib.nvim.languages) diagnosticsToLua;
inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.dag) entryAnywhere;
cfg = config.vim.languages.ts; cfg = config.vim.languages.ts;
@ -77,39 +77,14 @@
formats = { formats = {
prettier = { prettier = {
package = pkgs.nodePackages.prettier; package = pkgs.nodePackages.prettier;
nullConfig = ''
table.insert(
ls_sources,
null_ls.builtins.formatting.prettier.with({
command = "${cfg.format.package}/bin/prettier",
filetypes = { "typescript", "javascript" },
})
)
'';
}; };
prettierd = { prettierd = {
package = pkgs.prettierd; package = pkgs.prettierd;
nullConfig = ''
table.insert(
ls_sources,
null_ls.builtins.formatting.prettier.with({
command = "${cfg.format.package}/bin/prettierd",
})
)
'';
}; };
biome = { biome = {
package = pkgs.biome; package = pkgs.biome;
nullConfig = ''
table.insert(
ls_sources,
null_ls.builtins.formatting.biome.with({
command = "${cfg.format.package}/bin/biome",
})
)
'';
}; };
}; };
@ -118,24 +93,26 @@
diagnosticsProviders = { diagnosticsProviders = {
eslint_d = { eslint_d = {
package = pkgs.eslint_d; package = pkgs.eslint_d;
nullConfig = pkg: '' config = let
table.insert( pkg = pkgs.eslint_d;
ls_sources, in {
null_ls.builtins.diagnostics.eslint_d.with({ cmd = getExe pkg;
command = "${getExe pkg}", # HACK: change if nvim-lint gets a dynamic enable thing
condition = function(utils) parser = mkLuaInline ''
return utils.root_has_file({ function(output, bufnr, cwd)
"eslint.config.js", local markers = { "eslint.config.js", "eslint.config.mjs",
"eslint.config.mjs", ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.yml", }
".eslintrc", for _, filename in ipairs(markers) do
".eslintrc.json", local path = vim.fs.join(cwd, filename)
".eslintrc.js", if vim.loop.fs_stat(path) then
".eslintrc.yml", return require("lint.linters.eslint_d").parser(output, bufnr, cwd)
}) end
end, end
})
) return {}
''; end
'';
};
}; };
}; };
in { in {
@ -225,16 +202,24 @@ in {
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {
vim.lsp.null-ls.enable = true; vim.formatter.conform-nvim = {
vim.lsp.null-ls.sources.ts-format = formats.${cfg.format.type}.nullConfig; enable = true;
setupOpts.formatters_by_ft.typescript = [cfg.format.type];
setupOpts.formatters.${cfg.format.type} = {
command = getExe cfg.format.package;
};
};
}) })
(mkIf cfg.extraDiagnostics.enable { (mkIf cfg.extraDiagnostics.enable {
vim.lsp.null-ls.enable = true; vim.diagnostics.nvim-lint = {
vim.lsp.null-ls.sources = diagnosticsToLua { enable = true;
lang = "ts"; linters_by_ft.typescript = cfg.extraDiagnostics.types;
config = cfg.extraDiagnostics.types;
inherit diagnosticsProviders; linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
}; };
}) })