support x or error(...)

fix #1945

Author: sumneko

Diff for: changelog.md

@@ -8,13 +8,15 @@
 * `FIX` [#1922]
 * `FIX` [#1924]
 * `FIX` [#1928]
+* `FIX` [#1945]
 
 [#1715]: https://github.com/LuaLS/lua-language-server/issues/1715
 [#1753]: https://github.com/LuaLS/lua-language-server/issues/1753
 [#1914]: https://github.com/LuaLS/lua-language-server/issues/1914
 [#1922]: https://github.com/LuaLS/lua-language-server/issues/1922
 [#1924]: https://github.com/LuaLS/lua-language-server/issues/1924
 [#1928]: https://github.com/LuaLS/lua-language-server/issues/1928
+[#1945]: https://github.com/LuaLS/lua-language-server/issues/1945
 
 ## 3.6.13
 `2023-3-2`

Diff for: script/parser/compile.lua

@@ -1974,6 +1974,12 @@ local function parseSimple(node, funcName)
     and node.node == lastMethod then
         lastMethod = nil
     end
+    if node.type == 'call' then
+        if node.node.special == 'error'
+        or node.node.special == 'os.exit' then
+            node.hasExit = true
+        end
+    end
     if node == lastMethod then
         if funcName then
             lastMethod = nil
@@ -2899,18 +2905,15 @@ local function compileExpAsAction(exp)
         end
     end
 
-    if exp.type == 'call' then
-        if exp.node.special == 'error'
-        or exp.node.special == 'os.exit' then
-            for i = #Chunk, 1, -1 do
-                local block = Chunk[i]
-                if block.type == 'ifblock'
-                or block.type == 'elseifblock'
-                or block.type == 'elseblock'
-                or block.type == 'function' then
-                    block.hasExit = true
-                    break
-                end
+    if exp.hasExit then
+        for i = #Chunk, 1, -1 do
+            local block = Chunk[i]
+            if block.type == 'ifblock'
+            or block.type == 'elseifblock'
+            or block.type == 'elseblock'
+            or block.type == 'function' then
+                block.hasExit = true
+                break
             end
         end
         return exp

Diff for: script/vm/operator.lua

@@ -199,7 +199,10 @@ vm.binarySwitch = util.switch()
         elseif r1 == false then
             vm.setNode(source, node2)
         else
-            local node = node1:copy():setTruthy():merge(node2)
+            local node = node1:copy():setTruthy()
+            if not source[2].hasExit then
+                node:merge(node2)
+            end
             vm.setNode(source, node)
         end
     end)

Diff for: test/type_inference/init.lua

@@ -4233,3 +4233,9 @@ function A:func()
     self.y = self.y + 3
 end
 ]]
+
+TEST 'number' [[
+---@type number?
+local n
+local <?v?> = n or error('')
+]]