summaryrefslogtreecommitdiff
path: root/meta/template
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2022-04-06 00:25:14 +0800
committer最萌小汐 <sumneko@hotmail.com>2022-04-06 00:25:14 +0800
commit21d1b8fd59bcfff3797453e787a1151f8987ae0b (patch)
tree0e146319e02373c2a90d307c1c06e4af562c57b5 /meta/template
parentd308b37e66d01737d5079b5a062127cdfcba47b1 (diff)
parent63b360689f0c2c99a1ae410518f6866f49972f98 (diff)
downloadlua-language-server-21d1b8fd59bcfff3797453e787a1151f8987ae0b.zip
Merge commit '63b360689f0c2c99a1ae410518f6866f49972f98' into 3.0
Diffstat (limited to 'meta/template')
-rw-r--r--meta/template/basic.lua6
-rw-r--r--meta/template/debug.lua2
2 files changed, 7 insertions, 1 deletions
diff --git a/meta/template/basic.lua b/meta/template/basic.lua
index 31b10bd1..aed3085e 100644
--- a/meta/template/basic.lua
+++ b/meta/template/basic.lua
@@ -127,6 +127,12 @@ function loadfile(filename, mode, env) end
function loadstring(text, chunkname) end
---@version 5.1
+---@param proxy boolean|table
+---@return userdata
+---@nodiscard
+function newproxy(proxy) end
+
+---@version 5.1
---#DES 'module'
---@param name string
function module(name, ...) end
diff --git a/meta/template/debug.lua b/meta/template/debug.lua
index c8b506f5..6e74e1f6 100644
--- a/meta/template/debug.lua
+++ b/meta/template/debug.lua
@@ -15,7 +15,7 @@ debug = {}
---@field currentline integer
---@field istailcall boolean
---@field nups integer
----#if VERSION >= 5.2 then
+---#if VERSION >= 5.2 or JIT then
---@field nparams integer
---@field isvararg boolean
---#end