Skip to content

Commit a351f98

Browse files
authored
fix(wrapperModules.neovim): match treesitter changes from nixpkgs (#196)
collateGrammars setting now uses the new heuristic (old one left for backwards compat, but will be removed some months from now)
1 parent e9252bf commit a351f98

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

wrapperModules/n/neovim/default-config.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,13 @@
188188
v.value.collateGrammars or false
189189
&& v.value.data or null != null
190190
&& !builtins.isString v.value.data
191-
&&
192-
builtins.match "^vimplugin-(nvim-)?treesitter-(grammar|queries)-.*" (lib.getName v.value.data)
193-
!= null;
191+
&& (
192+
v.value.data.passthru.isTreesitterGrammar or false == true
193+
|| v.value.data.passthru.isTreesitterQuery or false == true
194+
||
195+
builtins.match "^vimplugin-(nvim-)?treesitter-(grammar|queries)-.*" (lib.getName v.value.data)
196+
!= null
197+
);
194198
in
195199
{
196200
grams = acc.grams ++ lib.optional isGram v.value.data;

0 commit comments

Comments
 (0)