fix(loader): source filetype.lua before plugins. Fixes #35

folke · Dec 20, 2022 · ffcd0ab · ffcd0ab
1 parent 9d12cdc
commit ffcd0ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lua/lazy/core/loader.lua b/lua/lazy/core/loader.lua
@@ -49,6 +49,13 @@ function M.startup()
 
   local rtp = vim.opt.rtp:get()
 
+  Util.track({ start = "filetype" })
+  local ft = vim.env.VIMRUNTIME .. "/filetype.lua"
+  Util.try(function()
+    vim.cmd("silent source " .. ft)
+  end, "Failed to source `" .. ft .. "`")
+  Util.track()
+
   -- load plugins from rtp, excluding after
   Util.track({ start = "rtp plugins" })
   for _, path in ipairs(rtp) do

diff --git a/lua/lazy/view/render.lua b/lua/lazy/view/render.lua
@@ -242,6 +242,7 @@ function M:reason(reason, opts)
     reason.runtime = reason.runtime:gsub(".*/([^/]+/plugin/.*)", "%1")
     reason.runtime = reason.runtime:gsub(".*/([^/]+/after/.*)", "%1")
     reason.runtime = reason.runtime:gsub(".*/([^/]+/ftdetect/.*)", "%1")
+    reason.runtime = reason.runtime:gsub(".*/(runtime/.*)", "%1")
   end
   local time = reason.time and (" " .. math.floor(reason.time / 1e6 * 100) / 100 .. "ms")
   if time and not opts.time_right then