From 37ba16ca76563a026c7e99871f963693b9053ce8 Mon Sep 17 00:00:00 2001
From: carsakiller <carsakiller@gmail.com>
Date: Fri, 27 Feb 2026 19:05:39 +0000
Subject: [PATCH 1/2] fix: string.match and string.gmatch may return
 string|number|nil

---
 meta/template/string.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/template/string.lua b/meta/template/string.lua
index c7c2f915d..0961f3432 100644
--- a/meta/template/string.lua
+++ b/meta/template/string.lua
@@ -55,14 +55,14 @@ function string.format(s, ...) end
 ---#if VERSION <= 5.3 then
 ---@param s       string|number
 ---@param pattern string|number
----@return fun():string, ...
+---@return fun():string|integer?, ...
 ---@nodiscard
 function string.gmatch(s, pattern) end
 ---#else
 ---@param s       string|number
 ---@param pattern string|number
 ---@param init?   integer
----@return fun():string, ...
+---@return fun():string|integer?, ...
 function string.gmatch(s, pattern, init) end
 ---#end
 
@@ -91,7 +91,7 @@ function string.lower(s) end
 ---@param s       string|number
 ---@param pattern string|number
 ---@param init?   integer
----@return any ...
+---@return string|integer? ...
 ---@nodiscard
 function string.match(s, pattern, init) end
 

From ca4bd214174b14c83443dad119017b643763d7fa Mon Sep 17 00:00:00 2001
From: carsakiller <carsakiller@gmail.com>
Date: Fri, 27 Feb 2026 19:18:45 +0000
Subject: [PATCH 2/2] add #3357 fix to changelog

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 3b605d2cf..97ac25ac8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
 * `CHG` Modified the `ResolveRequire` function to pass the source URI as a third argument.
+* `FIX` string.match and string.gmatch may return `string|integer?` [#3357](https://github.com/LuaLS/lua-language-server/issues/3357)
 
 ## 3.17.1
 `2026-01-20`