mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-17 22:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(vim.loader): randomized AppImage path pollutes luac cache #36944

Browse Source 
different approach to 78bbe53f76
This commit is contained in:
Shmerl
2025-12-14 13:46:53 -05:00
committed by GitHub
parent 8c7023b7b3
commit 1363ef7d50
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/lua/vim/loader.lua
View File

@@ -79,15 +79,7 @@ local function fs_stat_cached(path)
end end
local function normalize(path) local function normalize(path)
path = fs.normalize(path, { expand_env = false, _fast = true }) return fs.normalize(path, { expand_env = false, _fast = true })
if is_appimage then
-- Avoid cache pollution caused by AppImage randomizing the program root. #31165
-- "/tmp/.mount_nvimAmpHPH/usr/share/nvim/runtime" => "/usr/share/nvim/runtime"
path = path:match('(/usr/.*)') or path
end
return path
end end
local rtp_cached = {} --- @type string[] local rtp_cached = {} --- @type string[]
@@ -125,6 +117,12 @@ end
--- @param name string can be a module name, or a file name --- @param name string can be a module name, or a file name
--- @return string file_name --- @return string file_name
local function cache_filename(name) local function cache_filename(name)
if is_appimage then
-- Avoid cache pollution caused by AppImage randomizing the program root. #31165
-- "/tmp/.mount_nvimAmpHPH/usr/share/nvim/runtime" => "/usr/share/nvim/runtime"
name = name:match('(/usr/.*)') or name
end
local ret = ('%s/%s'):format(M.path, uri_encode(name, 'rfc2396')) local ret = ('%s/%s'):format(M.path, uri_encode(name, 'rfc2396'))
return ret:sub(-4) == '.lua' and (ret .. 'c') or (ret .. '.luac') return ret:sub(-4) == '.lua' and (ret .. 'c') or (ret .. '.luac')
end end