Skip to content

Commit e5ef01c

Browse files
committed
get scoped files
1 parent ce3a22b commit e5ef01c

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

script/core/completion/completion.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ local function checkModule(state, word, position, results)
328328
return
329329
end
330330
local locals = guide.getVisibleLocals(state.ast, position)
331-
for uri in files.eachFile() do
331+
for uri in files.eachFile(state.uri) do
332332
if uri == guide.getUri(state.ast) then
333333
goto CONTINUE
334334
end
@@ -647,7 +647,7 @@ local function checkCommon(state, word, position, results)
647647
end
648648
if config.get(state.uri, 'Lua.completion.workspaceWord') and #word >= 2 then
649649
local myHead = word:sub(1, 2)
650-
for uri in files.eachFile() do
650+
for uri in files.eachFile(state.uri) do
651651
if #results >= 100 then
652652
results.incomplete = true
653653
break
@@ -880,7 +880,7 @@ end
880880
local function collectRequireNames(mode, myUri, literal, source, smark, position, results)
881881
local collect = {}
882882
if mode == 'require' then
883-
for uri in files.eachFile() do
883+
for uri in files.eachFile(myUri) do
884884
if myUri == uri then
885885
goto CONTINUE
886886
end
@@ -934,7 +934,7 @@ local function collectRequireNames(mode, myUri, literal, source, smark, position
934934
end
935935
end
936936
else
937-
for uri in files.eachFile() do
937+
for uri in files.eachFile(myUri) do
938938
if myUri == uri then
939939
goto CONTINUE
940940
end

script/files.lua

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ end
362362

363363
function m.getChildFiles(uri)
364364
local results = {}
365-
local uris = m.getAllUris()
365+
local uris = m.getAllUris(uri)
366366
for _, curi in ipairs(uris) do
367367
if #curi > #uri
368368
and curi:sub(1, #uri) == uri
@@ -415,9 +415,10 @@ function m.remove(uri)
415415
end
416416

417417
--- 获取一个包含所有文件uri的数组
418-
---@param scp? scope
418+
---@param suri? uri
419419
---@return uri[]
420-
function m.getAllUris(scp)
420+
function m.getAllUris(suri)
421+
local scp = suri and scope.getScope(suri) or nil
421422
local files = {}
422423
local i = 0
423424
for uri in pairs(m.fileMap) do
@@ -432,8 +433,9 @@ function m.getAllUris(scp)
432433
end
433434

434435
--- 遍历文件
435-
function m.eachFile()
436-
local files = m.getAllUris()
436+
---@param suri? uri
437+
function m.eachFile(suri)
438+
local files = m.getAllUris(suri)
437439
local i = 0
438440
return function ()
439441
i = i + 1

script/provider/diagnostic.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ function m.diagnosticsScope(uri, force)
371371
askForDisable(uri)
372372
end)
373373
end)
374-
local uris = files.getAllUris(scp)
374+
local uris = files.getAllUris(uri)
375375
log.info(('diagnostics scope [%s], files count:[%d]'):format(scp:getName(), #uris))
376376
for i, uri in ipairs(uris) do
377377
while loading.count() > 0 do

script/vm/getLinks.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ end
4040

4141
local function getLinksTo(uri)
4242
local links = {}
43-
for u in files.eachFile() do
43+
for u in files.eachFile(uri) do
4444
local ls = getFileLinksOrCache(u)
4545
if ls[uri] then
4646
for _, l in ipairs(ls[uri]) do

script/workspace/require-path.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ function m.flush(suri)
159159
if clt then
160160
clt:dropAll()
161161
end
162-
for uri in files.eachFile() do
162+
for uri in files.eachFile(suri) do
163163
m.getVisiblePath(scp.uri, furi.decode(uri))
164164
end
165165
end

0 commit comments

Comments
 (0)