diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/lua.txt | 7 | ||||
| -rw-r--r-- | runtime/lua/vim/fs.lua | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt index a2a83ef229..022adb3da7 100644 --- a/runtime/doc/lua.txt +++ b/runtime/doc/lua.txt @@ -3062,8 +3062,11 @@ vim.fs.find({names}, {opts}) *vim.fs.find()* items vim.fs.joinpath({...}) *vim.fs.joinpath()* - 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"`) Attributes: ~ Since: 0.10.0 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? |