From 76c7d358950b9cf282a18359ee5e399e35fbf296 Mon Sep 17 00:00:00 2001 From: Soliprem Date: Sun, 3 Nov 2024 13:26:57 +0100 Subject: [PATCH 1/4] vala: making formatter work --- modules/plugins/languages/vala.nix | 44 ++++-------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix index 58955fa7..a708c191 100644 --- a/modules/plugins/languages/vala.nix +++ b/modules/plugins/languages/vala.nix @@ -7,11 +7,10 @@ inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe; - inherit (lib.nvim.languages) diagnosticsToLua; inherit (lib.modules) mkIf mkMerge; inherit (lib.lists) isList; inherit (lib.types) enum either listOf package str; - inherit (lib.nvim.types) mkGrammarOption diagnostics; + inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.lua) expToLua; cfg = config.vim.languages.vala; @@ -19,8 +18,10 @@ defaultServer = "vala_ls"; servers = { vala_ls = { - package = pkgs.vala-language-server; - runtimeInputs = pkgs.uncrustify; + package = pkgs.writeShellScriptBin "vala-language-server-wrapper" '' + export PATH="${lib.makeBinPath [pkgs.uncrustify]}:$PATH" + exec ${pkgs.vala-language-server}/bin/vala-language-server "$@" + ''; internalFormatter = true; lspConfig = '' lspconfig.vala_ls.setup { @@ -29,27 +30,12 @@ cmd = ${ if isList cfg.lsp.package then expToLua cfg.lsp.package - else ''{"${cfg.lsp.package}/bin/vala-language-server"}'' + else ''{"${cfg.lsp.package}/bin/vala-language-server-wrapper"}'' }, } ''; }; }; - - defaultDiagnosticsProvider = ["vala-lint"]; - diagnosticsProviders = { - vala-lint = { - package = pkgs.vala-lint; - nullConfig = pkg: '' - table.insert( - ls_sources, - null_ls.builtins.diagnostics.vala_lint.with({ - command = "${getExe pkg}", - }) - ) - ''; - }; - }; in { options.vim.languages.vala = { enable = mkEnableOption "Vala language support"; @@ -74,15 +60,6 @@ in { default = servers.${cfg.lsp.server}.package; }; }; - - extraDiagnostics = { - enable = mkEnableOption "extra Vala diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; - types = diagnostics { - langDesc = "Vala"; - inherit diagnosticsProviders; - inherit defaultDiagnosticsProvider; - }; - }; }; config = mkIf cfg.enable (mkMerge [ @@ -91,15 +68,6 @@ in { vim.treesitter.grammars = [cfg.treesitter.package]; }) - (mkIf cfg.extraDiagnostics.enable { - vim.lsp.null-ls.enable = true; - vim.lsp.null-ls.sources = diagnosticsToLua { - lang = "Vala"; - config = cfg.extraDiagnostics.types; - inherit diagnosticsProviders; - }; - }) - (mkIf cfg.lsp.enable { vim.lsp.lspconfig.enable = true; vim.lsp.lspconfig.sources.vala_ls = servers.${cfg.lsp.server}.lspConfig; From f6d3a11f33fe7aff285c0f2c293cb8bc9d073f7e Mon Sep 17 00:00:00 2001 From: Soliprem Date: Sun, 3 Nov 2024 13:27:57 +0100 Subject: [PATCH 2/4] vala: cleaning up useless import --- modules/plugins/languages/vala.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix index a708c191..3e77320b 100644 --- a/modules/plugins/languages/vala.nix +++ b/modules/plugins/languages/vala.nix @@ -6,7 +6,6 @@ }: let inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption; - inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.lists) isList; inherit (lib.types) enum either listOf package str; From 8eb4f87969687392b65418c36452007d4e288664 Mon Sep 17 00:00:00 2001 From: Soliprem Date: Sun, 3 Nov 2024 19:44:35 +0100 Subject: [PATCH 3/4] vala: wrapping uncrustify --- modules/plugins/languages/vala.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix index 3e77320b..da65a372 100644 --- a/modules/plugins/languages/vala.nix +++ b/modules/plugins/languages/vala.nix @@ -17,10 +17,15 @@ defaultServer = "vala_ls"; servers = { vala_ls = { - package = pkgs.writeShellScriptBin "vala-language-server-wrapper" '' - export PATH="${lib.makeBinPath [pkgs.uncrustify]}:$PATH" - exec ${pkgs.vala-language-server}/bin/vala-language-server "$@" - ''; + package = pkgs.symlinkJoin { + name = "vala-language-server-wrapper"; + paths = [pkgs.vala-language-server]; + buildInputs = [pkgs.makeBinaryWrapper]; + postBuild = '' + wrapProgram $out/bin/vala-language-server \ + --prefix PATH : ${pkgs.uncrustify}/bin + ''; + }; internalFormatter = true; lspConfig = '' lspconfig.vala_ls.setup { @@ -29,7 +34,7 @@ cmd = ${ if isList cfg.lsp.package then expToLua cfg.lsp.package - else ''{"${cfg.lsp.package}/bin/vala-language-server-wrapper"}'' + else ''{"${cfg.lsp.package}/bin/vala-language-server"}'' }, } ''; @@ -54,7 +59,6 @@ in { package = mkOption { description = "Vala LSP server package, or the command to run as a list of strings"; - example = ''[lib.getExe pkgs.vala-language-server]''; type = either package (listOf str); default = servers.${cfg.lsp.server}.package; }; From 896db7175765965b773aa0335517dcc4249ae63f Mon Sep 17 00:00:00 2001 From: Soliprem Date: Sun, 3 Nov 2024 19:50:35 +0100 Subject: [PATCH 4/4] vala: added changelog entry --- docs/release-notes/rl-0.7.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md index 351a0dc5..87df91e7 100644 --- a/docs/release-notes/rl-0.7.md +++ b/docs/release-notes/rl-0.7.md @@ -292,6 +292,7 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to - Add LSP, diagnostics, formatter and Treesitter support for Kotlin under `vim.languages.kotlin` - changed default keybinds for leap.nvim to avoid altering expected behavior +- Add LSP, formatter and Treesitter support for Vala under `vim.languages.vala` [Bloxx12](https://github.com/Bloxx12)