summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2024-09-05 18:30:05 +0800
committerGitHub <noreply@github.com>2024-09-05 18:30:05 +0800
commit36fe74925b83a59dca318b8fc2fdd6f815ca0f10 (patch)
tree291372055a8523f5f49c583a31eb1e4e7725b322
parentb871eb6fa4dfa2edc01ba871b3890bfa01206a93 (diff)
parent5083f1cd9438da23f1022327ea24e7044bcc2f49 (diff)
downloadlua-language-server-36fe74925b83a59dca318b8fc2fdd6f815ca0f10.zip
Merge branch 'master' into fix-vm-plugins
-rw-r--r--changelog.md1
-rw-r--r--meta/template/basic.lua2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.md b/changelog.md
index 23e52d48..bfd1f467 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,6 +5,7 @@
* `NEW` Custom documentation exporter
* `NEW` Setting: `Lua.docScriptPath`: Path to a script that overrides `cli.doc.export`, allowing user-specified documentation exporting.
* `FIX` Fix `VM.OnCompileFunctionParam` function in plugins
+* `FIX` Lua 5.1: fix incorrect warning when using setfenv with an int as first parameter
## 3.10.5
`2024-8-19`
diff --git a/meta/template/basic.lua b/meta/template/basic.lua
index 75cd1dee..70303ca0 100644
--- a/meta/template/basic.lua
+++ b/meta/template/basic.lua
@@ -210,7 +210,7 @@ function select(index, ...) end
---@version 5.1
---#DES 'setfenv'
----@param f async fun(...):...|integer
+---@param f (async fun(...):...)|integer
---@param table table
---@return function
function setfenv(f, table) end