Skip to content

fix: pathStrict should also look for strict path uris in workspace libraries #1592

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 27, 2022
Merged

fix: pathStrict should also look for strict path uris in workspace libraries #1592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions script/workspace/require-path.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,21 +179,21 @@ function mt:findUrisByRequireName(suri, name)
searcherMap[fullUri] = searcher
end
end
if not strict then
local tail = '/' .. furi.encode(fspath):gsub('^file:[/]*', '')
for uri in files.eachFile(self.scp.uri) do
if not searcherMap[uri]
and suri ~= uri
and util.stringEndWith(uri, tail) then
results[#results+1] = uri
local parentUri = files.getLibraryUri(self.scp.uri, uri) or self.scp.uri
if parentUri == nil or parentUri == '' then
parentUri = furi.encode ''
end
local relative = uri:sub(#parentUri + 1):sub(1, - #tail)
searcherMap[uri] = workspace.normalize(relative .. searcher)
end
end
local tail = '/' .. furi.encode(fspath):gsub('^file:[/]*', '')
for uri in files.eachFile(self.scp.uri) do
if not searcherMap[uri]
and suri ~= uri
and util.stringEndWith(uri, tail) then
local parentUri = files.getLibraryUri(self.scp.uri, uri) or self.scp.uri
if parentUri == nil or parentUri == '' then
parentUri = furi.encode ''
end
local relative = uri:sub(#parentUri + 1):sub(1, - #tail)
if not strict or relative == "/" then
results[#results+1] = uri
end
searcherMap[uri] = workspace.normalize(relative .. searcher)
end
end
end

Expand Down