mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-07-15 03:34:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

plugins: use mkSeverity where possible

Browse source
This commit is contained in:
Gaetan Lepage 2023-11-28 23:22:35 +01:00 • committed by Gaétan Lepage
parent e49bec3901
commit 290855ed3d
2 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plugins/filetrees/nvim-tree.nix
View file

@ -243,14 +243,12 @@ in {
error = helpers.defaultNullOpts.mkStr "" "";
};
severity = let
severityEnum = ["error" "warn" "info" "hint"];
in {
min = helpers.defaultNullOpts.mkEnum severityEnum "hint" ''
severity = {
min = helpers.defaultNullOpts.mkSeverity "hint" ''
Minimum severity for which the diagnostics will be displayed.
See `|diagnostic-severity|`.
'';
max = helpers.defaultNullOpts.mkEnum severityEnum "error" ''
max = helpers.defaultNullOpts.mkSeverity "error" ''
Maximum severity for which the diagnostics will be displayed.
See `|diagnostic-severity|`.
'';
@ -899,13 +897,12 @@ in {
show_on_dirs = showOnDirs;
show_on_open_dirs = showOnOpenDirs;
inherit icons;
severity =
mapAttrs (
name: value:
ifNonNull' value
(helpers.mkRaw "vim.diagnostic.severity.${strings.toUpper value}")
)
severity;
severity = with severity; {
inherit
min
max
;
};
};
git = with git; {
inherit enable;

17
plugins/none-ls/default.nix
View file

@ -109,14 +109,10 @@ in {
method, described in [BUILTIN_CONFIG](BUILTIN_CONFIG.md).
'';
fallbackSeverity =
helpers.defaultNullOpts.mkNullable
(with types; either int (enum ["error" "warn" "info" "hint"]))
"error"
''
Defines the severity used when a diagnostic source does not explicitly define a severity.
See `:help diagnostic-severity` for available values.
'';
fallbackSeverity = helpers.defaultNullOpts.mkSeverity "error" ''
Defines the severity used when a diagnostic source does not explicitly define a severity.
See `:help diagnostic-severity` for available values.
'';
logLevel =
helpers.defaultNullOpts.mkEnum ["off" "error" "warn" "info" "debug" "trace"] "warn"
@ -257,10 +253,7 @@ in {
default_timeout = defaultTimeout;
diagnostic_config = diagnosticConfig;
diagnostics_format = diagnosticsFormat;
fallback_severity =
if isString fallbackSeverity
then helpers.mkRaw "vim.diagnostic.severity.${strings.toUpper fallbackSeverity}"
else fallbackSeverity;
fallback_severity = fallbackSeverity;
log_level = logLevel;
notify_format = notifyFormat;
on_attach = helpers.mkRaw onAttach';