1 files changed, 106 insertions, 1 deletions
diff --git a/script-beta/core/completion.lua b/script-beta/core/completion.lua
index d3a7a022..0532f1be 100644
--- a/script-beta/core/completion.lua
+++ b/script-beta/core/completion.lua
@@ -2,6 +2,17 @@ local ckind    = require 'define.CompletionItemKind'
 local files    = require 'files'
 local guide    = require 'parser.guide'
 local matchKey = require 'core.matchKey'
+local vm       = require 'vm'
+
+local function isSpace(char)
+    if char == ' '
+    or char == '\n'
+    or char == '\r'
+    or char == '\t' then
+        return true
+    end
+    return false
+end
 
 local function findWord(text, offset)
     for i = offset, 1, -1 do
@@ -15,6 +26,46 @@ local function findWord(text, offset)
     return nil
 end
 
+local function findAnyPos(text, offset)
+    for i = offset, 1, -1 do
+        if not isSpace(text:sub(i, i)) then
+            return i
+        end
+    end
+    return nil
+end
+
+local function findParent(ast, text, offset)
+    for i = offset, 1, -1 do
+        local char = text:sub(i, i)
+        if isSpace(char) then
+            goto CONTINUE
+        end
+        local oop
+        if char == '.' then
+            oop = false
+        elseif char == ':' then
+            oop = true
+        else
+            return nil, nil
+        end
+        local anyPos = findAnyPos(text, i-1)
+        if not anyPos then
+            return nil, nil
+        end
+        local parent = guide.eachSourceContain(ast.ast, anyPos, function (source)
+            if source.finish == anyPos then
+                return source
+            end
+        end)
+        if parent then
+            return parent, oop
+        end
+        ::CONTINUE::
+    end
+    return nil, nil
+end
+
 local function checkLocal(ast, word, offset, results)
     guide.getVisibleLocalNames(ast.ast, offset, function (name)
         if matchKey(word, name) then
@@ -26,12 +77,66 @@ local function checkLocal(ast, word, offset, results)
     end)
 end
 
+local function checkField(ast, text, word, offset, results)
+    local parent, oop = findParent(ast, text, offset - #word)
+    if not parent then
+        parent = guide.getLocal(ast.ast, '_ENV', offset)
+        if not parent then
+            return
+        end
+    end
+    vm.eachField(parent, function (info)
+        local key = info.key
+        if key
+        and key:sub(1, 1) == 's'
+        and info.source.finish ~= offset then
+            local name = key:sub(3)
+            if matchKey(word, name) then
+                results[#results+1] = {
+                    label = name,
+                    kind  = ckind.Field,
+                }
+            end
+        end
+    end)
+end
+
+local function checkCommon(word, text, results)
+    local used = {}
+    for _, result in ipairs(results) do
+        used[result.label] = true
+    end
+    for str in text:gmatch '[%a_][%w_]*' do
+        if not used[str] and str ~= word then
+            used[str] = true
+            if matchKey(word, str) then
+                results[#results+1] = {
+                    label = str,
+                    kind  = ckind.Text,
+                }
+            end
+        end
+    end
+end
+
+local function isInString(ast, offset)
+    return guide.eachSourceContain(ast.ast, offset, function (source)
+        if source.type == 'string' then
+            return true
+        end
+    end)
+end
+
 local function tryWord(ast, text, offset, results)
     local word = findWord(text, offset)
     if not word then
         return nil
     end
-    checkLocal(ast, word, offset, results)
+    if not isInString(ast, offset) then
+        checkLocal(ast, word, offset, results)
+        checkField(ast, text, word, offset, results)
+    end
+    checkCommon(word, text, results)
 end
 
 return function (uri, offset)