Skip to content

Commit a9adf80

Browse files
authored
Merge pull request #2225 from C3pa/update-string-annotations
Update `string.dump` so it doesn't have strip argument in Lua 5.1 and 5.2
2 parents 5fe53c7 + 8f09bd4 commit a9adf80

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# changelog
22

3+
## 3.6.26
4+
* `FIX` [#2224]
5+
6+
[#2224]: https://github.com/LuaLS/lua-language-server/issues/2224
7+
38
## 3.6.25
49
`2023-7-26`
510
* `FIX` [#2214]

meta/template/string.lua

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,18 @@ function string.byte(s, i, j) end
2020
function string.char(byte, ...) end
2121

2222
---#DES 'string.dump'
23+
---#if VERSION >= 5.3 or JIT then
2324
---@param f async fun(...):...
2425
---@param strip? boolean
2526
---@return string
2627
---@nodiscard
2728
function string.dump(f, strip) end
29+
---#else
30+
---@param f async fun(...):...
31+
---@return string
32+
---@nodiscard
33+
function string.dump(f) end
34+
---#end
2835

2936
---#DES 'string.find'
3037
---@param s string|number
@@ -93,6 +100,7 @@ function string.match(s, pattern, init) end
93100
---#DES 'string.pack'
94101
---@param fmt string
95102
---@param v1 string|number
103+
---@param v2 string|number
96104
---@param ... string|number
97105
---@return string binary
98106
---@nodiscard

0 commit comments

Comments
 (0)