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/markdown.nix
View file

@ -11,7 +11,7 @@
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.types) bool enum listOf str nullOr;
inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.trivial) warn;
@ -46,7 +46,14 @@
};
};
defaultDiagnosticsProvider = ["markdownlint-cli2"];
diagnosticsProviders = ["markdownlint-cli2" "rumdl"];
diagnosticsProviders = {
markdownlint-cli2 = {
package = pkgs.markdownlint-cli2;
};
rumdl = {
package = pkgs.rumdl;
};
};
in {
options.vim.languages.markdown = {
enable = mkEnableOption "Markdown markup language support";
@ -139,15 +146,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Markdown diagnostics via nvim-lint"
mkEnableOption "extra Markdown diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Markdown diagnostics providers";
types = diagnostics {
langDesc = "Markdown";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -207,12 +214,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.markdown = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.markdown = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
};
})
]);