NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-10-01 22:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

languages/helm: fix yaml-language-server integration

Browse source
This commit is contained in:
alfarel 2025-07-27 08:22:38 -04:00 • committed by Ching Pei Yang
commit 671b6d187b
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/release-notes/rl-0.8.md
View file

@ -289,6 +289,8 @@
- Fix [blink.cmp] breaking when built-in sources were modified. - Fix [blink.cmp] breaking when built-in sources were modified.
- Fix [conform.nvim] not allowing disabling formatting on and after save. Use - Fix [conform.nvim] not allowing disabling formatting on and after save. Use
`null` value to disable them if conform is enabled. `null` value to disable them if conform is enabled.
- Fix Helm-YAML language module integration. YAML diagnostics will now remain in
`helmfile`s when both are enabled.
[TheColorman](https://github.com/TheColorman): [TheColorman](https://github.com/TheColorman):

10
modules/plugins/languages/helm.nix
View file

@ -6,7 +6,7 @@
}: let }: let
inherit (builtins) attrNames head; inherit (builtins) attrNames head;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkDefault mkIf mkMerge;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.types) enum; inherit (lib.types) enum;
inherit (lib.nvim.types) mkGrammarOption singleOrListOf; inherit (lib.nvim.types) mkGrammarOption singleOrListOf;
@ -27,11 +27,13 @@
dynamicRegistration = true; dynamicRegistration = true;
}; };
}; };
settings = { settings = mkIf (yamlCfg.enable && yamlCfg.lsp.enable) {
helm-ls = { helm-ls = {
yamlls = { yamlls = {
# TODO: Determine if this is a good enough solution # Without this being enabled, the YAML language module will look broken in helmfiles
path = (head yamlCfg.lsp.servers).cmd; # if both modules are enabled at once.
enabled = mkDefault yamlCfg.lsp.enable;
path = head config.vim.lsp.servers.${head yamlCfg.lsp.servers}.cmd;
}; };
}; };
}; };