NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-06-15 00:56:54 +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

33
modules/plugins/languages/kotlin.nix
View file

@ -6,9 +6,11 @@
}: let
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe;
inherit (lib) genAttrs;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.kotlin;
@ -16,7 +18,11 @@
servers = ["kotlin-language-server"];
defaultDiagnosticsProvider = ["ktlint"];
diagnosticsProviders = ["ktlint"];
diagnosticsProviders = {
ktlint = {
package = pkgs.ktlint;
};
};
in {
options.vim.languages.kotlin = {
enable = mkEnableOption "Kotlin/HCL support";
@ -47,16 +53,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Kotlin diagnostics via nvim-lint"
mkEnableOption "extra Kotlin diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Kotlin diagnostics providers";
types = diagnostics {
langDesc = "Kotlin";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -67,12 +73,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.kotlin = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.kotlin = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
};
})