Merge pull request #2867 from tomlau10/feat/rawset_with_class

Support using `---@class` on `rawset(_G, ...)` to annotate the created global variable

Author: sumneko

changelog.md

@@ -6,8 +6,10 @@
 * `NEW` Infer function parameter types when overriding the same-named class function in an instance of that class [#2158](https://github.com/LuaLS/lua-language-server/issues/2158)
 * `FIX` Eliminate floating point error in test benchmark output
 * `FIX` Remove luamake install from make scripts
+* `FIX` Incorrect `table` type injected to the global variable created by `rawset(_G, ...)` [#2863](https://github.com/LuaLS/lua-language-server/issues/2863)
 * `NEW` Types with literal fields can be narrowed.
 * `NEW` Reference addons installed via the addon manager with `${addons}` [#2866](https://github.com/LuaLS/lua-language-server/pull/2866).
+* `NEW` Support using `---@class` on `rawset(_G, ...)` to annotate the created global variable [#2862](https://github.com/LuaLS/lua-language-server/issues/2862)
 
 ## 3.10.6
 `2024-9-10`

script/parser/luadoc.lua

@@ -1988,7 +1988,9 @@ local function bindDocsBetween(sources, binded, start, finish)
                 or src.type == 'setmethod'
                 or src.type == 'function'
                 or src.type == 'return'
-                or src.type == '...' then
+                or src.type == '...'
+                or src.type == 'call'   -- for `rawset`
+                then
                     if bindDoc(src, binded) then
                         ok = true
                     end
@@ -2108,12 +2110,23 @@ local bindDocAccept = {
     'setfield'  , 'setmethod' , 'setindex' ,
     'tablefield', 'tableindex', 'self'     ,
     'function'  , 'return'     , '...'      ,
+    'call',
 }
 
 local function bindDocs(state)
     local text = state.lua
     local sources = {}
     guide.eachSourceTypes(state.ast, bindDocAccept, function (src)
+        -- allow binding docs with rawset(_G, "key", value)
+        if src.type == 'call' then
+            if src.node.special ~= 'rawset' or not src.args then
+                return
+            end
+            local g, key = src.args[1], src.args[2]
+            if not g or not key or g.special ~= '_G' then
+                return
+            end
+        end
         sources[#sources+1] = src
     end)
     table.sort(sources, function (a, b)

script/vm/compiler.lua

@@ -1867,6 +1867,10 @@ local compilerSwitch = util.switch()
     end)
     : case 'call'
     : call(function (source)
+        -- ignore rawset
+        if source.node.special == 'rawset' then
+            return
+        end
         local node = getReturn(source.node, 1, source.args)
         if not node then
             return

test/type_inference/common.lua

@@ -1321,6 +1321,32 @@ TEST 'Test' [[
 _G.<?Test?> = {}
 ]]
 
+TEST 'integer' [[
+rawset(_G, 'Test', 1)
+print(<?Test?>)
+]]
+
+TEST 'string' [[
+rawset(_G, 'Test', '')
+print(<?Test?>)
+]]
+
+TEST 'boolean' [[
+rawset(_G, 'Test', true)
+print(<?Test?>)
+]]
+
+TEST 'table' [[
+rawset(_G, 'Test', {})
+print(<?Test?>)
+]]
+
+TEST 'Test' [[
+---@class Test
+rawset(_G, 'Test', {})
+print(<?Test?>)
+]]
+
 TEST 'integer' [[
 local mt = {}