named varargs

Author: sumneko

locale/en-us/script.lua

@@ -247,6 +247,8 @@ PARSER_MISS_METHOD      =
 '<method> expected.'
 PARSER_ARGS_AFTER_DOTS  =
 '`...` should be the last arg.'
+PARSER_UNSUPPORT_NAMED_VARARG =
+'`(...name)` syntax is supported in {version}.'
 PARSER_KEYWORD          =
 '<keyword> cannot be used as name.'
 PARSER_EXP_IN_ACTION    =

locale/es-419/script.lua

@@ -241,6 +241,8 @@ PARSER_MISS_METHOD      =
 'Se esperaba <method>.'
 PARSER_ARGS_AFTER_DOTS  =
 '`...` should be the last arg.'
+PARSER_UNSUPPORT_NAMED_VARARG =
+'La sintaxis `(...name)` es compatible con {version}.'
 PARSER_KEYWORD          =
 '<keyword> cannot be used as name.'
 PARSER_EXP_IN_ACTION    =

locale/ja-jp/script.lua

@@ -243,6 +243,8 @@ PARSER_MISS_METHOD      =
 'メソッド名が不足しています。'
 PARSER_ARGS_AFTER_DOTS  =
 '`...` は最後の引数でなければなりません。'
+PARSER_UNSUPPORT_NAMED_VARARG =
+'`(...name)` 構文は {version} でサポートされています。'
 PARSER_KEYWORD          =
 'キーワードは名前として使用できません。'
 PARSER_EXP_IN_ACTION    =

locale/pt-br/script.lua

@@ -243,6 +243,8 @@ PARSER_MISS_METHOD      =
 '<method> esperado.'
 PARSER_ARGS_AFTER_DOTS  =
 '`...` deve ser o último argumento.'
+PARSER_UNSUPPORT_NAMED_VARARG =
+'A sintaxe `(...name)` é suportada em {version}.'
 PARSER_KEYWORD          =
 '<keyword> não pode ser usado como nome.'
 PARSER_EXP_IN_ACTION    =

locale/zh-cn/script.lua

@@ -247,6 +247,8 @@ PARSER_MISS_METHOD      =
 '缺少方法名。'
 PARSER_ARGS_AFTER_DOTS  =
 '`...`必须是最后一个参数。'
+PARSER_UNSUPPORT_NAMED_VARARG =
+'{version} 开始支持 `(...name)` 语法。'
 PARSER_KEYWORD          =
 '关键字无法作为名称。'
 PARSER_EXP_IN_ACTION    =

locale/zh-tw/script.lua

@@ -243,6 +243,8 @@ PARSER_MISS_METHOD      =
 '缺少方法名。'
 PARSER_ARGS_AFTER_DOTS  =
 '`...` 必須是最後一個引數。'
+PARSER_UNSUPPORT_NAMED_VARARG =
+'{version} 開始支援 `(...name)` 語法。'
 PARSER_KEYWORD          =
 '關鍵字無法作為名稱。'
 PARSER_EXP_IN_ACTION    =

script/core/hover/args.lua

@@ -17,27 +17,39 @@ local function asFunction(source)
             if arg.type == 'self' then
                 goto CONTINUE
             end
-            local name = arg.name or guide.getKeyName(arg)
-            if name then
-                local argNode = vm.compileNode(arg)
-                local optional
-                if argNode:isOptional() then
-                    optional = true
-                    argNode = argNode:copy()
-                    argNode:removeOptional()
+            if arg.type == '...' then
+                -- Lua 5.5: check for named vararg (...args)
+                if arg.name then
+                    local varargName = guide.getKeyName(arg.name)
+                    args[#args+1] = ('%s%s: %s'):format(
+                        '...',
+                        varargName,
+                        vm.getInfer(arg):view(guide.getUri(source), 'any')
+                    )
+                else
+                    args[#args+1] = ('%s%s'):format(
+                        '...',
+                        vm.getInfer(arg):view(guide.getUri(source), 'any')
+                    )
                 end
-                args[#args+1] = ('%s%s: %s'):format(
-                    name,
-                    optional and '?' or '',
-                    vm.getInfer(argNode):view(guide.getUri(source), 'any')
-                )
-            elseif arg.type == '...' then
-                args[#args+1] = ('%s%s'):format(
-                    '...',
-                    vm.getInfer(arg):view(guide.getUri(source), 'any')
-                )
             else
-                args[#args+1] = ('%s'):format(vm.getInfer(arg):view(guide.getUri(source), 'any'))
+                local name = arg.name or guide.getKeyName(arg)
+                if name then
+                    local argNode = vm.compileNode(arg)
+                    local optional
+                    if argNode:isOptional() then
+                        optional = true
+                        argNode = argNode:copy()
+                        argNode:removeOptional()
+                    end
+                    args[#args+1] = ('%s%s: %s'):format(
+                        name,
+                        optional and '?' or '',
+                        vm.getInfer(argNode):view(guide.getUri(source), 'any')
+                    )
+                else
+                    args[#args+1] = ('%s'):format(vm.getInfer(arg):view(guide.getUri(source), 'any'))
+                end
             end
             ::CONTINUE::
         end

script/parser/compile.lua

@@ -2405,6 +2405,31 @@ local function parseParams(params, isLambda)
             end
             hasDots = true
             Index = Index + 2
+
+            -- Lua 5.5: check for (...args) syntax
+            skipSpace()
+            local nextToken = Tokens[Index + 1]
+            if nextToken and CharMapWord[ssub(nextToken, 1, 1)] then
+                if State.version ~= 'Lua 5.5' then
+                    pushError {
+                        type   = 'UNSUPPORT_NAMED_VARARG',
+                        start  = getPosition(Tokens[Index], 'left'),
+                        finish = getPosition(Tokens[Index] + #nextToken - 1, 'right'),
+                        version = 'Lua 5.5',
+                    }
+                end
+                -- Create local variable for vararg
+                local varargName = createLocal {
+                    start  = getPosition(Tokens[Index], 'left'),
+                    finish = getPosition(Tokens[Index] + #nextToken - 1, 'right'),
+                    parent = params,
+                    [1]    = nextToken,
+                }
+                varargName.varargRef = vararg
+                vararg.name = varargName
+                Index = Index + 2
+            end
+
             goto CONTINUE
         end
         if CharMapWord[ssub(token, 1, 1)] then

script/parser/guide.lua

@@ -78,6 +78,7 @@ local type         = type
 ---@field dot                   { type: string, start: integer, finish: integer }
 ---@field colon                 { type: string, start: integer, finish: integer }
 ---@field declare?              boolean
+---@field varargRef?            boolean
 ---@field package _root         parser.object
 ---@field package _eachCache?   parser.object[]
 ---@field package _isGlobal?    boolean

script/vm/compiler.lua

@@ -1367,6 +1367,13 @@ end
 local function compileLocal(source)
     local myNode = vm.setNode(source, source)
 
+    -- Lua 5.5: named vararg (...args) -> args is table
+    if source.varargRef then
+        vm.setNode(source, vm.declareGlobal('type', 'table'))
+        myNode.hasDefined = true
+        return
+    end
+
     local hasMarkDoc
     if source.bindDocs then
         hasMarkDoc = vm.bindDocs(source)