merge: resolve conflict with upstream/master

Merge upstream/master into fix/field-override-type-inference branch.
Resolved changelog.md conflict by keeping both our new feature entry
and upstream's new entries.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: ChouUn

.vscode/settings.json

@@ -3,8 +3,11 @@
     "Lua.misc.parameters": [
         //"--preview",
         "--develop=true",
-        "--dbgport=11413",
+        "--dbgport=11431",
+        //"--dbgwait",
         "--loglevel=trace",
+        "--trace-rpc",
+        //"--save-coder",
         //"--shownode",
         //"--lazy",
     ],

changelog.md

@@ -3,7 +3,34 @@
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
 * `NEW` Support type inference for `@field` and `@type` function declarations in method overrides [#3367](https://github.com/LuaLS/lua-language-server/issues/3367)
+* `FIX` Deduplicate documentation bindings for parameters
+* `FIX` Correct `math.type` meta return annotation to use `nil` instead of the string literal `'nil'`
+* `FIX` Fix initial `nameStyle.config` not getting loaded in the appropriate workspace.
+* `FIX` string.match and string.gmatch may return `string|integer?` [#3357](https://github.com/LuaLS/lua-language-server/issues/3357)
+
+## 3.18.2
+* `CHG` `duplicate-set-field` diagnostic now supports linked suppression: when any occurrence of a duplicate field is suppressed with `---@diagnostic disable` or `---@diagnostic disable-next-line`, all warnings for that field name will be suppressed
+* `REVERT` Reverted commit 1dd194da537df432f97295ea167dfef19acd7a4e which fix for type inference in and/or idioms. The circular dependency guard introduced issues with type narrowing in if-blocks where variables are reassigned (e.g., `if x then x = 0 end` would lose type information from the if-block in subsequent code). This needs a more refined solution to balance fixing circular dependencies without breaking type narrowing.
+
+## 3.18.1
+`2026-04-08`
+* `FIX` Allow `global` to be used as an identifier in Lua 5.5 when it is not part of a `global` declaration
+
+## 3.18.0
+`2026-04-03`
+* `CHG` Always track symbol-links
 * `CHG` Modified the `ResolveRequire` function to pass the source URI as a third argument.
+* `CHG` Improved the output of test failures during development
+* `FIX` Fix type inference for `x == nil and "default" or x` idiom [#2236](https://github.com/LuaLS/lua-language-server/issues/2236)
+* `FIX` Fix type loss for assignments inside `if`/`for` blocks due to circular dependency in tracer [#2374](https://github.com/LuaLS/lua-language-server/issues/2374) [#2494](https://github.com/LuaLS/lua-language-server/issues/2494)
+* `FIX` Resolve generic class method return types for `@param self list<T>` pattern
+* `FIX` Fix `ipairs(self)` type resolution in generic class methods
+* `FIX` Fix double angle brackets in generic sign display (`list<<T>>` -> `list<T>`)
+* `FIX` Fix nil crash in `getParentClass` for `doc.field` without class
+* `FIX` Fix type inference for bitwise operators (`<<`, `>>`, `&`, `|`, `~`) on integer variables
+* `FIX` Fix constant value computation for chained bitwise expressions in hover tooltips
+* `FIX` Support Lua 5.5 prefix local attributes such as `local <close>x` and `local <const>x`
+* `FIX` Correct `os` and `io` meta return types.
 
 ## 3.17.1
 `2026-01-20`

make.sh

@@ -26,7 +26,7 @@ io = {}
 
 ---#DES 'io.close'
 ---@param file? file*
----@return boolean?  suc
+---@return true?     suc
 ---@return exitcode? exitcode
 ---@return integer?  code
 function io.close(file) end
@@ -119,7 +119,7 @@ local file = {}
 ---@alias exitcode "exit"|"signal"
 
 ---#DES 'file:close'
----@return boolean?  suc
+---@return true?     suc
 ---@return exitcode? exitcode
 ---@return integer?  code
 function file:close() end

meta/template/io.lua

@@ -240,7 +240,7 @@ function math.tointeger(x) end
 ---@return
 ---| '"integer"'
 ---| '"float"'
----| 'nil'
+---| nil
 ---@nodiscard
 function math.type(x) end
 

meta/template/math.lua

@@ -11,23 +11,23 @@ function os.clock() end
 
 ---@class osdate:osdateparam
 ---#DES 'osdate.year'
----@field year  integer|string
+---@field year  integer
 ---#DES 'osdate.month'
----@field month integer|string
+---@field month integer
 ---#DES 'osdate.day'
----@field day   integer|string
+---@field day   integer
 ---#DES 'osdate.hour'
----@field hour  integer|string
+---@field hour  integer
 ---#DES 'osdate.min'
----@field min   integer|string
+---@field min   integer
 ---#DES 'osdate.sec'
----@field sec   integer|string
+---@field sec   integer
 ---#DES 'osdate.wday'
----@field wday  integer|string
+---@field wday  integer
 ---#DES 'osdate.yday'
----@field yday  integer|string
+---@field yday  integer
 ---#DES 'osdate.isdst'
----@field isdst boolean
+---@field isdst boolean?
 
 ---#DES 'os.date'
 ---@param format? string
@@ -50,7 +50,7 @@ function os.difftime(t2, t1) end
 function os.execute(command) end
 ---#else
 ---@param command? string
----@return boolean?  suc
+---@return true?     suc
 ---@return exitcode? exitcode
 ---@return integer?  code
 function os.execute(command) end
@@ -75,15 +75,17 @@ function os.getenv(varname) end
 
 ---#DES 'os.remove'
 ---@param filename string
----@return boolean suc
+---@return true? suc
 ---@return string? errmsg
+---@return integer? errcode
 function os.remove(filename) end
 
 ---#DES 'os.rename'
 ---@param oldname string
 ---@param newname string
----@return boolean suc
+---@return true? suc
 ---@return string? errmsg
+---@return integer? errcode
 function os.rename(oldname, newname) end
 
 ---@alias localecategory

meta/template/os.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
 

meta/template/string.lua

@@ -4,6 +4,8 @@ local guide    = require 'parser.guide'
 local vm       = require 'vm'
 local await    = require 'await'
 
+local DIAG_NAME = 'duplicate-set-field'
+
 local sourceTypes = {
     'setfield',
     'setmethod',
@@ -49,6 +51,7 @@ return function (uri, callback)
         end
         local myTopBlock = getTopFunctionOfIf(src)
         local defs = vm.getDefs(src)
+        local validDefs = {}
         for _, def in ipairs(defs) do
             if def == src then
                 goto CONTINUE
@@ -72,17 +75,27 @@ return function (uri, callback)
                 -- allow type variable to override function defined in class variable
                 goto CONTINUE
             end
-            callback {
-                start   = src.start,
-                finish  = src.finish,
-                related = {{
+            if vm.isDiagDisabledAt(guide.getUri(def), def.start, DIAG_NAME) then
+                return
+            end
+            validDefs[#validDefs+1] = def
+            ::CONTINUE::
+        end
+        if #validDefs > 0 then
+            local related = {}
+            for _, def in ipairs(validDefs) do
+                related[#related + 1] = {
                     start  = def.start,
                     finish = def.finish,
                     uri    = guide.getUri(def),
-                }},
+                }
+            end
+            callback {
+                start   = src.start,
+                finish  = src.finish,
+                related = related,
                 message = lang.script('DIAG_DUPLICATE_SET_FIELD', name),
             }
-            ::CONTINUE::
         end
     end)
 end

script/core/diagnostics/duplicate-set-field.lua

@@ -80,39 +80,7 @@ end
 ---@param uri uri
 ---@return uri
 function m.getRealUri(uri)
-    if platform.os ~= 'windows' then
-        return furi.normalize(uri)
-    end
-    if not furi.isValid(uri) then
-        return uri
-    end
-    local filename = furi.decode(uri)
-    -- normalize uri
-    uri = furi.encode(filename)
-    local path = fs.path(filename)
-    local suc, exists = pcall(fs.exists, path)
-    if not suc or not exists then
-        return uri
-    end
-    local suc, res = pcall(fs.canonical, path)
-    if not suc then
-        return uri
-    end
-    filename = res:string()
-    local ruri = furi.encode(filename)
-    if uri == ruri then
-        return ruri
-    end
-    local real = getRealParent(path:parent_path()) / res:filename()
-    ruri = furi.encode(real:string())
-    if uri == ruri then
-        return ruri
-    end
-    if not uriMap[uri] then
-        uriMap[uri] = true
-        log.warn(('Fix real file uri: %s -> %s'):format(uri, ruri))
-    end
-    return ruri
+    return furi.normalize(uri)
 end
 
 --- 打开文件

script/files.lua

@@ -20,6 +20,7 @@ function m.loadFile(path, keepBom)
         ---@diagnostic disable-next-line: undefined-field
         path = path:string()
     end
+    ---@cast path string
     local f, e = ioOpen(path, 'rb')
     if not f then
         return nil, e