fix #925

Author: sumneko

Diff for: changelog.md

@@ -1,5 +1,8 @@
 # changelog
 
+## 2.6.2
+* `FIX` [#925](https://github.com/sumneko/lua-language-server/issues/925)
+
 ## 2.6.1
 `2022-1-24`
 * `CHG` default values of settings:

Diff for: script/files.lua

@@ -99,14 +99,6 @@ function m.getOpenedCache(uri)
     return data.cache
 end
 
---- 标记为库文件
----@param scp scope
----@param uri uri
----@param libraryUri uri
-function m.setLibraryUri(scp, uri, libraryUri)
-    scp:get 'libraryMap' [uri] = libraryUri
-end
-
 --- 是否是库文件
 function m.isLibrary(uri, excludeFolder)
     if excludeFolder then
@@ -117,13 +109,11 @@ function m.isLibrary(uri, excludeFolder)
         end
     end
     for _, scp in ipairs(scope.folders) do
-        local map = scp:get 'libraryMap'
-        if map and map[uri] ~= nil then
+        if scp:isLinkedUri(uri) then
             return true
         end
     end
-    local map = scope.fallback:get 'libraryMap'
-    if map and map[uri] ~= nil then
+    if scope.fallback:isLinkedUri(uri) then
         return true
     end
     return false
@@ -132,16 +122,7 @@ end
 --- 获取库文件的根目录
 function m.getLibraryUri(suri, uri)
     local scp = scope.getScope(suri)
-    local map = scp:get 'libraryMap'
-    if map and map[uri] ~= nil then
-        return map[uri]
-    end
-    return nil
-end
-
----@param scp scope
-function m.flushAllLibrary(scp)
-    scp:set('libraryMap', {})
+    return scp:getLinkedUri(uri)
 end
 
 --- 是否存在

Diff for: script/workspace/loading.lua

@@ -99,7 +99,6 @@ function mt:loadFile(uri, libraryUri)
             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

Diff for: script/workspace/require-path.lua

@@ -56,9 +56,7 @@ function m.getVisiblePath(suri, path)
     local result = cache[path]
     if not result then
         result = {}
-        if libraryPath then
-            cache[path] = result
-        end
+        cache[path] = result
         for _, searcher in ipairs(searchers) do
             local isAbsolute = searcher:match '^[/\\]'
                             or searcher:match '^%a+%:'
@@ -71,11 +69,7 @@ function m.getVisiblePath(suri, path)
                 if libraryPath then
                     currentPath = currentPath:sub(#libraryPath + 2)
                 else
-                    local isRelative
-                    currentPath, isRelative = workspace.getRelativePath(uri)
-                    if not isAbsolute and not isRelative then
-                        goto CONTINUE
-                    end
+                    currentPath = workspace.getRelativePath(uri)
                 end
             end
             repeat
@@ -100,7 +94,6 @@ function m.getVisiblePath(suri, path)
                     addRequireName(suri, uri, expect)
                 end
             until not pos or strict
-            ::CONTINUE::
         end
     end
     return result

Diff for: script/workspace/scope.lua

@@ -56,6 +56,20 @@ function mt:isLinkedUri(uri)
     return false
 end
 
+---@param uri uri
+---@return uri?
+function mt:getLinkedUri(uri)
+    if not uri then
+        return nil
+    end
+    for linkUri in pairs(self._links) do
+        if uri:sub(1, #linkUri) == linkUri then
+            return linkUri
+        end
+    end
+    return nil
+end
+
 ---@param k string
 ---@param v any
 function mt:set(k, v)

Diff for: script/workspace/workspace.lua

@@ -428,8 +428,8 @@ function m.awaitReload(scp)
     scp:set('ready', false)
     scp:set('nativeMatcher', nil)
     scp:set('libraryMatcher', nil)
+    scp:removeAllLinks()
     m.flushFiles(scp)
-    files.flushAllLibrary(scp)
     plugin.init(scp)
     m.awaitPreload(scp)
     scp:set('ready', true)

Diff for: test/tclient/init.lua

@@ -2,3 +2,4 @@ require 'tclient.tests.single-mode'
 require 'tclient.tests.library-ignore-limit'
 require 'tclient.tests.multi-workspace'
 require 'tclient.tests.folders-with-single-file'
+require 'tclient.tests.load-library'

Diff for: test/tclient/tests/load-library.lua

@@ -0,0 +1,58 @@
+local lclient = require 'tclient.lclient'
+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 .. '/load-library'
+local libraryFilePath = LOGPATH .. '/load-library/library-file.lua'
+
+---@async
+lclient():start(function (client)
+    client:registerFakers()
+
+    client:register('workspace/configuration', function ()
+        return {
+            {
+                ['workspace.library'] = { libraryPath }
+            },
+        }
+    end)
+
+    fs.create_directories(fs.path(libraryPath))
+    if not fs.exists(fs.path(libraryFilePath)) then
+        util.saveFile(libraryFilePath, 'LIBRARY_FILE = true')
+    end
+
+    client:initialize()
+
+    client:notify('textDocument/didOpen', {
+        textDocument = {
+            uri = furi.encode('abc/1.lua'),
+            languageId = 'lua',
+            version = 0,
+            text = [[
+require 'library-file'
+print(LIBRARY_FILE)
+]]
+        }
+    })
+
+    ws.awaitReady()
+
+    local locations = client:awaitRequest('textDocument/definition', {
+        textDocument = { uri = furi.encode('abc/1.lua') },
+        position = { line = 0, character = 10 },
+    })
+
+    assert(util.equal(locations, {
+        {
+            uri = furi.encode(libraryFilePath),
+            range = {
+                start   = { line = 0, character = 0 },
+                ['end'] = { line = 0, character = 0 },
+            }
+        }
+    }))
+end)