Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions meta/template/string.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
string = {}

---#DES 'string.byte'
---@param s string
---@param s string|number
---@param i? integer
---@param j? integer
---@return integer ...
Expand All @@ -27,8 +27,8 @@ function string.char(byte, ...) end
function string.dump(f, strip) end

---#DES 'string.find'
---@param s string
---@param pattern string
---@param s string|number
---@param pattern string|number
---@param init? integer
---@param plain? boolean
---@return integer start
Expand All @@ -38,30 +38,30 @@ function string.dump(f, strip) end
function string.find(s, pattern, init, plain) end

---#DES 'string.format'
---@param s any
---@param s string|number
---@param ... any
---@return string
---@nodiscard
function string.format(s, ...) end

---#DES 'string.gmatch'
---#if VERSION <= 5.3 then
---@param s string
---@param pattern string
---@param s string|number
---@param pattern string|number
---@return fun():string, ...
---@nodiscard
function string.gmatch(s, pattern) end
---#else
---@param s string
---@param pattern string
---@param s string|number
---@param pattern string|number
---@param init? integer
---@return fun():string, ...
function string.gmatch(s, pattern, init) end
---#end

---#DES 'string.gsub'
---@param s string
---@param pattern string
---@param s string|number
---@param pattern string|number
---@param repl string|number|table|function
---@param n? integer
---@return string
Expand All @@ -70,20 +70,20 @@ function string.gmatch(s, pattern, init) end
function string.gsub(s, pattern, repl, n) end

---#DES 'string.len'
---@param s string
---@param s string|number
---@return integer
---@nodiscard
function string.len(s) end

---#DES 'string.lower'
---@param s string
---@param s string|number
---@return string
---@nodiscard
function string.lower(s) end

---#DES 'string.match'
---@param s string
---@param pattern string
---@param s string|number
---@param pattern string|number
---@param init? integer
---@return any ...
---@nodiscard
Expand All @@ -107,29 +107,29 @@ function string.packsize(fmt) end

---#if VERSION <= 5.1 and not JIT then
---#DES 'string.rep<5.1'
---@param s string
---@param s string|number
---@param n integer
---@return string
---@nodiscard
function string.rep(s, n) end
---#else
---#DES 'string.rep>5.2'
---@param s string
---@param s string|number
---@param n integer
---@param sep? string
---@param sep? string|number
---@return string
---@nodiscard
function string.rep(s, n, sep) end
---#end

---#DES 'string.reverse'
---@param s string
---@param s string|number
---@return string
---@nodiscard
function string.reverse(s) end

---#DES 'string.sub'
---@param s string
---@param s string|number
---@param i integer
---@param j? integer
---@return string
Expand All @@ -147,7 +147,7 @@ function string.sub(s, i, j) end
function string.unpack(fmt, s, pos) end

---#DES 'string.upper'
---@param s string
---@param s string|number
---@return string
---@nodiscard
function string.upper(s) end
Expand Down
6 changes: 3 additions & 3 deletions test/hover/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,14 @@ TEST [[
string.<?sub?>()
]]
[[
function string.sub(s: string, i: integer, j?: integer)
function string.sub(s: string|number, i: integer, j?: integer)
-> string
]]

TEST[[
('xx'):<?sub?>()
]]
[[function string.sub(s: string, i: integer, j?: integer)
[[function string.sub(s: string|number, i: integer, j?: integer)
-> string]]

TEST [[
Expand All @@ -272,7 +272,7 @@ TEST [[
string.<?lower?>()
]]
[[
function string.lower(s: string)
function string.lower(s: string|number)
-> string
]]

Expand Down