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

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

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