summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.md5
-rw-r--r--meta/template/string.lua8
2 files changed, 13 insertions, 0 deletions
diff --git a/changelog.md b/changelog.md
index f1cc4887..18485ec6 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
# changelog
+## 3.6.26
+* `FIX` [#2224]
+
+[#2224]: https://github.com/LuaLS/lua-language-server/issues/2224
+
## 3.6.25
`2023-7-26`
* `FIX` [#2214]
diff --git a/meta/template/string.lua b/meta/template/string.lua
index b0acb5b8..c5fe6ab6 100644
--- a/meta/template/string.lua
+++ b/meta/template/string.lua
@@ -20,11 +20,18 @@ function string.byte(s, i, j) end
function string.char(byte, ...) end
---#DES 'string.dump'
+---#if VERSION >= 5.3 or JIT then
---@param f async fun(...):...
---@param strip? boolean
---@return string
---@nodiscard
function string.dump(f, strip) end
+---#else
+---@param f async fun(...):...
+---@return string
+---@nodiscard
+function string.dump(f) end
+---#end
---#DES 'string.find'
---@param s string|number
@@ -93,6 +100,7 @@ function string.match(s, pattern, init) end
---#DES 'string.pack'
---@param fmt string
---@param v1 string|number
+---@param v2 string|number
---@param ... string|number
---@return string binary
---@nodiscard