tests/modules/performance/combine-plugins: restore test functionality

Replace test plugins to those that reflect the intention for the test.
This commit is contained in:
Stanislav Asunkin 2025-04-27 12:39:11 +03:00
parent faa31d994c
commit 014b143f6a

View file

@ -62,17 +62,17 @@ in
{ {
performance.combinePlugins.enable = true; performance.combinePlugins.enable = true;
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
# Depends on nvim-cmp # Depends on nui-nvim
cmp-dictionary noice-nvim
# Depends on telescope-nvim which itself depends on plenary-nvim # Depends on null-ls-nvim which itself depends on plenary-nvim
telescope-undo-nvim mason-null-ls-nvim
]; ];
extraConfigLuaPost = '' extraConfigLuaPost = ''
-- Plugins and its dependencies are loadable -- Plugins and its dependencies are loadable
require("cmp_dictionary") require("noice")
require("cmp") require("nui.popup")
require("telescope-undo") require("mason-null-ls.settings") -- Avoid calling deprecated functions
require("telescope") require("null-ls.helpers") -- Avoid calling deprecated functions
require("plenary") require("plenary")
''; '';
assertions = [ assertions = [
@ -155,7 +155,7 @@ in
# Optional plugin with dependency on plenary-nvim # Optional plugin with dependency on plenary-nvim
# Dependencies should not be duplicated # Dependencies should not be duplicated
{ {
plugin = telescope-nvim; plugin = none-ls-nvim;
optional = true; optional = true;
} }
]; ];
@ -167,16 +167,16 @@ in
-- Opt plugins are not loadable -- Opt plugins are not loadable
local ok = pcall(require, "nvim-treesitter") local ok = pcall(require, "nvim-treesitter")
assert(not ok, "nvim-treesitter plugin is loadable") assert(not ok, "nvim-treesitter plugin is loadable")
ok = pcall(require, "telescope") ok = pcall(require, "null-ls")
assert(not ok, "telescope-nvim plugin is loadable") assert(not ok, "null-ls-nvim plugin is loadable")
-- Load plugins -- Load plugins
vim.cmd.packadd("nvim-treesitter") vim.cmd.packadd("nvim-treesitter")
vim.cmd.packadd("telescope.nvim") vim.cmd.packadd("none-ls.nvim")
-- Now opt plugins are loadable -- Now opt plugins are loadable
require("nvim-treesitter") require("nvim-treesitter")
require("telescope") require("null-ls")
-- Only one copy of plenary-nvim should be available -- Only one copy of plenary-nvim should be available
assert( assert(
@ -321,17 +321,17 @@ in
# By package itself # By package itself
nvim-lspconfig nvim-lspconfig
# Its dependency, plenary-nvim, not in this list, so will be combined # Its dependency, plenary-nvim, not in this list, so will be combined
telescope-nvim none-ls-nvim
# Dependency of other plugin # Dependency of other plugin
"nvim-cmp" "nui.nvim"
]; ];
}; };
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
nvim-treesitter nvim-treesitter
nvim-lspconfig nvim-lspconfig
telescope-nvim none-ls-nvim
# Only its dependency (nvim-cmp) won't be combined, but not the plugin itself # Only its dependency (nui-nvim) won't be combined, but not the plugin itself
cmp-dictionary noice-nvim
# More plugins # More plugins
gitsigns-nvim gitsigns-nvim
luasnip luasnip
@ -340,10 +340,10 @@ in
-- Plugins are loadable -- Plugins are loadable
require("nvim-treesitter") require("nvim-treesitter")
require("lspconfig") require("lspconfig")
require("telescope") require("null-ls")
require("plenary") require("plenary")
require("cmp_dictionary") require("noice")
require("cmp") require("nui.popup")
require("gitsigns") require("gitsigns")
require("luasnip") require("luasnip")
@ -357,18 +357,17 @@ in
-- Standalone plugins -- Standalone plugins
assert(is_standalone("nvim-treesitter"), "nvim-treesitter is combined, expected standalone") assert(is_standalone("nvim-treesitter"), "nvim-treesitter is combined, expected standalone")
assert(is_standalone("lspconfig"), "nvim-lspconfig is combined, expected standalone") assert(is_standalone("lspconfig"), "nvim-lspconfig is combined, expected standalone")
assert(is_standalone("telescope"), "telescope-nvim is combined, expected standalone") assert(is_standalone("null-ls", "none-ls.nvim"), "none-ls-nvim is combined, expected standalone")
-- Add trailing slash to ensure that it doesn't match cmp_dictionary assert(is_standalone("nui"), "nui-nvim is combined, expected standalone")
assert(is_standalone("cmp/", "nvim-cmp"), "nvim-cmp is combined, expected standalone")
-- Combined plugins -- Combined plugins
assert(not is_standalone("plenary"), "plenary-nvim is standalone, expected combined") assert(not is_standalone("plenary"), "plenary-nvim is standalone, expected combined")
assert(not is_standalone("cmp_dictionary", "cmp-dictionary"), "cmp-dictionary is standalone, expected combined") assert(not is_standalone("noice"), "noice-nvim is standalone, expected combined")
assert(not is_standalone("gitsigns"), "gitsigns-nvim is standalone, expected combined") assert(not is_standalone("gitsigns"), "gitsigns-nvim is standalone, expected combined")
assert(not is_standalone("luasnip"), "luasnip is standalone, expected combined") assert(not is_standalone("luasnip"), "luasnip is standalone, expected combined")
''; '';
assertions = [ assertions = [
{ {
# plugin-pack, nvim-treesitter, nvim-lspconfig, telescope-nvim, nvim-cmp # plugin-pack, nvim-treesitter, nvim-lspconfig, none-ls-nvim, nui-nvim
assertion = pluginCount config.build.nvimPackage config.build.extraFiles "start" == 5; assertion = pluginCount config.build.nvimPackage config.build.extraFiles "start" == 5;
message = "Wrong number of plugins in packpathDirs"; message = "Wrong number of plugins in packpathDirs";
} }