mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-07-03 13:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

plugins/illuminate: fix filetypeOverrides option

Browse source
This commit is contained in:
Gaetan Lepage 2023-12-29 10:52:16 +01:00 • committed by Gaétan Lepage
parent acc9c8cad1
commit 3b9fa101fb
2 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

30
plugins/utils/illuminate.nix
View file

@ -73,21 +73,10 @@ in {
package = mkPackageOption "vim-illuminate" pkgs.vimPlugins.vim-illuminate; package = mkPackageOption "vim-illuminate" pkgs.vimPlugins.vim-illuminate;
filetypeOverrides = mkOption { filetypeOverrides = helpers.defaultNullOpts.mkAttrsOf (types.submodule {options = commonOptions;}) "{}" ''
type = types.listOf (types.submodule { Filetype specific overrides.
options = { The keys are strings to represent the filetype.
filetype = defaultNullOpts.mkStr "" '' '';
Filetype to override
'';
overrides = commonOptions;
};
});
description = ''
Filetype specific overrides.
'';
default = [];
};
largeFileOverrides = mkOption { largeFileOverrides = mkOption {
type = types.submodule { type = types.submodule {
@ -126,10 +115,13 @@ in {
{ {
large_file_overrides = (commonSetupOptions largeFileOverrides) // (filetypeSetupOptions largeFileOverrides); large_file_overrides = (commonSetupOptions largeFileOverrides) // (filetypeSetupOptions largeFileOverrides);
filetype_overrides = let filetype_overrides =
override = attr: {${attr.filetype} = commonSetupOptions attr.overrides;}; helpers.ifNonNull' filetypeOverrides
in (
map override filetypeOverrides; mapAttrs
(_: commonSetupOptions)
filetypeOverrides
);
} }
// (filetypeSetupOptions cfg) // (filetypeSetupOptions cfg)
// (commonSetupOptions cfg); // (commonSetupOptions cfg);

15
tests/test-sources/plugins/utils/illuminate.nix
View file

@ -16,15 +16,12 @@
minCountToHighlight = 2; minCountToHighlight = 2;
filetypesDenylist = ["csharp"]; filetypesDenylist = ["csharp"];
filetypesAllowlist = ["python"]; filetypesAllowlist = ["python"];
filetypeOverrides = [ filetypeOverrides = {
{ x = {
filetype = "c"; delay = 10;
overrides = { providers = ["treesitter"];
delay = 10; };
providers = ["treesitter"]; };
};
}
];
largeFileOverrides = { largeFileOverrides = {
delay = 20; delay = 20;
underCursor = true; underCursor = true;