Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(path): find_upwards() failure case is an infinite loop #506

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions lua/plenary/path.lua
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,11 @@ function Path:_st_mode()
end

function Path:joinpath(...)
return Path:new(self.filename, ...)
if string.char(self.filename:byte(-1)) == path.sep then
return Path:new(self.filename:sub(0, -2), ...)
else
return Path:new(self.filename, ...)
end
shreve marked this conversation as resolved.
Show resolved Hide resolved
end

function Path:absolute()
Expand Down Expand Up @@ -917,14 +921,20 @@ end

function Path:find_upwards(filename)
local folder = Path:new(self)
while self:absolute() ~= path.root do
local root = path.root(folder:absolute())

while true do
local p = folder:joinpath(filename)
if p:exists() then
return p
end
if folder:absolute() == root then
break
end
folder = folder:parent()
end
return ""

return nil
shreve marked this conversation as resolved.
Show resolved Hide resolved
end

return Path