Merge remote-tracking branch 'origin/master'

Author: Gowa2017

3rd/lovr-api

@@ -28,7 +28,7 @@ server will generate `doc.json` and `doc.md` in `LOGPATH`.
   ---@type myClass
   local class
 
-  print(class.a.b.c.e.f.g) --> infered as integer
+  print(class.a.b.c.e.f.g) --> inferred as integer
   ```
 * `CHG` [#1582] the following diagnostics consider `overload`
   * `missing-return`
@@ -37,21 +37,54 @@ server will generate `doc.json` and `doc.md` in `LOGPATH`.
   * `return-type-mismatch`
 * `CHG` workspace-symbol: supports chain fields based on global variables and types. try `io.open` or `iolib.open`
 * `CHG` [#1641] if a function only has varargs and has `---@overload`, the varargs will be ignored
+* `CHG` [#1575] search definitions by first argument of `setmetatable`
+  ```lua
+  ---@class Object
+  local obj = setmetatable({
+    initValue = 1,
+  }, mt)
+
+  print(obj.initValue) --> `obj.initValue` is integer
+  ```
+* `CHG` [#1153] infer type by generic parameters or returns of function
+  ```lua
+  ---@generic T
+  ---@param f fun(x: T)
+  ---@return T[]
+  local function x(f) end
+
+  ---@type fun(x: integer)
+  local cb
+
+  local arr = x(cb) --> `arr` is inferred as `integer[]`
+  ```
+* `CHG` [#1201] infer parameter type by expected returned function of parent function
+  ```lua
+  ---@return fun(x: integer)
+  local function f()
+      return function (x) --> `x` is inferred as `integer`
+      end
+  end
+  ```
 * `FIX` [#1567]
 * `FIX` [#1593]
 * `FIX` [#1595]
 * `FIX` [#1599]
 * `FIX` [#1606]
 * `FIX` [#1608]
 * `FIX` [#1637]
+* `FIX` [#1640]
 * `FIX` [#1642]
 
+[#1153]: https://github.com/sumneko/lua-language-server/issues/1153
 [#1177]: https://github.com/sumneko/lua-language-server/issues/1177
+[#1202]: https://github.com/sumneko/lua-language-server/issues/1202
 [#1458]: https://github.com/sumneko/lua-language-server/issues/1458
 [#1557]: https://github.com/sumneko/lua-language-server/issues/1557
 [#1558]: https://github.com/sumneko/lua-language-server/issues/1558
 [#1561]: https://github.com/sumneko/lua-language-server/issues/1561
 [#1567]: https://github.com/sumneko/lua-language-server/issues/1567
+[#1575]: https://github.com/sumneko/lua-language-server/issues/1575
 [#1582]: https://github.com/sumneko/lua-language-server/issues/1582
 [#1593]: https://github.com/sumneko/lua-language-server/issues/1593
 [#1595]: https://github.com/sumneko/lua-language-server/issues/1595
@@ -60,6 +93,7 @@ server will generate `doc.json` and `doc.md` in `LOGPATH`.
 [#1608]: https://github.com/sumneko/lua-language-server/issues/1608
 [#1626]: https://github.com/sumneko/lua-language-server/issues/1626
 [#1637]: https://github.com/sumneko/lua-language-server/issues/1637
+[#1640]: https://github.com/sumneko/lua-language-server/issues/1640
 [#1641]: https://github.com/sumneko/lua-language-server/issues/1641
 [#1642]: https://github.com/sumneko/lua-language-server/issues/1642
 

changelog.md

@@ -17,12 +17,22 @@
 ---  <tr>
 ---    <td>macOS</td>
 ---    <td><code>/Users/&lt;user&gt;/Library/Application Support/LOVR/&lt;identity&gt;</code></td>
+---  </tr>
+---  <tr>
+---    <td>Linux</td>
+---    <td><code>/home/&lt;user&gt;/.local/share/LOVR/&lt;identity&gt;</code></td>
+---  </tr>
+---  <tr>
+---    <td>Android</td>
+---    <td><code>/sdcard/Android/data/<identity>/files</code></td>
 ---  </tr> </table>
 ---
 ---`<identity>` should be a unique identifier for your app.
 ---
 ---It can be set either in `lovr.conf` or by using `lovr.filesystem.setIdentity`.
 ---
+---On Android, the identity can not be changed and will always be the package id, like `org.lovr.app`.
+---
 ---All filenames are relative to either the save directory or the directory containing the project source.
 ---
 ---Files in the save directory take precedence over files in the project.
@@ -278,14 +288,6 @@ function lovr.filesystem.setIdentity(identity) end
 ---@param path? string # An optional semicolon separated list of search patterns.
 function lovr.filesystem.setRequirePath(path) end
 
----
----Sets the location of the project's source.
----
----This can only be done once, and is usually done internally.
----
----@param identity string # The path containing the project's source.
-function lovr.filesystem.setSource(identity) end
-
 ---
 ---Unmounts a directory or archive previously mounted with `lovr.filesystem.mount`.
 ---

meta/3rd/lovr/library/lovr/filesystem.lua

@@ -462,7 +462,6 @@ function lovr.graphics.newMaterial(properties) end
 ---
 ---- glTF: Morph targets are not supported.
 ---- glTF: Only the default scene is loaded.
----- glTF: Only the default scene is loaded.
 ---- glTF: Currently, each skin in a Model can have up to 256 joints.
 ---- glTF: Meshes can't appear multiple times in the node hierarchy with different skins, they need
 ---  to use 1 skin consistently.

meta/3rd/lovr/library/lovr/graphics.lua

@@ -1411,8 +1411,8 @@ function World:getResponseTime() end
 ---
 ---The default step count is 20.
 ---
----@param steps number # The step count.
-function World:getStepCount(steps) end
+---@return number steps # The step count.
+function World:getStepCount() end
 
 ---
 ---Returns the tightness of joints in the World.

meta/3rd/lovr/library/lovr/physics.lua

@@ -60,7 +60,7 @@ brave.on('compile', function (param)
         , param.version
         , param.options
     )
-    log.debug('compile', param.uri, 'takes:', os.clock() - clock)
+    log.debug('Async compile', param.uri, 'takes:', os.clock() - clock)
     return {
         state = state,
         err   = err,

script/brave/work.lua

@@ -420,7 +420,7 @@ function m.addRef(uri)
         return nil
     end
     file._ref = (file._ref or 0) + 1
-    log.debug('add ref', uri)
+    log.debug('add ref', uri, file._ref)
     return function ()
         m.delRef(uri)
     end
@@ -432,7 +432,7 @@ function m.delRef(uri)
         return
     end
     file._ref = (file._ref or 0) - 1
-    log.debug('del ref', uri)
+    log.debug('del ref', uri, file._ref)
     if file._ref <= 0 and not m.isOpen(uri) then
         m.remove(uri)
     end

script/files.lua

@@ -368,6 +368,27 @@ function vm.getClassFields(suri, object, key, ref, pushResult)
                             end
                         end)
                     end
+                    if  src.value
+                    and src.value.type == 'select'
+                    and src.value.vararg.type == 'call' then
+                        local func = src.value.vararg.node
+                        local args = src.value.vararg.args
+                        if  func.special == 'setmetatable'
+                        and args
+                        and args[1]
+                        and args[1].type == 'table' then
+                            searchFieldSwitch('table', suri, args[1], key, ref, function (field)
+                                local fieldKey = guide.getKeyName(field)
+                                if fieldKey then
+                                    if  not searchedFields[fieldKey]
+                                    and guide.isSet(field) then
+                                        hasFounded[fieldKey] = true
+                                        pushResult(field, true)
+                                    end
+                                end
+                            end)
+                        end
+                    end
                     copyToSearched()
                     searchFieldSwitch(src.type, suri, src, key, ref, function (field)
                         local fieldKey = guide.getKeyName(field)
@@ -1038,6 +1059,7 @@ local function compileLocal(source)
     end
     if source.parent.type == 'funcargs' and not hasMarkDoc and not hasMarkParam then
         local func = source.parent.parent
+        -- local call ---@type fun(f: fun(x: number));call(function (x) end) --> x -> number
         local funcNode = vm.compileNode(func)
         local hasDocArg
         for n in funcNode:eachObject() do
@@ -1137,6 +1159,22 @@ local compilerSwitch = util.switch()
             local call = source.parent.parent
             vm.compileCallArg(source, call)
         end
+
+        -- function f() return function (<?x?>) end end
+        if source.parent.type == 'return' then
+            for i, ret in ipairs(source.parent) do
+                if ret == source then
+                    local func = guide.getParentFunction(source.parent)
+                    if func then
+                        local returnObj = vm.getReturnOfFunction(func, i)
+                        if returnObj then
+                            vm.setNode(source, vm.compileNode(returnObj))
+                        end
+                    end
+                    break
+                end
+            end
+        end
     end)
     : case 'paren'
     : call(function (source)

script/vm/compiler.lua

@@ -22,12 +22,26 @@ function mt:resolve(uri, args, removeGeneric)
     if not args then
         return nil
     end
+
+    ---@type table<string, vm.node>
     local resolved = {}
 
-    ---@param object vm.node.object
+    ---@param object vm.node|vm.node.object
     ---@param node   vm.node
     local function resolve(object, node)
+        if object.type == 'vm.node' then
+            for o in object:eachObject() do
+                resolve(o, node)
+            end
+            return
+        end
+        if object.type == 'doc.type' then
+            ---@cast object parser.object
+            resolve(vm.compileNode(object), node)
+            return
+        end
         if object.type == 'doc.generic.name' then
+            ---@type string
             local key = object[1]
             if object.literal then
                 -- 'number' -> `T`
@@ -40,8 +54,21 @@ function mt:resolve(uri, args, removeGeneric)
                 end
             else
                 -- number -> T
-                resolved[key] = vm.createNode(node, resolved[key])
+                for n in node:eachObject() do
+                    if  n.type ~= 'doc.generic.name'
+                    and n.type ~= 'generic' then
+                        if resolved[key] then
+                            resolved[key]:merge(n)
+                        else
+                            resolved[key] = vm.createNode(n)
+                        end
+                    end
+                end
+                if resolved[key] and node:isOptional() then
+                    resolved[key]:addOptional()
+                end
             end
+            return
         end
         if object.type == 'doc.type.array' then
             for n in node:eachObject() do
@@ -68,6 +95,7 @@ function mt:resolve(uri, args, removeGeneric)
                     resolve(object.node, vm.compileNode(n[1]))
                 end
             end
+            return
         end
         if object.type == 'doc.type.table' then
             for _, ufield in ipairs(object.fields) do
@@ -105,6 +133,34 @@ function mt:resolve(uri, args, removeGeneric)
                 end
                 ::CONTINUE::
             end
+            return
+        end
+        if object.type == 'doc.type.function' then
+            for i, arg in ipairs(object.args) do
+                for n in node:eachObject() do
+                    if n.type == 'function'
+                    or n.type == 'doc.type.function' then
+                        ---@cast n parser.object
+                        local farg = n.args and n.args[i]
+                        if farg then
+                            resolve(arg.extends, vm.compileNode(farg))
+                        end
+                    end
+                end
+            end
+            for i, ret in ipairs(object.returns) do
+                for n in node:eachObject() do
+                    if n.type == 'function'
+                    or n.type == 'doc.type.function' then
+                        ---@cast n parser.object
+                        local fret = vm.getReturnOfFunction(n, i)
+                        if fret then
+                            resolve(ret, vm.compileNode(fret))
+                        end
+                    end
+                end
+            end
+            return
         end
     end
 
@@ -190,9 +246,7 @@ function mt:resolve(uri, args, removeGeneric)
         local knownTypes, genericNames = getSignInfo(sign)
         if not isAllResolved(genericNames) then
             local newArgNode = buildArgNode(argNode,sign, knownTypes)
-            for n in sign:eachObject() do
-                resolve(n, newArgNode)
-            end
+            resolve(sign, newArgNode)
         end
     end
 

script/vm/sign.lua

@@ -308,6 +308,7 @@ function m.awaitPreload(scp)
 
     if scp.uri and not scp:get('bad root') then
         log.info('Scan files at:', scp:getName())
+        scp:gc(fw.watch(m.normalize(furi.decode(scp.uri))))
         local count = 0
         ---@async
         native:scan(furi.decode(scp.uri), function (path)
@@ -320,12 +321,12 @@ function m.awaitPreload(scp)
                 client.showMessage('Warning', lang.script('WORKSPACE_SCAN_TOO_MUCH', count, furi.decode(scp.uri)))
             end
         end)
-        scp:gc(fw.watch(m.normalize(furi.decode(scp.uri))))
     end
 
     for _, libMatcher in ipairs(librarys) do
         log.info('Scan library at:', libMatcher.uri)
         local count = 0
+        scp:gc(fw.watch(furi.decode(libMatcher.uri)))
         scp:addLink(libMatcher.uri)
         ---@async
         libMatcher.matcher:scan(furi.decode(libMatcher.uri), function (path)
@@ -338,7 +339,6 @@ function m.awaitPreload(scp)
                 client.showMessage('Warning', lang.script('WORKSPACE_SCAN_TOO_MUCH', count, furi.decode(libMatcher.uri)))
             end
         end)
-        scp:gc(fw.watch(furi.decode(libMatcher.uri)))
     end
 
     -- must wait for other scopes to add library