fix #1529

3 files changed, 16 insertions, 2 deletions

diff --git a/script/parser/compile.lua b/script/parser/compile.lua
index 931f438d..45678976 100644
--- a/script/parser/compile.lua
+++ b/script/parser/compile.lua
@@ -3826,6 +3826,7 @@ local function initState(lua, version, options)
         comms   = {},
         lines   = {
             [0] = 1,
+            size = #lua,
         },
         options = options or {},
     }
diff --git a/script/parser/guide.lua b/script/parser/guide.lua
index e4faf47f..e8a53240 100644
--- a/script/parser/guide.lua
+++ b/script/parser/guide.lua
@@ -812,12 +812,24 @@ end
 ---@param col integer
 ---@return integer
 function m.positionOf(row, col)
-    return row * 10000 + col
+    return row * 10000 + math.min(col, 10000 - 1)
 end
 
 function m.positionToOffsetByLines(lines, position)
     local row, col = m.rowColOf(position)
-    return (lines[row] or 1) + col - 1
+    if row < 0 then
+        return 0
+    end
+    if row > #lines then
+        return lines.size
+    end
+    local offset = lines[row] + col - 1
+    if lines[row + 1] and offset >= lines[row + 1] then
+        return lines[row + 1] - 1
+    elseif offset > lines.size then
+        return lines.size
+    end
+    return offset
 end
 
 --- 返回全文光标位置
diff --git a/script/parser/lines.lua b/script/parser/lines.lua
index 964aabf4..ffd021e6 100644
--- a/script/parser/lines.lua
+++ b/script/parser/lines.lua
@@ -6,6 +6,7 @@ return function (text)
     local current = 1
     local lines = {}
     lines[0] = 1
+    lines.size = #text
     local i = 0
     while true do
         local pos = sfind(text,'[\r\n]', current)