Merge branch 'master' into generic-pattern1

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
       matrix:
         include:
           - { os: ubuntu-20.04,   platform: linux-x64 }
-          - { os: macos-latest,   platform: darwin-x64 }
+          - { os: macos-14,       platform: darwin-arm64 }
           - { os: windows-latest, platform: win32-x64 }
     runs-on: ${{ matrix.os }}
     steps:

locale/en-us/setting.lua

@@ -293,6 +293,12 @@ When checking the type of union type, ignore the `nil` in it.
 
 When this setting is `false`, the `number|nil` type cannot be assigned to the `number` type. It can be with `true`.
 ]]
+config.type.inferParamType               =
+[[
+When a parameter type is not annotated, it is inferred from the function's call sites.
+
+When this setting is `false`, the type of the parameter is `any` when it is not annotated.
+]]
 config.doc.privateName                   =
 'Treat specific field names as private, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are private, witch can only be accessed in the class where the definition is located.'
 config.doc.protectedName                 =

locale/pt-br/setting.lua

@@ -293,6 +293,12 @@ When checking the type of union type, ignore the `nil` in it.
 
 When this setting is `false`, the `number|nil` type cannot be assigned to the `number` type. It can be with `true`.
 ]]
+config.type.inferParamType               = -- TODO: need translate!
+[[
+When the parameter type is not annotated, the parameter type is inferred from the function's incoming parameters.
+
+When this setting is `false`, the type of the parameter is `any` when it is not annotated.
+]]
 config.doc.privateName                   = -- TODO: need translate!
 'Treat specific field names as private, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are private, witch can only be accessed in the class where the definition is located.'
 config.doc.protectedName                 = -- TODO: need translate!

locale/zh-cn/setting.lua

@@ -292,6 +292,12 @@ config.type.weakNilCheck                 =
 
 此设置为 `false` 时，`numer|nil` 类型无法赋给 `number` 类型；为 `true` 是则可以。
 ]]
+config.type.inferParamType               =
+[[
+未注释参数类型时，参数类型由函数传入参数推断。
+
+如果设置为 "false"，则在未注释时，参数类型为 "any"。
+]]
 config.doc.privateName                   =
 '将特定名称的字段视为私有，例如 `m_*` 意味着 `XXX.m_id` 与 `XXX.m_type` 是私有字段，只能在定义所在的类中访问。'
 config.doc.protectedName                 =

locale/zh-tw/setting.lua

@@ -292,6 +292,12 @@ When checking the type of union type, ignore the `nil` in it.
 
 When this setting is `false`, the `number|nil` type cannot be assigned to the `number` type. It can be with `true`.
 ]]
+config.type.inferParamType               = -- TODO: need translate!
+[[
+未注释参数类型时，参数类型由函数传入参数推断。
+
+如果设置为 "false"，则在未注释时，参数类型为 "any"。
+]]
 config.doc.privateName                   = -- TODO: need translate!
 'Treat specific field names as private, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are private, witch can only be accessed in the class where the definition is located.'
 config.doc.protectedName                 = -- TODO: need translate!

make.lua

@@ -18,7 +18,7 @@ local includeCodeFormat = true
 
 require "make.detect_platform"
 
-lm:import "3rd/bee.lua"
+lm:import "3rd/bee.lua/make.lua"
 lm:import "make/code_format.lua"
 
 lm:source_set 'lpeglabel' {
@@ -55,21 +55,21 @@ lm:executable "lua-language-server" {
 }
 
 local platform = require 'bee.platform'
-local exe      = platform.OS == 'Windows' and ".exe" or ""
+local exe      = platform.os == 'windows' and ".exe" or ""
 
 lm:copy "copy_lua-language-server" {
-    input = lm.bindir .. "/lua-language-server" .. exe,
-    output = "bin/lua-language-server" .. exe,
+    inputs = "$bin/lua-language-server" .. exe,
+    outputs = "bin/lua-language-server" .. exe,
 }
 
 lm:copy "copy_bootstrap" {
-    input = "make/bootstrap.lua",
-    output = "bin/main.lua",
+    inputs = "make/bootstrap.lua",
+    outputs = "bin/main.lua",
 }
 
 lm:msvc_copydll 'copy_vcrt' {
     type = "vcrt",
-    output = "bin",
+    outputs = "bin",
 }
 
 lm:phony "all" {
@@ -93,27 +93,27 @@ if lm.notest then
 end
 
 lm:rule "run-bee-test" {
-    lm.bindir .. "/lua-language-server" .. exe, "$in",
+    args = { "$bin/lua-language-server" .. exe, "$in" },
     description = "Run test: $in.",
     pool = "console",
 }
 
 lm:rule "run-unit-test" {
-    "bin/lua-language-server" .. exe, "$in",
+    args = { "bin/lua-language-server" .. exe, "$in" },
     description = "Run test: $in.",
     pool = "console",
 }
 
 lm:build "bee-test" {
     rule = "run-bee-test",
     deps = { "lua-language-server", "copy_script" },
-    input = "3rd/bee.lua/test/test.lua",
+    inputs = "3rd/bee.lua/test/test.lua",
 }
 
 lm:build 'unit-test' {
     rule = "run-unit-test",
     deps = { "bee-test", "all" },
-    input = "test.lua",
+    inputs = "test.lua",
 }
 
 lm:default {

make/detect_platform.lua

@@ -2,7 +2,7 @@ local lm = require 'luamake'
 
 local platform = require 'bee.platform'
 
-if     platform.OS == 'macOS' then
+if     platform.os == 'macos' then
     if     lm.platform == nil then
     elseif lm.platform == "darwin-arm64" then
         lm.target = "arm64-apple-macos11"
@@ -11,7 +11,7 @@ if     platform.OS == 'macOS' then
     else
         error "unknown platform"
     end
-elseif platform.OS == 'Windows' then
+elseif platform.os == 'windows' then
     if     lm.platform == nil then
     elseif lm.platform == "win32-ia32" then
         lm.arch = "x86"
@@ -20,7 +20,7 @@ elseif platform.OS == 'Windows' then
     else
         error "unknown platform"
     end
-elseif platform.OS == 'Linux' then
+elseif platform.os == 'linux' then
     if     lm.platform == nil then
     elseif lm.platform == "linux-x64" then
     elseif lm.platform == "linux-arm64" then
@@ -52,7 +52,7 @@ local ARCH <const> = {
 }
 
 local function detectArch()
-    if platform.OS == 'Windows' then
+    if platform.os == 'windows' then
         return detectWindowsArch()
     end
     local posixArch = detectPosixArch()
@@ -67,5 +67,5 @@ local function targetPlatformArch()
 end
 
 if not lm.notest then
-    lm.notest = (platform.OS ~= 'Windows' and targetPlatformArch() ~= detectArch())
+    lm.notest = (platform.os ~= 'windows' and targetPlatformArch() ~= detectArch())
 end

script/cli/check.lua

@@ -11,6 +11,7 @@ local config   = require 'config.config'
 local fs       = require 'bee.filesystem'
 local provider = require 'provider'
 
+require 'plugin'
 require 'vm'
 
 lang(LOCALE)
@@ -26,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
@@ -69,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)
@@ -83,6 +85,7 @@ lclient():start(function (client)
                         .. ('0'):rep(#tostring(max) - #tostring(i))
                         .. tostring(i) .. '/' .. tostring(max)
             io.write(output)
+            io.flush()
         end
     end
     io.write('\x0D')

script/cli/doc.lua

@@ -189,6 +189,13 @@ 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
+            end
             return
         end
         if source.type == 'tableindex' then
@@ -250,6 +257,13 @@ 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
+            end
         end
     end
     if #result.defines == 0 then
@@ -264,12 +278,26 @@ local function collectVars(global, results)
     results[#results+1] = result
 end
 
+---Add config settings to JSON output.
+---@param results table
+local function collectConfig(results)
+    local result = {
+        name = 'LuaLS',
+        type = 'luals.config',
+        DOC = fs.absolute(fs.path(DOC)):string(),
+        defines = {},
+        fields = {}
+    }
+    results[#results+1] = result
+end
+
 ---@async
 ---@param callback fun(i, max)
 function export.export(outputPath, callback)
     local results = {}
     local globals = vm.getAllGlobals()
 
+    collectConfig(results)
     local max = 0
     for _ in pairs(globals) do
         max = max + 1
@@ -331,9 +359,53 @@ function export.makeDoc(outputPath)
     return docPath, mdPath
 end
 
+
+---Find file 'doc.json'.
+---@return fs.path
+local function findDocJson()
+    local doc_json_path
+    if type(DOC_UPDATE) == 'string' then
+        doc_json_path = fs.absolute(fs.path(DOC_UPDATE)) .. '/doc.json'
+    else
+        doc_json_path = fs.current_path() .. '/doc.json'
+    end
+    if fs.exists(doc_json_path) then
+        return doc_json_path
+    else
+        error(string.format('Error: File "%s" not found.', doc_json_path))
+    end
+end
+
+---@return string # path of 'doc.json'
+---@return string # path to be documented
+local function getPathDocUpdate()
+    local doc_json_path = findDocJson()
+    local ok, doc_path = pcall(
+        function ()
+            local json = require('json')
+            local json_file = io.open(doc_json_path:string(), 'r'):read('*all')
+            local json_data = json.decode(json_file)
+            for _, section in ipairs(json_data) do
+                if section.type == 'luals.config' then
+                    return section.DOC
+                end
+            end
+    end)
+    if ok then
+        local doc_json_dir = doc_json_path:string():gsub('/doc.json', '')
+        return doc_json_dir, doc_path
+    else
+        error(string.format('Error: Cannot update "%s".', doc_json_path .. '/doc.json'))
+    end
+end
+
 function export.runCLI()
     lang(LOCALE)
 
+    if DOC_UPDATE then
+        DOC_OUT_PATH, DOC = getPathDocUpdate()
+    end
+
     if type(DOC) ~= 'string' then
         print(lang.script('CLI_CHECK_ERROR_TYPE', type(DOC)))
         return

script/cli/init.lua

@@ -8,6 +8,11 @@ if _G['CHECK'] then
     os.exit(0, true)
 end
 
+if _G['DOC_UPDATE'] then
+    require 'cli.doc' .runCLI()
+    os.exit(0, true)
+end
+
 if _G['DOC'] then
     require 'cli.doc' .runCLI()
     os.exit(0, true)

script/client.lua

@@ -278,7 +278,7 @@ local function searchPatchInfo(cfg, rawKey)
         }
 end
 
----@param uri uri
+---@param uri? uri
 ---@param cfg table
 ---@param change config.change
 ---@return json.patch?
@@ -330,7 +330,7 @@ local function makeConfigPatch(uri, cfg, change)
     return nil
 end
 
----@param uri uri
+---@param uri? uri
 ---@param path string
 ---@param changes config.change[]
 ---@return string?

script/config/template.lua

@@ -397,6 +397,7 @@ local template = {
     ['Lua.type.castNumberToInteger']        = Type.Boolean >> true,
     ['Lua.type.weakUnionCheck']             = Type.Boolean >> false,
     ['Lua.type.weakNilCheck']               = Type.Boolean >> false,
+    ['Lua.type.inferParamType']            = Type.Boolean >> false,
     ['Lua.doc.privateName']                 = Type.Array(Type.String),
     ['Lua.doc.protectedName']               = Type.Array(Type.String),
     ['Lua.doc.packageName']                 = Type.Array(Type.String),

script/core/command/autoRequire.lua

@@ -132,6 +132,7 @@ end
 
 ---@async
 return function (data)
+    ---@type uri
     local uri    = data.uri
     local target = data.target
     local name   = data.name
@@ -158,5 +159,7 @@ return function (data)
     end
 
     local offset, fmt = findInsertRow(uri)
-    applyAutoRequire(uri, offset, name, requireName, fmt)
+    if offset and fmt then
+        applyAutoRequire(uri, offset, name, requireName, fmt)
+    end
 end