Skip to content

Commit b20f3f7

Browse files
authored
Merge pull request #2016 from C3pa/update-string-annotations
Make functions in string api accept numbers
2 parents 6ef1608 + 166e2df commit b20f3f7

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

meta/template/string.lua

+20-20
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
string = {}
66

77
---#DES 'string.byte'
8-
---@param s string
8+
---@param s string|number
99
---@param i? integer
1010
---@param j? integer
1111
---@return integer ...
@@ -27,8 +27,8 @@ function string.char(byte, ...) end
2727
function string.dump(f, strip) end
2828

2929
---#DES 'string.find'
30-
---@param s string
31-
---@param pattern string
30+
---@param s string|number
31+
---@param pattern string|number
3232
---@param init? integer
3333
---@param plain? boolean
3434
---@return integer start
@@ -38,30 +38,30 @@ function string.dump(f, strip) end
3838
function string.find(s, pattern, init, plain) end
3939

4040
---#DES 'string.format'
41-
---@param s any
41+
---@param s string|number
4242
---@param ... any
4343
---@return string
4444
---@nodiscard
4545
function string.format(s, ...) end
4646

4747
---#DES 'string.gmatch'
4848
---#if VERSION <= 5.3 then
49-
---@param s string
50-
---@param pattern string
49+
---@param s string|number
50+
---@param pattern string|number
5151
---@return fun():string, ...
5252
---@nodiscard
5353
function string.gmatch(s, pattern) end
5454
---#else
55-
---@param s string
56-
---@param pattern string
55+
---@param s string|number
56+
---@param pattern string|number
5757
---@param init? integer
5858
---@return fun():string, ...
5959
function string.gmatch(s, pattern, init) end
6060
---#end
6161

6262
---#DES 'string.gsub'
63-
---@param s string
64-
---@param pattern string
63+
---@param s string|number
64+
---@param pattern string|number
6565
---@param repl string|number|table|function
6666
---@param n? integer
6767
---@return string
@@ -70,20 +70,20 @@ function string.gmatch(s, pattern, init) end
7070
function string.gsub(s, pattern, repl, n) end
7171

7272
---#DES 'string.len'
73-
---@param s string
73+
---@param s string|number
7474
---@return integer
7575
---@nodiscard
7676
function string.len(s) end
7777

7878
---#DES 'string.lower'
79-
---@param s string
79+
---@param s string|number
8080
---@return string
8181
---@nodiscard
8282
function string.lower(s) end
8383

8484
---#DES 'string.match'
85-
---@param s string
86-
---@param pattern string
85+
---@param s string|number
86+
---@param pattern string|number
8787
---@param init? integer
8888
---@return any ...
8989
---@nodiscard
@@ -107,29 +107,29 @@ function string.packsize(fmt) end
107107

108108
---#if VERSION <= 5.1 and not JIT then
109109
---#DES 'string.rep<5.1'
110-
---@param s string
110+
---@param s string|number
111111
---@param n integer
112112
---@return string
113113
---@nodiscard
114114
function string.rep(s, n) end
115115
---#else
116116
---#DES 'string.rep>5.2'
117-
---@param s string
117+
---@param s string|number
118118
---@param n integer
119-
---@param sep? string
119+
---@param sep? string|number
120120
---@return string
121121
---@nodiscard
122122
function string.rep(s, n, sep) end
123123
---#end
124124

125125
---#DES 'string.reverse'
126-
---@param s string
126+
---@param s string|number
127127
---@return string
128128
---@nodiscard
129129
function string.reverse(s) end
130130

131131
---#DES 'string.sub'
132-
---@param s string
132+
---@param s string|number
133133
---@param i integer
134134
---@param j? integer
135135
---@return string
@@ -147,7 +147,7 @@ function string.sub(s, i, j) end
147147
function string.unpack(fmt, s, pos) end
148148

149149
---#DES 'string.upper'
150-
---@param s string
150+
---@param s string|number
151151
---@return string
152152
---@nodiscard
153153
function string.upper(s) end

test/hover/init.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,14 @@ TEST [[
238238
string.<?sub?>()
239239
]]
240240
[[
241-
function string.sub(s: string, i: integer, j?: integer)
241+
function string.sub(s: string|number, i: integer, j?: integer)
242242
-> string
243243
]]
244244

245245
TEST[[
246246
('xx'):<?sub?>()
247247
]]
248-
[[function string.sub(s: string, i: integer, j?: integer)
248+
[[function string.sub(s: string|number, i: integer, j?: integer)
249249
-> string]]
250250

251251
TEST [[
@@ -272,7 +272,7 @@ TEST [[
272272
string.<?lower?>()
273273
]]
274274
[[
275-
function string.lower(s: string)
275+
function string.lower(s: string|number)
276276
-> string
277277
]]
278278

0 commit comments

Comments
 (0)