summaryrefslogtreecommitdiff
path: root/script/parser
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2022-06-28 19:28:54 +0800
committer最萌小汐 <sumneko@hotmail.com>2022-06-28 19:28:54 +0800
commitdeac4582d38908c1281d4d5215b7b69ff8400dca (patch)
tree833da004bc6bd82dadb373bbc345224160ce0972 /script/parser
parent7e778b31476831864dff995ae3ae4e5f223c5726 (diff)
downloadlua-language-server-deac4582d38908c1281d4d5215b7b69ff8400dca.zip
parse `---@return ...` a `---@return ... unknown`
Diffstat (limited to 'script/parser')
-rw-r--r--script/parser/luadoc.lua16
1 files changed, 14 insertions, 2 deletions
diff --git a/script/parser/luadoc.lua b/script/parser/luadoc.lua
index e71c6f18..c1a8d19c 100644
--- a/script/parser/luadoc.lua
+++ b/script/parser/luadoc.lua
@@ -452,6 +452,10 @@ local function parseTypeUnitFunction(parent)
name = returnName
return true
end
+ if returnName[1] == '...' then
+ name = returnName
+ return false
+ end
return false
end)
local rtn = parseType(typeUnit)
@@ -648,13 +652,16 @@ function parseTypeUnit(parent)
or parseCode(parent)
or parseInteger(parent)
or parseBoolean(parent)
- or parseDots('doc.type.name', parent)
or parseParen(parent)
if not result then
result = parseName('doc.type.name', parent)
+ or parseDots('doc.type.name', parent)
if not result then
return nil
end
+ if result[1] == '...' then
+ result[1] = 'unknown'
+ end
end
while true do
local newResult = parseTypeUnitSign(parent, result)
@@ -918,6 +925,10 @@ local docSwitch = util.switch()
returns = {},
}
while true do
+ local dots = parseDots('doc.return.name')
+ if dots then
+ Ci = Ci - 1
+ end
local docType = parseType(result)
if not docType then
break
@@ -929,7 +940,8 @@ local docSwitch = util.switch()
nextToken()
docType.optional = true
end
- docType.name = parseName('doc.return.name', docType)
+ docType.name = dots
+ or parseName('doc.return.name', docType)
or parseDots('doc.return.name', docType)
result.returns[#result.returns+1] = docType
if not checkToken('symbol', ',', 1) then