修正关键字有时捕获不到的bug

3 files changed, 34 insertions, 4 deletions

diff --git a/server/src/core/completion.lua b/server/src/core/completion.lua
index 8659901f..c8147f9e 100644
--- a/server/src/core/completion.lua
+++ b/server/src/core/completion.lua
@@ -761,13 +761,16 @@ end
 
 local function getSource(vm, pos, text, filter)
     local word = findWord(pos, text)
-    local source = findSource(vm, pos, filter)
+    local source = keywordSource(vm, word, pos)
+    if source then
+        return source, pos, word
+    end
+    source = findSource(vm, pos, filter)
     if source then
         return source, pos, word
     end
     pos = findStartPos(pos, text)
-    source = findSource(vm, pos,   filter)
-          or keywordSource(vm, word, pos)
+    source = findSource(vm, pos, filter)
     return source, pos, word
 end
 
diff --git a/server/src/utility.lua b/server/src/utility.lua
index 9bca93a5..4e390597 100644
--- a/server/src/utility.lua
+++ b/server/src/utility.lua
@@ -27,7 +27,7 @@ function table.dump(tbl)
     local lines = {}
     lines[#lines+1] = '{'
     local function unpack(tbl, tab)
-        if tab > 100 then
+        if tab > 10 then
             return '<Deep Table>'
         end
         local keys = {}
diff --git a/server/test/completion/init.lua b/server/test/completion/init.lua
index 7d0d1d04..17ab0369 100644
--- a/server/test/completion/init.lua
+++ b/server/test/completion/init.lua
@@ -1028,3 +1028,30 @@ mt.$
         kind = CompletionItemKind.Field,
     },
 }
+
+TEST [[
+local function f()
+    if a then
+    else$
+end
+]]
+{
+    {
+        label = 'select',
+        kind = CompletionItemKind.Function,
+        documentation = EXISTS,
+    },
+    {
+        label = 'setmetatable',
+        kind = CompletionItemKind.Function,
+        documentation = EXISTS,
+    },
+    {
+        label = 'else',
+        kind = CompletionItemKind.Keyword,
+    },
+    {
+        label = 'elseif',
+        kind = CompletionItemKind.Keyword,
+    },
+}