NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-06-14 08:36:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Factor out diagnostics like LSPs"

Browse source
This commit is contained in:
Ching Pei Yang 2026-06-12 22:22:21 +02:00 • committed by GitHub
commit 6cddf8560b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
55 changed files with 662 additions and 1023 deletions
Download patch file Download diff file Expand all files Collapse all files

34
modules/plugins/languages/toml.nix
View file

@ -10,7 +10,7 @@
inherit (lib.modules) mkIf mkMerge;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.toml;
@ -39,7 +39,12 @@
};
};
defaultDiagnosticsProvider = ["tombi"];
diagnosticsProviders = ["tombi" "taplo"];
diagnosticsProviders = {
tombi = {
package = pkgs.tombi;
args = ["lint"];
};
};
in {
options.vim.languages.toml = {
enable = mkEnableOption "TOML configuration language support";
@ -86,15 +91,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra TOML diagnostics via nvim-lint"
mkEnableOption "extra TOML diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra TOML diagnostics providers";
types = diagnostics {
langDesc = "TOML";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -132,12 +137,15 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.toml = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.toml = cfg.extraDiagnostics.types;
linters = mkMerge (
map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types
);
};
})
]);