Skip to content

Commit e4f80b9

Browse files
committed
fix: pathStrict should also look for strict path uris in workspace libraries
1 parent 3ddd84c commit e4f80b9

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

script/workspace/require-path.lua

+15-15
Original file line numberDiff line numberDiff line change
@@ -179,21 +179,21 @@ function mt:findUrisByRequireName(suri, name)
179179
searcherMap[fullUri] = searcher
180180
end
181181
end
182-
if not strict then
183-
local tail = '/' .. furi.encode(fspath):gsub('^file:[/]*', '')
184-
for uri in files.eachFile(self.scp.uri) do
185-
if not searcherMap[uri]
186-
and suri ~= uri
187-
and util.stringEndWith(uri, tail) then
188-
results[#results+1] = uri
189-
local parentUri = files.getLibraryUri(self.scp.uri, uri) or self.scp.uri
190-
if parentUri == nil or parentUri == '' then
191-
parentUri = furi.encode ''
192-
end
193-
local relative = uri:sub(#parentUri + 1):sub(1, - #tail)
194-
searcherMap[uri] = workspace.normalize(relative .. searcher)
195-
end
196-
end
182+
local tail = '/' .. furi.encode(fspath):gsub('^file:[/]*', '')
183+
for uri in files.eachFile(self.scp.uri) do
184+
if not searcherMap[uri]
185+
and suri ~= uri
186+
and util.stringEndWith(uri, tail) then
187+
local parentUri = files.getLibraryUri(self.scp.uri, uri) or self.scp.uri
188+
if parentUri == nil or parentUri == '' then
189+
parentUri = furi.encode ''
190+
end
191+
local relative = uri:sub(#parentUri + 1):sub(1, - #tail)
192+
if not strict or relative == "/" then
193+
results[#results+1] = uri
194+
end
195+
searcherMap[uri] = workspace.normalize(relative .. searcher)
196+
end
197197
end
198198
end
199199

0 commit comments

Comments
 (0)