mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 08:35:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nvim-lsp: fix package option (null) + test

Browse source
This commit is contained in:
Gaetan Lepage 2023-05-22 11:28:18 +02:00 • committed by Gaétan Lepage
parent a3f79b313b
commit eee375e97e
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/lsp/helpers.nix
View file

@ -101,7 +101,11 @@
mkIf cfg.enable mkIf cfg.enable
{ {
extraPackages = extraPackages =
(optional (package != null) cfg.package) (
optional
((package != null) && (cfg.package != null))
cfg.package
)
++ (mapAttrsToList (name: _: cfg."${name}Package") extraPackages); ++ (mapAttrsToList (name: _: cfg."${name}Package") extraPackages);
plugins.lsp.enabledServers = [ plugins.lsp.enabledServers = [

5
tests/test-sources/plugins/lsp/nvim-lsp.nix
View file

@ -31,6 +31,11 @@
print('The clangd language server has been attached !') print('The clangd language server has been attached !')
''; '';
}; };
# Do not install the language server using nixvim
gopls = {
enable = true;
package = null;
};
nil_ls.enable = true; nil_ls.enable = true;
rust-analyzer.enable = true; rust-analyzer.enable = true;
ruff-lsp = { ruff-lsp = {