Skip to content

Commit 1c80954

Browse files
committed
fix test
1 parent e5ef01c commit 1c80954

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

script/workspace/workspace.lua

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,8 @@ end
250250
---@async
251251
---@param scp scope
252252
function m.awaitPreload(scp)
253-
local displayedUri = scp.uri or '<fallback>'
254-
await.close('preload:' .. displayedUri)
255-
await.setID('preload:' .. displayedUri)
253+
await.close('preload:' .. scp:getName())
254+
await.setID('preload:' .. scp:getName())
256255
await.sleep(0.1)
257256

258257
local watchers = scp:get 'watchers'
@@ -267,13 +266,13 @@ function m.awaitPreload(scp)
267266
local ld <close> = loading.create(scp)
268267
scp:set('loading', ld)
269268

270-
log.info('Preload start:', displayedUri)
269+
log.info('Preload start:', scp:getName())
271270

272271
local native = m.getNativeMatcher(scp)
273272
local librarys = m.getLibraryMatchers(scp)
274273

275274
if scp.uri then
276-
log.info('Scan files at:', displayedUri)
275+
log.info('Scan files at:', scp:getName())
277276
---@async
278277
native:scan(furi.decode(scp.uri), function (path)
279278
ld:loadFile(furi.encode(path))
@@ -289,9 +288,9 @@ function m.awaitPreload(scp)
289288
watchers[#watchers+1] = fw.watch(furi.decode(libMatcher.uri))
290289
end
291290

292-
log.info(('Found %d files at:'):format(ld.max), displayedUri)
291+
log.info(('Found %d files at:'):format(ld.max), scp:getName())
293292
ld:loadAll()
294-
log.info('Preload finish at:', displayedUri)
293+
log.info('Preload finish at:', scp:getName())
295294
end
296295

297296
--- 查找符合指定file path的所有uri

test.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ local function main()
8282
---@async
8383
lclient():start(function (client)
8484
client:registerFakers()
85-
client:initialize()
85+
client:initialize {
86+
rootUri = '',
87+
}
8688

8789
ws.awaitReady()
8890

test/tclient/tests/multi-workspace.lua

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ local util = require 'utility'
44
local furi = require 'file-uri'
55
local ws = require 'workspace'
66
local files = require 'files'
7+
local scope = require 'workspace.scope'
78

89
local rootPath = LOGPATH .. '/multi-workspace'
910
local rootUri = furi.encode(rootPath)
@@ -66,11 +67,11 @@ lclient():start(function (client)
6667
assert(files.getState(rootUri .. '/lb1/test.lua') ~= nil)
6768
assert(files.getState(rootUri .. '/lb2/test.lua') ~= nil)
6869

69-
assert(ws.getScope(rootUri .. '/ws1/test.lua').uri == rootUri .. '/ws1')
70-
assert(ws.getScope(rootUri .. '/ws2/test.lua').uri == rootUri .. '/ws2')
71-
assert(ws.getScope(rootUri .. '/share/test.lua').uri == rootUri .. '/ws1')
72-
assert(ws.getScope(rootUri .. '/lb1/test.lua').uri == rootUri .. '/ws1')
73-
assert(ws.getScope(rootUri .. '/lb2/test.lua').uri == rootUri .. '/ws2')
70+
assert(scope.getScope(rootUri .. '/ws1/test.lua').uri == rootUri .. '/ws1')
71+
assert(scope.getScope(rootUri .. '/ws2/test.lua').uri == rootUri .. '/ws2')
72+
assert(scope.getScope(rootUri .. '/share/test.lua').uri == rootUri .. '/ws1')
73+
assert(scope.getScope(rootUri .. '/lb1/test.lua').uri == rootUri .. '/ws1')
74+
assert(scope.getScope(rootUri .. '/lb2/test.lua').uri == rootUri .. '/ws2')
7475

7576
assert(files.isLibrary(rootUri .. '/ws1/test.lua') == false)
7677
assert(files.isLibrary(rootUri .. '/ws2/test.lua') == false)

0 commit comments

Comments
 (0)