From 18d1c1b47e175cd58dc12bf4792ef4e9a50505fa Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 21 Jul 2024 12:41:54 +0200
Subject: [PATCH] fix(loader): add auto loaded module to package.loaded early
 to prevent require loops

---
 lua/lazy/core/loader.lua | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lua/lazy/core/loader.lua b/lua/lazy/core/loader.lua
index c5cdca2..ac53690 100644
--- a/lua/lazy/core/loader.lua
+++ b/lua/lazy/core/loader.lua
@@ -552,15 +552,16 @@ function M.loader(modname)
   end
 
   if ret then
-    M.auto_load(modname, ret.modpath)
     local mod = package.loaded[modname]
-    if type(mod) == "table" then
-      return function()
-        return mod
-      end
+    if type(mod) ~= "table" then
+      mod = loadfile(ret.modpath, nil, nil, ret.stat)()
     end
+    package.loaded[modname] = mod
+    M.auto_load(modname, ret.modpath)
     -- selene: allow(incorrect_standard_library_use)
-    return loadfile(ret.modpath, nil, nil, ret.stat)
+    return function()
+      return mod
+    end
   end
 end