fix #1107

Author: sumneko

changelog.md

@@ -5,6 +5,7 @@
 * `CHG` dose not load files in symbol links
 * `FIX` diagnostic: send empty results to every file after startup
 * `FIX` [#1103](https://github.com/sumneko/lua-language-server/issues/1103)
+* `FIX` [#1107](https://github.com/sumneko/lua-language-server/issues/1107)
 
 ## 3.2.2
 `2022-4-26`

script/vm/node.lua

@@ -96,6 +96,7 @@ function mt:hasFalsy()
     for _, c in ipairs(self) do
         if c.type == 'nil'
         or (c.type == 'global' and c.cate == 'type' and c.name == 'nil')
+        or (c.type == 'global' and c.cate == 'type' and c.name == 'false')
         or (c.type == 'boolean' and c[1] == false)
         or (c.type == 'doc.type.boolean' and c[1] == false) then
             return true
@@ -132,6 +133,7 @@ function mt:setTruthy()
         local c = self[index]
         if c.type == 'nil'
         or (c.type == 'global' and c.cate == 'type' and c.name == 'nil')
+        or (c.type == 'global' and c.cate == 'type' and c.name == 'false')
         or (c.type == 'boolean' and c[1] == false)
         or (c.type == 'doc.type.boolean' and c[1] == false) then
             table.remove(self, index)
@@ -148,10 +150,7 @@ function mt:setTruthy()
         ::CONTINUE::
     end
     if hasBoolean then
-        self[#self+1] = {
-            type = 'doc.type.boolean',
-            [1]  = true,
-        }
+        self[#self+1] = vm.declareGlobal('type', 'true')
     end
 end
 
@@ -165,24 +164,21 @@ function mt:setFalsy()
         local c = self[index]
         if c.type == 'nil'
         or (c.type == 'global' and c.cate == 'type' and c.name == 'nil')
+        or (c.type == 'global' and c.cate == 'type' and c.name == 'false')
         or (c.type == 'boolean' and c[1] == true)
         or (c.type == 'doc.type.boolean' and c[1] == true) then
             goto CONTINUE
         end
         if (c.type == 'global' and c.cate == 'type' and c.name == 'boolean')
         or (c.type == 'boolean' or c.type == 'doc.type.boolean') then
             hasBoolean = true
-            goto CONTINUE
+            table.remove(self, index)
+            self[c] = nil
         end
-        table.remove(self, index)
-        self[c] = nil
         ::CONTINUE::
     end
     if hasBoolean then
-        self[#self+1] = {
-            type = 'doc.type.boolean',
-            [1]  = false,
-        }
+        self[#self+1] = vm.declareGlobal('type', 'false')
     end
 end
 

script/vm/value.lua

@@ -20,6 +20,15 @@ function vm.test(source)
                 hasFalse = true
             end
         end
+        if n.type == 'global' and n.cate == 'type' then
+            if n.name == 'true' then
+                hasTrue = true
+            end
+            if n.name == 'false'
+            or n.name == 'nil' then
+                hasFalse = true
+            end
+        end
         if n.type == 'nil' then
             hasFalse = true
         end

test/type_inference/init.lua

@@ -2273,3 +2273,27 @@ end
 
 print(<?x?>)
 ]]
+
+TEST 'true' [[
+---@type boolean
+local t
+
+if t then
+    print(<?t?>)
+    return
+end
+
+print(t)
+]]
+
+TEST 'false' [[
+---@type boolean
+local t
+
+if t then
+    print(t)
+    return
+end
+
+print(<?t?>)
+]]