fix #920

Author: sumneko

changelog.md

@@ -9,6 +9,7 @@
 * `FIX` modify luarc failed
 * `FIX` library files not recognized correctly
 * `FIX` [#906](https://github.com./sumneko/lua-language-server/issues/906)
+* `FIX` [#920](https://github.com./sumneko/lua-language-server/issues/920)
 
 ## 2.6.0
 `2022-1-13`

script/files.lua

@@ -124,11 +124,11 @@ function m.isLibrary(uri)
 end
 
 --- 获取库文件的根目录
-function m.getLibraryPath(uri)
+function m.getLibraryUri(uri)
     for _, scp in ipairs(scope.folders) do
         local map = scp:get 'libraryMap'
         if map and map[uri] ~= nil then
-            return scp.uri
+            return map[uri]
         end
     end
     return nil

script/workspace/require-path.lua

@@ -43,7 +43,7 @@ function m.getVisiblePath(suri, path)
     local strict    = config.get(suri, 'Lua.runtime.pathStrict')
     path = workspace.normalize(path)
     local uri = furi.encode(path)
-    local libraryPath = files.getLibraryPath(uri)
+    local libraryPath = furi.decode(files.getLibraryUri(uri))
     local scp = scope.getScope(suri)
     local cache = scp:get('visiblePath') or scp:set('visiblePath', {})
     if not cache[path] then
@@ -145,10 +145,18 @@ local function removeVisiblePath(uri)
     path = workspace.normalize(path)
     for _, scp in ipairs(workspace.folders) do
         scp:get('visiblePath')[path] = nil
-        scp:get('requireName'):dropUri(uri)
+        ---@type collector
+        local clt = scp:get('requireName')
+        if clt then
+            clt:dropUri(uri)
+        end
+    end
+    scope.fallback:get('visiblePath')[path] = nil
+    ---@type collector
+    local clt = scope.fallback:get('requireName')
+    if clt then
+        clt:dropUri(uri)
     end
-    scope.getScope(nil):get('visiblePath')[path] = nil
-    scope.getScope(nil):get('requireName'):dropUri(uri)
 end
 
 function m.flush(suri)

test/completion/common.lua

@@ -3060,3 +3060,10 @@ local t
 t:testFunc2(<??>)
 ]]
 (EXISTS)
+
+TEST [[
+require '<??>'
+]]
+(function (results)
+    assert(#results == 11)
+end)

test/completion/init.lua

@@ -110,11 +110,15 @@ function TEST(script)
         end
         assert(result)
         result.complete = nil
-        if expect.include then
-            expect.include = nil
-            assert(include(expect, result))
+        if type(expect) == 'function' then
+            expect(result)
         else
-            assert(eq(expect, result))
+            if expect.include then
+                expect.include = nil
+                assert(include(expect, result))
+            else
+                assert(eq(expect, result))
+            end
         end
         files.remove('')
     end