fix #1796

Author: sumneko

changelog.md

@@ -15,6 +15,7 @@
 * `FIX` [#1737]
 * `FIX` [#1751]
 * `FIX` [#1767]
+* `FIX` [#1796]
 * `FIX` [#1805]
 * `FIX` [#1808]
 * `FIX` [#1811]
@@ -25,6 +26,7 @@
 [#1737]: https://github.com/sumneko/lua-language-server/issues/1737
 [#1751]: https://github.com/sumneko/lua-language-server/issues/1751
 [#1767]: https://github.com/sumneko/lua-language-server/issues/1767
+[#1796]: https://github.com/sumneko/lua-language-server/issues/1796
 [#1805]: https://github.com/sumneko/lua-language-server/issues/1805
 [#1808]: https://github.com/sumneko/lua-language-server/issues/1808
 [#1811]: https://github.com/sumneko/lua-language-server/issues/1811

script/library.lua

@@ -188,10 +188,14 @@ local function compileSingleMetaDoc(uri, script, metaLang, status)
     if not suc then
         log.debug('MiddleScript:\n', middleScript)
     end
+    local text = table.concat(compileBuf)
     if disable and status == 'default' then
-        return nil
+        return text, false
+    end
+    if status == 'disable' then
+        return text, false
     end
-    return table.concat(compileBuf)
+    return text, true
 end
 
 local function loadMetaLocale(langID, result)
@@ -222,11 +226,8 @@ local function initBuiltIn(uri)
         loadMetaLocale(langID, metaLang)
     end
 
-    if scp:get('metaPath') == metaPath:string() then
-        log.debug('Has meta path, skip:', metaPath:string())
-        return
-    end
-    scp:set('metaPath', metaPath:string())
+    local metaPaths = {}
+    scp:set('metaPaths', metaPaths)
     local suc = xpcall(function ()
         if not fs.exists(metaPath) then
             fs.create_directories(metaPath)
@@ -241,13 +242,10 @@ local function initBuiltIn(uri)
     for libName, status in pairs(define.BuiltIn) do
         status = config.get(uri, 'Lua.runtime.builtin')[libName] or status
         log.debug('Builtin status:', libName, status)
-        if status == 'disable' then
-            goto CONTINUE
-        end
 
         ---@type fs.path
         local libPath = templateDir / (libName .. '.lua')
-        local metaDoc = compileSingleMetaDoc(uri, fsu.loadFile(libPath), metaLang, status)
+        local metaDoc, include = compileSingleMetaDoc(uri, fsu.loadFile(libPath), metaLang, status)
         if metaDoc then
             metaDoc = encoder.encode(encoding, metaDoc, 'auto')
 
@@ -258,13 +256,17 @@ local function initBuiltIn(uri)
 
             local ok, err = out:saveFile(outputLibName, metaDoc)
             if not ok then
-                log.debug("Save Meta File:", err)
+                log.debug("Save Meta File Failed:", err)
                 goto CONTINUE
             end
 
             local outputPath = metaPath / outputLibName
             m.metaPaths[outputPath:string()] = true
             log.debug('Meta path:', outputPath:string())
+
+            if include then
+                metaPaths[#metaPaths+1] = outputPath:string()
+            end
         end
         ::CONTINUE::
     end

script/workspace/workspace.lua

@@ -204,9 +204,12 @@ function m.getLibraryMatchers(scp)
             librarys[m.normalize(path)] = true
         end
     end
-    log.debug('meta path:', scp:get 'metaPath')
-    if scp:get 'metaPath' then
-        librarys[m.normalize(scp:get 'metaPath')] = true
+    local metaPaths = scp:get 'metaPaths'
+    log.debug('meta path:', inspect(metaPaths))
+    if metaPaths then
+        for _, metaPath in ipairs(metaPaths) do
+            librarys[m.normalize(metaPath)] = true
+        end
     end
 
     local matchers = {}