mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-21 00:25:42 +02:00
modules/filetype: ensure that the module does not set empty settings
When setting any filetype suboption to null (or anything else guarded by mkIf) it's value becomes: { extension = null; filename = null; pattern = null; } Account for that case in mkIf condition so that the option would not produce empty filetype definition.
This commit is contained in:
parent
d2f733efb4
commit
34aa3e00e7
2 changed files with 24 additions and 3 deletions
|
@ -6,6 +6,8 @@
|
|||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.filetype;
|
||||
|
||||
filetypeDefinition = helpers.mkNullOrOption (
|
||||
with types;
|
||||
attrsOf (oneOf [
|
||||
|
@ -52,7 +54,9 @@ in
|
|||
pattern = filetypeDefinition "set filetypes matching the specified pattern";
|
||||
};
|
||||
|
||||
config.extraConfigLua = helpers.mkIfNonNull' config.filetype ''
|
||||
vim.filetype.add(${helpers.toLuaObject config.filetype})
|
||||
'';
|
||||
config.extraConfigLua =
|
||||
lib.mkIf (cfg != null && (builtins.any (v: v != null) (builtins.attrValues cfg)))
|
||||
''
|
||||
vim.filetype.add(${helpers.toLuaObject cfg})
|
||||
'';
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue