diff options
| author | Andreas <andreas.matthias@gmail.com> | 2024-02-27 11:31:39 +0100 |
|---|---|---|
| committer | Andreas <andreas.matthias@gmail.com> | 2024-02-27 11:31:39 +0100 |
| commit | 15e6ed88650b87cf675ccce08e772cfed2b4d7df (patch) | |
| tree | 19146101895c44acd0169ca7c7ea5d16c8a9b6af /script | |
| parent | 8d31712f38a48dc814657d00b7e63d083bd888dc (diff) | |
| parent | 85f7e6f962ed47afa00ac7fd57e6130419d973ce (diff) | |
| download | lua-language-server-15e6ed88650b87cf675ccce08e772cfed2b4d7df.zip | |
Merge branch 'master' into doc-update
Diffstat (limited to 'script')
| -rw-r--r-- | script/cli/check.lua | 3 | ||||
| -rw-r--r-- | script/cli/doc.lua | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/script/cli/check.lua b/script/cli/check.lua index 146035b6..84ac8766 100644 --- a/script/cli/check.lua +++ b/script/cli/check.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) diff --git a/script/cli/doc.lua b/script/cli/doc.lua index 7ba3ae68..c413d354 100644 --- a/script/cli/doc.lua +++ b/script/cli/doc.lua @@ -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 |