NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-02-12 20:13:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vala: making formatter work

Browse source
This commit is contained in:
Soliprem 2024-11-03 13:26:57 +01:00
parent 438ea0939e
commit 76c7d35895
1 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
modules/plugins/languages/vala.nix
View file

@ -7,11 +7,10 @@
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.nvim.languages) diagnosticsToLua;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.lists) isList;
inherit (lib.types) enum either listOf package str; inherit (lib.types) enum either listOf package str;
inherit (lib.nvim.types) mkGrammarOption diagnostics; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.lua) expToLua;
cfg = config.vim.languages.vala; cfg = config.vim.languages.vala;
@ -19,8 +18,10 @@
defaultServer = "vala_ls"; defaultServer = "vala_ls";
servers = { servers = {
vala_ls = { vala_ls = {
package = pkgs.vala-language-server; package = pkgs.writeShellScriptBin "vala-language-server-wrapper" ''
runtimeInputs = pkgs.uncrustify; export PATH="${lib.makeBinPath [pkgs.uncrustify]}:$PATH"
exec ${pkgs.vala-language-server}/bin/vala-language-server "$@"
'';
internalFormatter = true; internalFormatter = true;
lspConfig = '' lspConfig = ''
lspconfig.vala_ls.setup { lspconfig.vala_ls.setup {
@ -29,27 +30,12 @@
cmd = ${ cmd = ${
if isList cfg.lsp.package if isList cfg.lsp.package
then expToLua 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 { in {
options.vim.languages.vala = { options.vim.languages.vala = {
enable = mkEnableOption "Vala language support"; enable = mkEnableOption "Vala language support";
@ -74,15 +60,6 @@ in {
default = servers.${cfg.lsp.server}.package; 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 [ config = mkIf cfg.enable (mkMerge [
@ -91,15 +68,6 @@ in {
vim.treesitter.grammars = [cfg.treesitter.package]; 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 { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.lspconfig.enable = true;
vim.lsp.lspconfig.sources.vala_ls = servers.${cfg.lsp.server}.lspConfig; vim.lsp.lspconfig.sources.vala_ls = servers.${cfg.lsp.server}.lspConfig;