fix

2 files changed, 11 insertions, 4 deletions

diff --git a/script/core/matchkey.lua b/script/core/matchkey.lua
index eb67dac6..3c6a54a8 100644
--- a/script/core/matchkey.lua
+++ b/script/core/matchkey.lua
@@ -12,16 +12,17 @@ local function isValidFirstChar(input, other)
     if first == other:sub(1, 1):upper() then
         return true
     end
-    local pos, char = other:find(first, 2, true)
+    local pos = other:find(first, 2, true)
     if not pos and uppers[first] then
         -- word after symbol?
         if other:find('%A' .. first:lower(), 2) then
             return true
         end
     end
-    if not char then
+    if not pos then
         return false
     end
+    local char = other:sub(pos, pos)
     -- symbol?
     if not uppers[char] then
         return true
diff --git a/script/parser/newparser.lua b/script/parser/newparser.lua
index d63d8f62..8b5fe034 100644
--- a/script/parser/newparser.lua
+++ b/script/parser/newparser.lua
@@ -1958,7 +1958,8 @@ local function isChunkFinishToken(token)
     end
     if tp == 'for'
     or tp == 'in'
-    or tp == 'loop' then
+    or tp == 'loop'
+    or tp == 'function' then
         return token == 'end'
     end
     if tp == 'if'
@@ -1970,6 +1971,9 @@ local function isChunkFinishToken(token)
             or token == 'else'
             or token == 'elseif'
     end
+    if tp == 'repeat' then
+        return token == 'until'
+    end
     return true
 end
 
@@ -1988,7 +1992,9 @@ local function parseActions()
         end
         local action, failed = parseAction()
         if failed then
-            break
+            if not skipUnknownSymbol() then
+                break
+            end
         end
         if action then
             if action.type == 'return' then