cleanup

Author: sumneko

script/files.lua

@@ -176,8 +176,8 @@ end
 ---@param uri uri
 ---@param text string
 ---@param isTrust boolean
----@param version integer
-function m.setText(uri, text, isTrust, version)
+---@param callback function
+function m.setText(uri, text, isTrust, callback)
     if not text then
         return
     end
@@ -204,7 +204,9 @@ function m.setText(uri, text, isTrust, version)
         local encoding = config.get(uri, 'Lua.runtime.fileEncoding')
         text = encoder.decode(encoding, text)
     end
-    file.version = version
+    if callback then
+        callback(file)
+    end
     if file.originText == text then
         return
     end

script/provider/provider.lua

@@ -225,7 +225,9 @@ m.register 'textDocument/didOpen' {
         local uri   = files.getRealUri(doc.uri)
         workspace.awaitReady(uri)
         local text  = doc.text
-        files.setText(uri, text, true, doc.version)
+        files.setText(uri, text, true, function (file)
+            file.version = doc.version
+        end)
         files.open(uri)
     end
 }
@@ -253,7 +255,9 @@ m.register 'textDocument/didChange' {
         local text = files.getOriginText(uri) or ''
         local rows = files.getCachedRows(uri)
         text, rows = tm(text, rows, changes)
-        files.setText(uri, text, true, doc.version)
+        files.setText(uri, text, true, function (file)
+            file.version = doc.version
+        end)
         files.setCachedRows(uri, rows)
     end
 }

script/workspace/loading.lua

@@ -82,6 +82,10 @@ function mt:loadFile(uri, libraryUri)
                 self.read = self.read + 1
                 self:update()
                 log.info(('Skip loaded file: %s'):format(uri))
+                if libraryUri then
+                    log.info('++++As library of:', libraryUri)
+                    files.setLibraryUri(self.scp, uri, libraryUri)
+                end
             else
                 local content = pub.awaitTask('loadFile', furi.decode(uri))
                 if self._cache[uri] then
@@ -94,13 +98,14 @@ function mt:loadFile(uri, libraryUri)
                     return
                 end
                 log.info(('Preload file at: %s , size = %.3f KB'):format(uri, #content / 1024.0))
-                files.setText(uri, content, false)
+                files.setText(uri, content, false, function ()
+                    if libraryUri then
+                        log.info('++++As library of:', libraryUri)
+                        files.setLibraryUri(self.scp, uri, libraryUri)
+                    end
+                end)
             end
             files.addRef(uri)
-            if libraryUri then
-                log.info('++++As library of:', libraryUri)
-                files.setLibraryUri(self.scp, uri, libraryUri)
-            end
         end
     elseif files.isDll(uri) then
         self.max = self.max + 1
@@ -111,6 +116,9 @@ function mt:loadFile(uri, libraryUri)
                 self.read = self.read + 1
                 self:update()
                 log.info(('Skip loaded file: %s'):format(uri))
+                if libraryUri then
+                    log.info('++++As library of:', libraryUri)
+                end
             else
                 local content = pub.awaitTask('loadFile', furi.decode(uri))
                 if self._cache[uri] then
@@ -124,11 +132,11 @@ function mt:loadFile(uri, libraryUri)
                 end
                 log.info(('Preload dll at: %s , size = %.3f KB'):format(uri, #content / 1024.0))
                 files.saveDll(uri, content)
+                if libraryUri then
+                    log.info('++++As library of:', libraryUri)
+                end
             end
             files.addRef(uri)
-            if libraryUri then
-                log.info('++++As library of:', libraryUri)
-            end
         end
     end
     await.delay()