Merge branch 'master' into doc-update

Author: AndreasMatthias

3rd/bee.lua

@@ -27,6 +27,7 @@ if not rootUri then
     print(lang.script('CLI_CHECK_ERROR_URI', rootPath))
     return
 end
+rootUri = rootUri:gsub("/$", "")
 
 if CHECKLEVEL then
     if not define.DiagnosticSeverity[CHECKLEVEL] then
@@ -70,7 +71,7 @@ lclient():start(function (client)
     end
     config.set(rootUri, 'Lua.diagnostics.disable', util.getTableKeys(disables, true))
 
-    local uris = files.getAllUris(rootUri)
+    local uris = files.getChildFiles(rootUri)
     local max  = #uris
     for i, uri in ipairs(uris) do
         files.open(uri)

3rd/luamake

@@ -189,9 +189,12 @@ local function collectTypes(global, results)
             field.rawdesc = getDesc(source, true)
             field.extends = packObject(source.value)
             field.visible = vm.getVisibleType(source)
+            if vm.isAsync(source, true) then
+                field.async = true
+            end
             local depr = vm.getDeprecated(source)
             if (depr and not depr.versions) then
-               field.deprecated = true
+                field.deprecated = true
             end
             return
         end
@@ -254,9 +257,12 @@ local function collectVars(global, results)
             result.rawdesc = result.rawdesc or getDesc(set, true)
             result.defines[#result.defines].extends['desc'] = getDesc(set)
             result.defines[#result.defines].extends['rawdesc'] = getDesc(set, true)
+            if vm.isAsync(set, true) then
+                result.defines[#result.defines].extends['async'] = true
+            end
             local depr = vm.getDeprecated(set)
             if (depr and not depr.versions) then
-               result.defines[#result.defines].extends['deprecated'] = true
+                result.defines[#result.defines].extends['deprecated'] = true
             end
         end
     end

script/cli/check.lua

@@ -119,7 +119,7 @@ end
 
 TEST [[
 local function f(cb)
-    <!cb!>()
+    cb()
 end
 
 local function af()

script/cli/doc.lua

@@ -94,7 +94,7 @@ print(1, 2, 3, 4, 5)
 
 TEST [[
 local function f(callback)
-    callback(<!1!>, <!2!>, <!3!>)
+    callback(1, 2, 3)
 end
 f(function () end)
 ]]

test/diagnostics/await-in-sync.lua

@@ -276,15 +276,15 @@ function string.lower(s: string|number)
   -> string
 ]]
 
--- 根据传入值推测参数类型
+-- 不根据传入值推测参数类型
 TEST [[
 local function x(a, ...)
 end
 
 <?x?>(1, 2, 3, 4, 5, 6, 7)
 ]]
 [[
-function x(a: integer, ...any)
+function x(a: any, ...any)
 ]]
 
 TEST [[

test/diagnostics/redundant-parameter.lua

@@ -88,7 +88,7 @@ end
 
 x(1, 2, 3, <??>
 ]]
-{'function x(a: integer, <!...any!>)'}
+{'function x(a: any, <!...any!>)'}
 
 TEST [[
 (''):sub(<??>
@@ -106,7 +106,7 @@ end
 
 f(1, 'string<??>')
 ]]
-{'function f(a: integer, <!b: string!>, c: any)'}
+{'function f(a: any, <!b: any!>, c: any)'}
 
 TEST [[
 pcall(function () <??> end)
@@ -156,7 +156,7 @@ end
 
 f({},<??>)
 ]]
-{'function f(a: table, <!b: any!>, c: any)'}
+{'function f(a: any, <!b: any!>, c: any)'}
 
 TEST [[
 for _ in pairs(<??>) do
@@ -188,31 +188,31 @@ end
 
 x(  aaaa  <??>, 2)
 ]]
-{"function x(<!a: any!>, b: integer)"}
+{"function x(<!a: any!>, b: any)"}
 
 TEST [[
 local function x(a, b)
 end
 
 x(<??>   aaaa  , 2)
 ]]
-{'function x(<!a: any!>, b: integer)'}
+{'function x(<!a: any!>, b: any)'}
 
 TEST [[
 local function x(a, b)
 end
 
 x(aaaa  ,<??>    2)
 ]]
-{'function x(a: any, <!b: integer!>)'}
+{'function x(a: any, <!b: any!>)'}
 
 TEST [[
 local function x(a, b)
 end
 
 x(aaaa  ,    2     <??>)
 ]]
-{'function x(a: any, <!b: integer!>)'}
+{'function x(a: any, <!b: any!>)'}
 
 TEST [[
 local fooC
@@ -372,3 +372,30 @@ t:event("onTimer", <??>)
 {
 '(method) (ev: "onTimer", <!t: integer!>)',
 }
+
+local config = require 'config'
+config.set(nil, "Lua.type.inferParamType", true)
+
+TEST [[
+local function x(a, b)
+end
+
+x("1", <??>)
+]]
+{
+'function x(a: string, <!b: any!>)'
+}
+
+TEST [[
+local function x(a)
+   
+end
+x('str')
+x(1)
+x(<??>)
+]]
+{
+'function x(<!a: string|integer!>)',
+}
+
+config.set(nil, "Lua.type.inferParamType", false)