aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim/fs.lua
diff options
context:
space:
mode:
authorGustav Eikaas <46537983+GustavEikaas@users.noreply.github.com>2024-12-31 16:40:05 +0100
committerGitHub <noreply@github.com>2024-12-31 07:40:05 -0800
commit0bef3b911cc262a007fb4412d864c1832d1268ad (patch)
tree0f9e53d86a429388021931b7541250aa03f86986 /runtime/lua/vim/fs.lua
parentb3bdba5cb10f9f0f1f2b40ff40e807f8a22f65c1 (diff)
downloadrneovim-0bef3b911cc262a007fb4412d864c1832d1268ad.tar.gz
rneovim-0bef3b911cc262a007fb4412d864c1832d1268ad.tar.bz2
rneovim-0bef3b911cc262a007fb4412d864c1832d1268ad.zip
fix(vim.fs): joinpath() does not normalize slashes on Windows #31782
Diffstat (limited to 'runtime/lua/vim/fs.lua')
-rw-r--r--runtime/lua/vim/fs.lua11
1 files changed, 8 insertions, 3 deletions
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index f2cd210cac..1b774d5cab 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -105,14 +105,19 @@ function M.basename(file)
return file:match('/$') and '' or (file:match('[^/]*$'))
end
---- Concatenate directories and/or file paths into a single path with normalization
---- (e.g., `"foo/"` and `"bar"` get joined to `"foo/bar"`)
+--- Concatenates partial paths into one path. Slashes are normalized (redundant slashes are removed, and on Windows backslashes are replaced with forward-slashes)
+--- (e.g., `"foo/"` and `"/bar"` get joined to `"foo/bar"`)
+--- (windows: e.g `"a\foo\"` and `"\bar"` are joined to `"a/foo/bar"`)
---
---@since 12
---@param ... string
---@return string
function M.joinpath(...)
- return (table.concat({ ... }, '/'):gsub('//+', '/'))
+ local path = table.concat({ ... }, '/')
+ if iswin then
+ path = path:gsub('\\', '/')
+ end
+ return (path:gsub('//+', '/'))
end
---@alias Iterator fun(): string?, string?