Unverified Commit 1a9bbc06 authored by Perchun Pak's avatar Perchun Pak
Browse files

neovim: check for pnames when asserting if two treesitters are installed 

Previously it evaluated `nvim-treesitter-legacy` derivation, which now
results in a warning. Checking for pname shouldn't raise this warning,
since now only plugins that are installed get evaluated.
parent 9e8521ef

pkgs/applications/editors/vim/plugins/utils/vim-utils.nix

+4 −2
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ let 
            paths = allGrammars;

          };



          allAndOptPluginNames = map (plugin: plugin.pname) (allPlugins ++ opt);



          packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" (

            if allGrammars != [ ] then allPlugins ++ [ allGrammarsSymlinked ] else allPlugins

          );
@@ -234,8 +236,8 @@ let 


        assert

          (

            builtins.elem vimPlugins.nvim-treesitter (opt ++ allPlugins)

            && builtins.elem vimPlugins.nvim-treesitter-legacy (opt ++ allPlugins)

            builtins.elem "nvim-treesitter" allAndOptPluginNames

            && builtins.elem "nvim-treesitter-legacy" allAndOptPluginNames

          )

          -> throw "You cannot include two different versions of nvim-treesitter, perhaps you included a legacy plugin together with a new one?";