FIX library files not recognized correctly

Author: sumneko

changelog.md

@@ -2,6 +2,7 @@
 
 ## 2.6.1
 * `FIX` modify luarc failed
+* `FIX` library files not recognized correctly
 
 ## 2.6.0
 `2022-1-13`

script/files.lua

@@ -12,6 +12,7 @@ local guide    = require 'parser.guide'
 local smerger  = require 'string-merger'
 local progress = require "progress"
 local encoder  = require 'encoder'
+local scope    = require 'workspace.scope'
 
 ---@class files
 local m = {}
@@ -23,7 +24,6 @@ m.assocMatcher   = nil
 
 function m.reset()
     m.openMap        = {}
-    m.libraryMap     = {}
     m.fileMap        = {}
     m.dllMap         = {}
     m.visible        = {}
@@ -110,12 +110,28 @@ end
 
 --- 是否是库文件
 function m.isLibrary(uri)
-    return m.libraryMap[uri] ~= nil
+    for _, scp in ipairs(scope.folders) do
+        local map = scp:get 'libraryMap'
+        if map and map[uri] ~= nil then
+            return true
+        end
+    end
+    local map = scope.fallback:get 'libraryMap'
+    if map and map[uri] ~= nil then
+        return true
+    end
+    return false
 end
 
 --- 获取库文件的根目录
 function m.getLibraryPath(uri)
-    return m.libraryMap[uri]
+    for _, scp in ipairs(scope.folders) do
+        local map = scp:get 'libraryMap'
+        if map and map[uri] ~= nil then
+            return scp.uri
+        end
+    end
+    return nil
 end
 
 ---@param scp scope

script/workspace/loading.lua

@@ -4,7 +4,8 @@ local await    = require 'await'
 local files    = require 'files'
 local config   = require 'config.config'
 local client   = require 'client'
-local pub      = require 'pub.pub'
+local util     = require 'utility'
+local furi     = require 'file-uri'
 
 ---@class workspace.loading
 ---@field scp scope
@@ -69,50 +70,48 @@ function mt:loadFile(uri, libraryUri)
         end
         self.max = self.max + 1
         self:update()
-        pub.task('loadFile', uri, function (content)
-            self._stash[#self._stash+1] = function ()
-                self.read = self.read + 1
-                self:update()
-                if not content then
-                    return
-                end
-                if self._cache[uri] then
-                    return
-                end
-                log.info(('Preload file at: %s , size = %.3f KB'):format(uri, #content / 1024.0))
-                self._cache[uri] = true
-                files.setText(uri, content, false)
-                files.addRef(uri)
-                if libraryUri then
-                    log.info('++++As library of:', libraryUri)
-                    files.setLibraryUri(self.scp, uri, libraryUri)
-                end
+        self._stash[#self._stash+1] = function ()
+            local content = util.loadFile(furi.decode(uri))
+            self.read = self.read + 1
+            self:update()
+            if not content then
+                return
+            end
+            if self._cache[uri] then
+                return
             end
-        end)
+            log.info(('Preload file at: %s , size = %.3f KB'):format(uri, #content / 1024.0))
+            self._cache[uri] = true
+            files.setText(uri, content, false)
+            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
         self:update()
-        pub.task('loadFile', uri, function (content)
-            self._stash[#self._stash+1] = function ()
-                self.read = self.read + 1
-                self:update()
-                if not content then
-                    return
-                end
-                if self._cache[uri] then
-                    return
-                end
-                log.info(('Preload dll at: %s , size = %.3f KB'):format(uri, #content / 1024.0))
-                self._cache[uri] = true
-                files.saveDll(uri, content)
-                files.addRef(uri)
-                if libraryUri then
-                    log.info('++++As library of:', libraryUri)
-                end
+        self._stash[#self._stash+1] = function ()
+            local content = util.loadFile(furi.decode(uri))
+            self.read = self.read + 1
+            self:update()
+            if not content then
+                return
+            end
+            if self._cache[uri] then
+                return
             end
-        end)
-        await.delay()
+            log.info(('Preload dll at: %s , size = %.3f KB'):format(uri, #content / 1024.0))
+            self._cache[uri] = true
+            files.saveDll(uri, content)
+            files.addRef(uri)
+            if libraryUri then
+                log.info('++++As library of:', libraryUri)
+            end
+        end
     end
+    await.delay()
 end
 
 function mt:loadStashed()

script/workspace/workspace.lua

@@ -55,6 +55,7 @@ function m.reset()
     ---@type scope[]
     m.folders = {}
     m.rootUri = nil
+    m.inited  = false
 end
 m.reset()
 

test/tclient/lclient.lua

@@ -63,6 +63,11 @@ function mt:start(callback)
 
     local finished = false
 
+    await.setErrorHandle(function (...)
+        local msg = log.error(...)
+        error(msg)
+    end)
+
     ---@async
     await.call(function ()
         callback(self)
@@ -144,7 +149,7 @@ function mt:update()
             if callback then
                 proto.doResponse {
                     id     = out.id,
-                    params = callback(out.params),
+                    result = callback(out.params),
                 }
             elseif out.method:sub(1, 2) ~= '$/' then
                 error('Unknown method: ' .. out.method)
@@ -164,10 +169,12 @@ end
 
 function mt:registerFakers()
     for _, method in ipairs {
+        'textDocument/publishDiagnostics',
         'workspace/configuration',
         'workspace/semanticTokens/refresh',
         'window/workDoneProgress/create',
-        'textDocument/publishDiagnostics',
+        'window/showMessage',
+        'window/logMessage',
     } do
         self:register(method, function ()
             return nil

test/tclient/tests/library-ignore-limit.lua

@@ -3,6 +3,7 @@ local util    = require 'utility'
 local ws      = require 'workspace'
 local files   = require 'files'
 local furi    = require 'file-uri'
+local fs      = require 'bee.filesystem'
 
 local libraryPath   = LOGPATH .. '/large-file-library'
 local largeFilePath = LOGPATH .. '/large-file-library/large-file.lua'
@@ -13,11 +14,14 @@ lclient():start(function (client)
 
     client:register('workspace/configuration', function ()
         return {
-            ['Lua.workspace.library'] = { libraryPath }
+            {
+                ['workspace.library'] = { libraryPath }
+            },
         }
     end)
 
-    util.saveFile(largeFilePath, string.rep('--this is a large file\n', 20000))
+    fs.create_directories(fs.path(libraryPath))
+    util.saveFile(largeFilePath, string.rep('--this is a large file\n', 100000))
 
     client:initialize()