Skip to content

Commit 2bf30bd

Browse files
committed
fix assign-type-mismatch
1 parent 661cbf2 commit 2bf30bd

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

meta/template/basic.lua

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -210,40 +210,40 @@ function select(index, ...) end
210210
function setfenv(f, table) end
211211

212212

213-
---@class metatable : table
214-
---@field __mode 'v'|'k'|'kv'
215-
---@field __metatable any
216-
---@field __tostring fun(t):string
217-
---@field __gc fun(t)
218-
---@field __add fun(t1,t2):any
219-
---@field __sub fun(t1,t2):any
220-
---@field __mul fun(t1,t2):any
221-
---@field __div fun(t1,t2):any
222-
---@field __mod fun(t1,t2):any
223-
---@field __pow fun(t1,t2):any
224-
---@field __unm fun(t):any
213+
---@class metatable
214+
---@field __mode 'v'|'k'|'kv'|nil
215+
---@field __metatable any|nil
216+
---@field __tostring fun(t):string|nil
217+
---@field __gc fun(t)|nil
218+
---@field __add fun(t1,t2):any|nil
219+
---@field __sub fun(t1,t2):any|nil
220+
---@field __mul fun(t1,t2):any|nil
221+
---@field __div fun(t1,t2):any|nil
222+
---@field __mod fun(t1,t2):any|nil
223+
---@field __pow fun(t1,t2):any|nil
224+
---@field __unm fun(t):any|nil
225225
---#if VERSION >= 5.3 then
226-
---@field __idiv fun(t1,t2):any
227-
---@field __band fun(t1,t2):any
228-
---@field __bor fun(t1,t2):any
229-
---@field __bxor fun(t1,t2):any
230-
---@field __bnot fun(t):any
231-
---@field __shl fun(t1,t2):any
232-
---@field __shr fun(t1,t2):any
226+
---@field __idiv fun(t1,t2):any|nil
227+
---@field __band fun(t1,t2):any|nil
228+
---@field __bor fun(t1,t2):any|nil
229+
---@field __bxor fun(t1,t2):any|nil
230+
---@field __bnot fun(t):any|nil
231+
---@field __shl fun(t1,t2):any|nil
232+
---@field __shr fun(t1,t2):any|nil
233233
---#end
234-
---@field __concat fun(t1,t2):any
235-
---@field __len fun(t):integer
236-
---@field __eq fun(t1,t2):boolean
237-
---@field __lt fun(t1,t2):boolean
238-
---@field __le fun(t1,t2):boolean
239-
---@field __index table|fun(t,k)
240-
---@field __newindex table|fun(t,k,v)
241-
---@field __call fun(t,...)
234+
---@field __concat fun(t1,t2):any|nil
235+
---@field __len fun(t):integer|nil
236+
---@field __eq fun(t1,t2):boolean|nil
237+
---@field __lt fun(t1,t2):boolean|nil
238+
---@field __le fun(t1,t2):boolean|nil
239+
---@field __index table|fun(t,k)|nil
240+
---@field __newindex table|fun(t,k,v)|nil
241+
---@field __call fun(t,...)|nil
242242
---#if VERSION > 5.1 or VERSION == JIT then
243-
---@field __pairs fun(t):fun(t,k,v)
243+
---@field __pairs fun(t):fun(t,k,v)|nil
244244
---#end
245245
---#if VERSION == JIT or VERSION == 5.2 then
246-
---@field __ipairs fun(t):fun(t,k,v)
246+
---@field __ipairs fun(t):fun(t,k,v)|nil
247247
---#end
248248

249249
---#DES 'setmetatable'

script/core/diagnostics/assign-type-mismatch.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ return function (uri, callback)
103103

104104
-- local Cat = setmetatable({}, {__index = Animal}) 允许逆变
105105
if hasMarkClass(source) then
106-
if vm.canCastType(uri, valueNode:copy():remove 'table', varNode) then
106+
if vm.canCastType(uri, valueNode:copy():remove 'metatable', varNode) then
107107
return
108108
end
109109
end

0 commit comments

Comments
 (0)