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

plugins/nvim-lsp: fix extraSettings option warning (#353)

Browse source
This commit is contained in:
Gaétan Lepage 2023-04-28 22:47:34 +02:00 • committed by GitHub
parent 3014192cdc
commit d0383da7f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plugins/nvim-lsp/helpers.nix
View file

@ -79,7 +79,6 @@
settings = settingsOptions; settings = settingsOptions;
extraSettings = mkOption { extraSettings = mkOption {
default = {};
type = types.attrs; type = types.attrs;
description = '' description = ''
Extra settings for the ${name} language server. Extra settings for the ${name} language server.
@ -95,7 +94,10 @@
// packageOption; // packageOption;
}; };
config = config = let
extraSettingsOption = options.plugins.lsp.servers.${name}.extraSettings;
extraSettingsAreDefined = extraSettingsOption.isDefined;
in
mkIf cfg.enable mkIf cfg.enable
{ {
extraPackages = extraPackages =
@ -118,17 +120,20 @@
end end
'' ''
); );
settings = (settings cfg.settings) // cfg.extraSettings; settings =
(settings cfg.settings)
// (
if extraSettingsAreDefined
then cfg.extraSettings
else {}
);
} }
// cfg.extraOptions; // cfg.extraOptions;
} }
]; ];
warnings = let warnings =
extraSettingsOption = options.plugins.lsp.servers.${name}.extraSettings; optional extraSettingsAreDefined
in
optional
(extraSettingsOption.isDefined)
( (
let let
optionPrefix = "plugins.lsp.servers.${name}"; optionPrefix = "plugins.lsp.servers.${name}";