alex/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-01-06 11:27:26 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat(fs): expose join_paths as vim.fs.joinpath (#23685)

Browse Source 
This is a small function but used a lot in some plugins.
This commit is contained in:
Christian Clason
2023-05-20 17:30:48 +02:00
committed by GitHub
parent 073035a030
commit e3e6fadfd8
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runtime/lua/vim/fs.lua
View File

@@ -72,15 +72,15 @@ function M.basename(file)
return file:match('[/\\]$') and '' or (file:match('[^\\/]*$'):gsub('\\', '/'))
end
---@private
--- Concatenate directories and/or file into a single path with normalization
--- (e.g., `"foo/"` and `"bar"` get joined to `"foo/bar"`)
---
---@param ... string
---@return string
function M._join_paths(...)
function M.joinpath(...)
return (table.concat({ ... }, '/'):gsub('//+', '/'))
end
local join_paths = M._join_paths
---@alias Iterator fun(): string?, string?
--- Return an iterator over the files and directories located in {path}
@@ -120,14 +120,14 @@ function M.dir(path, opts)
local dirs = { { path, 1 } }
while #dirs > 0 do
local dir0, level = unpack(table.remove(dirs, 1))
local dir = level == 1 and dir0 or join_paths(path, dir0)
local dir = level == 1 and dir0 or M.joinpath(path, dir0)
local fs = vim.loop.fs_scandir(M.normalize(dir))
while fs do
local name, t = vim.loop.fs_scandir_next(fs)
if not name then
break
end
local f = level == 1 and name or join_paths(dir0, name)
local f = level == 1 and name or M.joinpath(dir0, name)
coroutine.yield(f, t)
if
opts.depth
@@ -234,7 +234,7 @@ function M.find(names, opts)
local t = {}
for name, type in M.dir(p) do
if (not opts.type or opts.type == type) and names(name, p) then
table.insert(t, join_paths(p, name))
table.insert(t, M.joinpath(p, name))
end
end
return t
@@ -243,7 +243,7 @@ function M.find(names, opts)
test = function(p)
local t = {}
for _, name in ipairs(names) do
local f = join_paths(p, name)
local f = M.joinpath(p, name)
local stat = vim.loop.fs_stat(f)
if stat and (not opts.type or opts.type == stat.type) then
t[#t + 1] = f
@@ -280,7 +280,7 @@ function M.find(names, opts)
end
for other, type_ in M.dir(dir) do
local f = join_paths(dir, other)
local f = M.joinpath(dir, other)
if type(names) == 'function' then
if (not opts.type or opts.type == type_) and names(other, dir) then
if add(f) then