From 3a1a10cd75b47f2aae1f843286cc17d8a780dff1 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 29 Dec 2022 16:03:23 +0100
Subject: [PATCH] fix(loader): implemented correct adding to rtp. fix #230, fix
 #226

---
 lua/lazy/core/config.lua |  2 +-
 lua/lazy/core/loader.lua | 38 ++++++++++++++++++++++++++++++++------
 lua/lazy/init.lua        |  2 +-
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/lua/lazy/core/config.lua b/lua/lazy/core/config.lua
index f85e5c1..508ed22 100644
--- a/lua/lazy/core/config.lua
+++ b/lua/lazy/core/config.lua
@@ -182,8 +182,8 @@ function M.setup(spec, opts)
   M.me = Util.norm(vim.fn.fnamemodify(M.me, ":p:h:h:h:h"))
   if M.options.performance.rtp.reset then
     vim.opt.rtp = {
-      M.me,
       vim.fn.stdpath("config"),
+      M.me,
       vim.env.VIMRUNTIME,
       vim.fn.fnamemodify(vim.v.progpath, ":p:h:h") .. "/lib/nvim",
       vim.fn.stdpath("config") .. "/after",
diff --git a/lua/lazy/core/loader.lua b/lua/lazy/core/loader.lua
index 3594114..61e55da 100644
--- a/lua/lazy/core/loader.lua
+++ b/lua/lazy/core/loader.lua
@@ -80,7 +80,7 @@ function M.startup()
   end
   Util.track()
 
-  -- 3. load plugins from rtp, excluding after
+  -- 3. load plugins from the original rtp, excluding after
   Util.track({ start = "rtp plugins" })
   for _, path in ipairs(rtp) do
     if not path:find("after/?$") then
@@ -172,11 +172,7 @@ function M._load(plugin, reason)
   Util.track({ plugin = plugin.name, start = reason.start })
   Handler.disable(plugin)
 
-  vim.opt.runtimepath:prepend(plugin.dir)
-  local after = plugin.dir .. "/after"
-  if vim.loop.fs_stat(after) then
-    vim.opt.runtimepath:append(after)
-  end
+  M.add_to_rtp(plugin)
 
   if plugin.dependencies then
     Util.try(function()
@@ -271,6 +267,36 @@ function M.source_runtime(...)
   end
 end
 
+-- This does the same as runtime.c:add_pack_dir_to_rtp
+-- * find first after
+-- * find lazy pack path
+-- * insert right after lazy pack path or right before first after or at the end
+-- * insert after dir right before first after or append to the end
+---@param plugin LazyPlugin
+function M.add_to_rtp(plugin)
+  local rtp = vim.api.nvim_get_runtime_file("", true)
+  local idx_dir, idx_after
+
+  for i, path in ipairs(rtp) do
+    if path == Config.me then
+      idx_dir = i + 1
+    elseif not idx_after and path:sub(-6, -1) == "/after" then
+      idx_after = i + 1 -- +1 to offset the insert of the plugin dir
+      idx_dir = idx_dir or i
+      break
+    end
+  end
+
+  table.insert(rtp, idx_dir or (#rtp + 1), plugin.dir)
+
+  local after = plugin.dir .. "/after"
+  if vim.loop.fs_stat(after) then
+    table.insert(rtp, idx_after or (#rtp + 1), after)
+  end
+
+  vim.opt.rtp = rtp
+end
+
 function M.source(path)
   Util.track({ runtime = path })
   Util.try(function()
diff --git a/lua/lazy/init.lua b/lua/lazy/init.lua
index bfb475e..5ea6528 100644
--- a/lua/lazy/init.lua
+++ b/lua/lazy/init.lua
@@ -77,7 +77,7 @@ function M.bootstrap()
       lazypath,
     })
   end
-  vim.opt.runtimepath:prepend(lazypath)
+  vim.opt.rtp:prepend(lazypath)
 end
 
 ---@return LazyPlugin[]