aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim/loader.lua
diff options
context:
space:
mode:
authorJongwook Choi <wookayin@gmail.com>2024-02-12 21:38:37 -0500
committerLewis Russell <me@lewisr.dev>2024-02-13 10:29:22 +0000
commit89135cff030b06f60cd596a9ae81cd9583987517 (patch)
tree4c7b32f5b90133b7149b24bf121e99b6324b6c6e /runtime/lua/vim/loader.lua
parent309c36d3c9f80e2999b8a66c8a2a1ea640e84562 (diff)
downloadrneovim-89135cff030b06f60cd596a9ae81cd9583987517.tar.gz
rneovim-89135cff030b06f60cd596a9ae81cd9583987517.tar.bz2
rneovim-89135cff030b06f60cd596a9ae81cd9583987517.zip
fix(loader): remove cyclic dependency on vim.fs (when --luamod-dev)
Problem: Loading `vim.fs` via the `vim.loader` Lua package loader will result in a stack overflow due to a cyclic dependency. This may happen when the `vim.fs` module isn't byte-compiled, i.e. when `--luamod-dev` is used (#27413). Solution: `vim.loader` depends on `vim.fs`. Therefore `vim.fs` should be loaded in advance.
Diffstat (limited to 'runtime/lua/vim/loader.lua')
-rw-r--r--runtime/lua/vim/loader.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index b77251cf7e..ec99e417c2 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -1,3 +1,4 @@
+local fs = vim.fs -- "vim.fs" is a dependency, so must be loaded early.
local uv = vim.uv
local uri_encode = vim.uri_encode --- @type function
@@ -63,7 +64,7 @@ function Loader.get_hash(path)
end
local function normalize(path)
- return vim.fs.normalize(path, { expand_env = false })
+ return fs.normalize(path, { expand_env = false })
end
--- Gets the rtp excluding after directories.
@@ -432,7 +433,7 @@ end
function Loader.lsmod(path)
if not Loader._indexed[path] then
Loader._indexed[path] = {}
- for name, t in vim.fs.dir(path .. '/lua') do
+ for name, t in fs.dir(path .. '/lua') do
local modpath = path .. '/lua/' .. name
-- HACK: type is not always returned due to a bug in luv
t = t or Loader.get_hash(modpath).type