NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-10-27 09:46:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix yaml-language-server and helm-ls integration (#1125)

Browse source 
* lib/languages: fix typo in server submodule

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a6964c495ef58a9572ae93715bacf694a6ff5

* wrapper/build: add option examples; put evaluated values in `literalExpression`

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I6a6a69648220a65886994d4cac67f634a61815d5

* languages/yaml: fix on_attach by using mkLuaInline

* languages/helm: fix yaml-language-server integration

* language/yaml: call default_on_attach in helm version

---------

Signed-off-by: NotAShelf <raf@notashelf.dev>
Co-authored-by: raf <raf@notashelf.dev>
This commit is contained in:
Ching Pei Yang 2025-09-23 22:46:17 +02:00 • committed by GitHub
commit 6447bdf013
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -289,6 +289,10 @@
- Fix [blink.cmp] breaking when built-in sources were modified.
- Fix [conform.nvim] not allowing disabling formatting on and after save. Use
`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.
- Fix YAML language module not activating LSP keybinds if the Helm language
module was also enabled.
[TheColorman](https://github.com/TheColorman):

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

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

13
modules/plugins/languages/yaml.nix
View file

@ -5,6 +5,7 @@
...
}: let
inherit (builtins) attrNames;
inherit (lib.generators) mkLuaInline;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe;
@ -14,16 +15,18 @@
cfg = config.vim.languages.yaml;
onAttach =
if config.vim.languages.helm.lsp.enable
on_attach = mkLuaInline (
if config.vim.languages.helm.lsp.enable && config.vim.languages.helm.enable
then ''
on_attach = function(client, bufnr)
function(client, bufnr)
default_on_attach()
local filetype = vim.bo[bufnr].filetype
if filetype == "helm" then
client.stop()
end
end''
else "on_attach = default_on_attach";
else "default_on_attach"
);
defaultServers = ["yaml-language-server"];
servers = {
@ -32,7 +35,7 @@
cmd = [(getExe pkgs.yaml-language-server) "--stdio"];
filetypes = ["yaml" "yaml.docker-compose" "yaml.gitlab" "yaml.helm-values"];
root_markers = [".git"];
on_attach = onAttach;
inherit on_attach;
# -- https://github.com/redhat-developer/vscode-redhat-telemetry#how-to-disable-telemetry-reporting
settings = {
redhat = {