From 50c145466330c0c5b272fd3904b5655a1613149c Mon Sep 17 00:00:00 2001
From: Birdee <85372418+BirdeeHub@users.noreply.github.com>
Date: Sat, 17 Aug 2024 04:51:27 -0700
Subject: [PATCH] fix: altered loading order for startup plugins (#49)

some minor order changes to require('lz.n').load

This change is mostly to prevent issues with people doing
less-adviseable things such as calling trigger_load from places.

This ensures startup plugins have the same environment that the lazy ones do.

Namely, the ability to call trigger_load with a name instead of only being able to call trigger_load with a plugin spec, due to the plugin not yet being in state.
---
 lua/lz/n/init.lua | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lua/lz/n/init.lua b/lua/lz/n/init.lua
index 12d1984..8b28d22 100644
--- a/lua/lz/n/init.lua
+++ b/lua/lz/n/init.lua
@@ -30,8 +30,9 @@ function M.load(spec)
     local spec_mod = require("lz.n.spec")
     local is_single_plugin_spec = spec_mod.is_single_plugin_spec(spec)
     local plugins = spec_mod.parse(spec)
-    require("lz.n.loader").load_startup_plugins(plugins)
 
+    -- add to state before loading anything, to prevent multiple loads being called
+    -- from within other eager plugin specs
     local state = require("lz.n.state")
     if is_single_plugin_spec then
         local ok, updated_plugins = pcall(vim.tbl_deep_extend, "error", state.plugins, plugins)
@@ -53,7 +54,17 @@ function M.load(spec)
         end
         state.plugins = plugins
     end
+
+    -- calls handler add functions
     require("lz.n.handler").init(plugins)
+
+    -- because this calls the handler's del functions,
+    -- this should be ran after the handlers are given the plugin.
+    -- even if the plugin isnt supposed to have been added to any of them
+    require("lz.n.loader").load_startup_plugins(plugins)
+    -- in addition, this allows even startup plugins to call
+    -- require('lz.n').trigger_load('someplugin') safely
+
     if vim.v.vim_did_enter == 1 then
         deferred_ui_enter()
     elseif not vim.g.lz_n_did_create_deferred_ui_enter_autocmd then