fix loading workspace may hang

2 files changed, 19 insertions, 5 deletions

diff --git a/changelog.md b/changelog.md
index 7eafe189..4ffb00c5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 ## 2.3.0
 * `NEW` `VSCode`: click the status bar icon to operate:
     * run workspace diagnostics
+* `FIX` loading workspace may hang
 * `FIX` `debug.getuservalue` and `debug.setuservalue` should not exist in `Lua 5.1`
 * `FIX` infer of `---@type class[][]`
 * `FIX` infer of `---@type {}[]`
diff --git a/script/workspace/workspace.lua b/script/workspace/workspace.lua
index fcfde027..e69c6d76 100644
--- a/script/workspace/workspace.lua
+++ b/script/workspace/workspace.lua
@@ -320,15 +320,28 @@ function m.awaitPreload()
         library.matcher:scan(library.path, libraryLoader)
     end
 
-    await.call(function ()
-        for _, loader in ipairs(progressData.loaders) do
-            loader()
-            await.delay()
+    local isLoadingFiles = false
+    local function loadSomeFiles()
+        if isLoadingFiles then
+            return
         end
-    end)
+        await.call(function ()
+            isLoadingFiles = true
+            while true do
+                local loader = table.remove(progressData.loaders)
+                if not loader then
+                    break
+                end
+                loader()
+                await.delay()
+            end
+            isLoadingFiles = false
+        end)
+    end
 
     log.info(('Found %d files.'):format(progressData.max))
     while true do
+        loadSomeFiles()
         log.info(('Loaded %d/%d files'):format(progressData.read, progressData.max))
         progressData:update()
         if progressData.read >= progressData.max then