cleanup

Author: sumneko

locale/zh-cn/script.lua

@@ -127,7 +127,7 @@ DIAG_PARAM_TYPE_MISMATCH              =
 DIAG_UNKNOWN_CAST_VARIABLE            =
 '未知的类型转换变量 `{}`。'
 DIAG_CAST_TYPE_MISMATCH               =
-'不能将 `{ref}` 转换为 `{def}`。'
+'不能将 `{def}` 转换为 `{ref}`。'
 DIAG_MISSING_RETURN_VALUE             =
 '至少需要 {min} 个返回值，但此处只返回 {rmax} 个值。'
 DIAG_MISSING_RETURN_VALUE_RANGE       =

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

@@ -30,7 +30,7 @@ return function (uri, callback)
                                 callback {
                                     start   = cast.extends.start,
                                     finish  = cast.extends.finish,
-                                    message = lang.script('DIAG_UNKNOWN_CAST_VARIABLE', {
+                                    message = lang.script('DIAG_CAST_TYPE_MISMATCH', {
                                         def = vm.getInfer(defNode):view(uri),
                                         ref = vm.getInfer(refNode):view(uri),
                                     })

script/files.lua

@@ -136,6 +136,7 @@ function m.isLibrary(uri, excludeFolder)
 end
 
 --- 获取库文件的根目录
+---@return uri?
 function m.getLibraryUri(suri, uri)
     local scp = scope.getScope(suri)
     return scp:getLinkedUri(uri)

script/vm/compiler.lua

@@ -400,7 +400,7 @@ end
 ---@field _sign vm.sign|false
 
 ---@param source parser.object
----@return vm.sign?
+---@return vm.sign|false
 local function getObjectSign(source)
     if source._sign ~= nil then
         return source._sign
@@ -1542,7 +1542,7 @@ local compilerSwitch = util.switch()
                                 end)
                             end
                             if hasGeneric then
-                                ---@cast sign -?
+                                ---@cast sign -false
                                 vm.setNode(source, vm.createGeneric(rtn, sign))
                             else
                                 vm.setNode(source, vm.compileNode(rtn))
@@ -1955,7 +1955,9 @@ function vm.compileNode(source)
 
     if source.type == 'generic' then
         vm.setNode(source, source)
-        return vm.getNode(source)
+        local node = vm.getNode(source)
+        ---@cast node -?
+        return node
     end
 
     ---@cast source parser.object
@@ -1965,6 +1967,6 @@ function vm.compileNode(source)
     matchCall(source)
 
     local node = vm.getNode(source)
-
+    ---@cast node -?
     return node
 end

script/vm/function.lua

@@ -18,7 +18,7 @@ end
 
 ---@param func parser.object
 ---@return integer min
----@return integer max
+---@return number  max
 function vm.countParamsOfFunction(func)
     local min = 0
     local max = 0
@@ -60,7 +60,7 @@ end
 
 ---@param node vm.node
 ---@return integer min
----@return integer max
+---@return number  max
 function vm.countParamsOfNode(node)
     local min, max
     for n in node:eachObject() do
@@ -82,15 +82,21 @@ end
 ---@param func parser.object
 ---@param mark? table
 ---@return integer min
----@return integer max
+---@return number  max
 function vm.countReturnsOfFunction(func, mark)
     if func.type == 'function' then
-        local min, max
+        ---@type integer?
+        local min
+        ---@type number?
+        local max
         local hasDocReturn
         if func.bindDocs then
             local lastReturn
             local n = 0
-            local dmin, dmax
+            ---@type integer?
+            local dmin
+            ---@type number?
+            local dmax
             for _, doc in ipairs(func.bindDocs) do
                 if doc.type == 'doc.return' then
                     hasDocReturn = true
@@ -139,10 +145,12 @@ end
 ---@param func parser.object
 ---@param mark? table
 ---@return integer min
----@return integer max
+---@return number  max
 function vm.countReturnsOfCall(func, args, mark)
     local funcs = vm.getMatchedFunctions(func, args)
+    ---@type integer?
     local min
+    ---@type number?
     local max
     for _, f in ipairs(funcs) do
         local rmin, rmax = vm.countReturnsOfFunction(f, mark)
@@ -159,7 +167,7 @@ end
 ---@param list parser.object[]?
 ---@param mark? table
 ---@return integer min
----@return integer max
+---@return number  max
 function vm.countList(list, mark)
     if not list then
         return 0, 0

script/vm/generic.lua

@@ -13,7 +13,7 @@ mt.type = 'generic'
 
 ---@param source    vm.object
 ---@param resolved? table<string, vm.node>
----@return parser.object
+---@return vm.object
 local function cloneObject(source, resolved)
     if not resolved then
         return source

script/vm/local-id.lua

@@ -147,7 +147,7 @@ function compileLocalID(source)
 end
 
 ---@param source parser.object
----@return string?
+---@return string|false
 function vm.getLocalID(source)
     if source._localID ~= nil then
         return source._localID
@@ -205,7 +205,7 @@ end
 
 ---@param source parser.object
 ---@param includeGets boolean
----@return parser.object[]
+---@return parser.object[]?
 function vm.getLocalFields(source, includeGets)
     local id = vm.getLocalID(source)
     if not id then

script/vm/node.lua

@@ -62,7 +62,7 @@ function mt:clear()
 end
 
 ---@param n integer
----@return vm.object?
+---@return vm.node.object?
 function mt:get(n)
     return self[n]
 end
@@ -284,7 +284,8 @@ function mt:removeNode(node)
             self:remove(c.name)
         elseif c.type == 'nil' then
             self:remove 'nil'
-        elseif c.type == 'boolean' then
+        elseif c.type == 'boolean'
+        or     c.type == 'doc.type.boolean' then
             if c[1] == true then
                 self:remove 'true'
             else

script/vm/runner.lua

@@ -117,20 +117,20 @@ end
 ---@return vm.node outNode
 function mt:_lookInto(action, topNode, outNode)
     if not action then
-        return topNode, outNode
+        return topNode, outNode or topNode
     end
     if self._mark[action] then
-        return topNode, outNode
+        return topNode, outNode or topNode
     end
     self._mark[action] = true
     local top = self._objs[self._index]
     if not top then
-        return topNode, outNode
+        return topNode, outNode or topNode
     end
     if  not guide.isInRange(action, top.finish)
     -- trick for `local tp = type(x);if tp == 'string' then`
     and action.type ~= 'binary' then
-        return topNode, outNode
+        return topNode, outNode or topNode
     end
     local set
     local value = vm.getObjectValue(action)
@@ -151,7 +151,9 @@ function mt:_lookInto(action, topNode, outNode)
             self:_fastWard(action.filter.finish, blockNode)
         end
         blockNode = self:_launchBlock(action, blockNode:copy())
-        topNode = mainNode:merge(blockNode)
+        if mainNode then
+            topNode = mainNode:merge(blockNode)
+        end
     elseif action.type == 'if' then
         local hasElse
         local mainNode = topNode:copy()
@@ -314,7 +316,7 @@ function mt:_lookInto(action, topNode, outNode)
     if set then
         topNode = self:_fastWard(set.range or set.finish, topNode)
     end
-    return topNode, outNode
+    return topNode, outNode or topNode
 end
 
 ---@param block parser.object
@@ -356,7 +358,10 @@ function vm.launchRunner(loc, callback)
     if #self._objs == 0 then
         return
     end
-
-    local topNode = self:_launchBlock(guide.getParentBlock(loc), vm.getNode(loc):copy())
+    local main = guide.getParentBlock(loc)
+    if not main then
+        return
+    end
+    local topNode = self:_launchBlock(main, vm.getNode(loc):copy())
     self:_fastWard(math.maxinteger, topNode)
 end

script/vm/sign.lua

@@ -17,7 +17,7 @@ end
 ---@param uri uri
 ---@param args parser.object
 ---@param removeGeneric true?
----@return table<string, vm.node>
+---@return table<string, vm.node>?
 function mt:resolve(uri, args, removeGeneric)
     if not args then
         return nil