fix error after calling a nil value

xebecnan · Nov 4, 2021 · f852154 · f852154
1 parent ec9711b
commit f852154
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/symbols.lua b/src/symbols.lua
@@ -20,14 +20,18 @@ local function find_id_symbol_aux(namespace, scope, name, narrow_func)
                 -- expand
                 local Types = require('types')
                 si = Types.get_node_type(si[1])
-                if si.tag == 'Id' and si[1] == 'Nil' then
-                    si = { tag='Id', 'Any' }
+                if si then
+                    if si.tag == 'Id' and si[1] == 'Nil' then
+                        si = { tag='Id', 'Any' }
+                    end
+                    t[name] = si
                 end
-                t[name] = si
             end
-            if si.tag == 'Id' and si[1] == 'Any' and narrow_func then
-                si = narrow_func(si)
-                t[name] = si
+            if si then
+                if si.tag == 'Id' and si[1] == 'Any' and narrow_func then
+                    si = narrow_func(si)
+                    t[name] = si
+                end
             end
             return si
         end

diff --git a/src/types.lua b/src/types.lua
@@ -156,7 +156,10 @@ get_node_type_impl = function(ast)
         end
     elseif ast.tag == 'Call' then
         local si = Symbols.find_var(ast[1])
-        if si.tag == 'TypeFunction' then
+        if not si then
+            -- called a nil value
+            return { tag='Id', 'Any' }
+        elseif si.tag == 'TypeFunction' then
             -- require 函数
             local require_path = ast.require_path
             if require_path then