2 files changed, 11 insertions, 2 deletions
diff --git a/server/src/matcher/completion.lua b/server/src/matcher/completion.lua
index ce6fd277..5d651034 100644
--- a/server/src/matcher/completion.lua
+++ b/server/src/matcher/completion.lua
@@ -307,5 +307,8 @@ return function (vm, pos)
             searchAsSuffix(result, callback)
         end
     end
+    if #list == 0 then
+        return nil
+    end
     return list
 end
diff --git a/server/src/matcher/vm.lua b/server/src/matcher/vm.lua
index 6248e550..e7863e47 100644
--- a/server/src/matcher/vm.lua
+++ b/server/src/matcher/vm.lua
@@ -778,11 +778,17 @@ function mt:getSimple(simple, mode)
     local value = self:getExp(simple[1])
     local field
     local parentName
-    if simple[1].type == 'name' then
+    local tp = simple[1].type
+    if tp == 'name' then
         field = self:getName(simple[1][1])
         parentName = field.key
+    elseif tp == 'string' or tp == 'number' or tp == 'nil' or tp == 'boolean' then
+        local v = self:createValue(tp, simple[1], simple[1][1])
+        field = self:createLocal('', simple[1], v)
+        parentName = '*' .. tp
     else
-        field = self:createValue('any', simple[1])
+        local v = self:createValue('any', simple[1])
+        field = self:createLocal('', simple[1], v)
         parentName = '?'
     end
     local object