cleanup

Author: sumneko

changelog.md

@@ -168,6 +168,7 @@ server will generate `doc.json` and `doc.md` in `LOGPATH`.
 
 [#1153]: https://github.com/sumneko/lua-language-server/issues/1153
 [#1177]: https://github.com/sumneko/lua-language-server/issues/1177
+[#1201]: https://github.com/sumneko/lua-language-server/issues/1201
 [#1202]: https://github.com/sumneko/lua-language-server/issues/1202
 [#1332]: https://github.com/sumneko/lua-language-server/issues/1332
 [#1344]: https://github.com/sumneko/lua-language-server/issues/1344

locale/en-us/script.lua

@@ -139,7 +139,7 @@ DIAG_REDUNDANT_RETURN_VALUE_RANGE     =
 DIAG_MISSING_RETURN                   =
 'Return value is required here.'
 DIAG_RETURN_TYPE_MISMATCH             =
-'The type of the {index} return value is `{def}`, but the actual return is `{ref}`.'
+'The type of the {index} return value is `{def}`, but the actual return is `{ref}`.\n{err}'
 DIAG_UNKNOWN_OPERATOR                 =
 'Unknown operator `{}`.'
 DIAG_UNREACHABLE_CODE                 =

locale/pt-br/script.lua

@@ -139,7 +139,7 @@ DIAG_REDUNDANT_RETURN_VALUE_RANGE     = -- TODO: need translate!
 DIAG_MISSING_RETURN                   = -- TODO: need translate!
 'Return value is required here.'
 DIAG_RETURN_TYPE_MISMATCH             = -- TODO: need translate!
-'The type of the {index} return value is `{def}`, but the actual return is `{ref}`.'
+'The type of the {index} return value is `{def}`, but the actual return is `{ref}`.\n{err}'
 DIAG_UNKNOWN_OPERATOR                 = -- TODO: need translate!
 'Unknown operator `{}`.'
 DIAG_UNREACHABLE_CODE                 = -- TODO: need translate!

locale/zh-cn/script.lua

@@ -139,7 +139,7 @@ DIAG_REDUNDANT_RETURN_VALUE_RANGE     =
 DIAG_MISSING_RETURN                   =
 '此处需要返回值。'
 DIAG_RETURN_TYPE_MISMATCH             =
-'第 {index} 个返回值的类型为 `{def}` ，但实际返回的是 `{ref}`。'
+'第 {index} 个返回值的类型为 `{def}` ，但实际返回的是 `{ref}`。\n{err}'
 DIAG_UNKNOWN_OPERATOR                 =
 '未知的运算符 `{}`。'
 DIAG_UNREACHABLE_CODE                 =

locale/zh-tw/script.lua

@@ -139,7 +139,7 @@ DIAG_REDUNDANT_RETURN_VALUE_RANGE     =
 DIAG_MISSING_RETURN                   =
 '此處需要回傳值。'
 DIAG_RETURN_TYPE_MISMATCH             =
-'第 {index} 個回傳值的類型為 `{def}` ，但實際回傳的是 `{ref}`。'
+'第 {index} 個回傳值的類型為 `{def}` ，但實際回傳的是 `{ref}`。\n{err}'
 DIAG_UNKNOWN_OPERATOR                 = -- TODO: need translate!
 'Unknown operator `{}`.'
 DIAG_UNREACHABLE_CODE                 = -- TODO: need translate!

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

@@ -96,8 +96,8 @@ return function (uri, callback)
         end
 
         local varNode = vm.compileNode(source)
-        local suc, errs = vm.canCastType(uri, varNode, valueNode)
-        if suc then
+        local errs = {}
+        if vm.canCastType(uri, varNode, valueNode, errs) then
             return
         end
 
@@ -108,8 +108,6 @@ return function (uri, callback)
             end
         end
 
-        assert(errs)
-
         callback {
             start   = source.start,
             finish  = source.finish,

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

@@ -34,10 +34,8 @@ return function (uri, callback)
                     refNode = refNode:copy():setTruthy()
                 end
 
-                local suc, errs = vm.canCastType(uri, locNode, refNode)
-
-                if not suc then
-                    assert(errs)
+                local errs = {}
+                if not vm.canCastType(uri, locNode, refNode, errs) then
                     callback {
                         start   = ref.start,
                         finish  = ref.finish,

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

@@ -26,8 +26,8 @@ return function (uri, callback)
                     for _, cast in ipairs(doc.casts) do
                         if not cast.mode and cast.extends then
                             local refNode = vm.compileNode(cast.extends)
-                            local suc, errs = vm.canCastType(uri, defNode, refNode)
-                            if not suc then
+                            local errs = {}
+                            if not vm.canCastType(uri, defNode, refNode, errs) then
                                 assert(errs)
                                 callback {
                                     start   = cast.extends.start,

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

@@ -100,8 +100,8 @@ return function (uri, callback)
                 -- 因此将假值移除再进行检查
                 refNode = refNode:copy():setTruthy()
             end
-            local suc, errs = vm.canCastType(uri, defNode, refNode)
-            if not suc then
+            local errs = {}
+            if not vm.canCastType(uri, defNode, refNode, errs) then
                 local rawDefNode = getRawDefNode(funcNode, i)
                 assert(errs)
                 callback {

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

@@ -61,13 +61,15 @@ return function (uri, callback)
                     retNode = retNode:copy():removeOptional()
                 end
             end
-            if not vm.canCastType(uri, docRet, retNode) then
+            local errs = {}
+            if not vm.canCastType(uri, docRet, retNode, errs) then
                 callback {
                     start   = exp.start,
                     finish  = exp.finish,
                     message = lang.script('DIAG_RETURN_TYPE_MISMATCH', {
                         def   = vm.getInfer(docRet):view(uri),
                         ref   = vm.getInfer(retNode):view(uri),
+                        err   = vm.viewTypeErrorMessage(uri, errs),
                         index = i,
                     }),
                 }