ide/CodeEditor: Fixed mislocated caret when resetting caret position outside of range

diff --git a/ide/src/debugger/Debugger.ec b/ide/src/debugger/Debugger.ec
index 4acbc6b..4b36477 100644 (file)
--- a/ide/src/debugger/Debugger.ec
+++ b/ide/src/debugger/Debugger.ec
@@ -905,8 +905,8 @@ class Debugger
          if(editor)
          {
             EditBox editBox = editor.editBox;
-            editBox.GoToLineNum(codloc.line - 1);
-            editBox.GoToPosition(editBox.line, codloc.line - 1, 0);
+            if(editBox.GoToLineNum(codloc.line - 1))
+               editBox.GoToPosition(editBox.line, codloc.line - 1, 0);
             return true;
          }
       }

diff --git a/ide/src/ide.ec b/ide/src/ide.ec
index f0eccfb..3007f1d 100644 (file)
--- a/ide/src/ide.ec
+++ b/ide/src/ide.ec
@@ -2510,8 +2510,8 @@ class IDEWorkSpace : Window
             editor.openedFileInfo.holdTracking = true;
             lineNumber = Max(editor.openedFileInfo.lineNumber - 1, 0);
             position = Max(editor.openedFileInfo.position - 1, 0);
-            editor.editBox.GoToLineNum(lineNumber);
-            editor.editBox.GoToPosition(editor.editBox.line, lineNumber, position);
+            if(editor.editBox.GoToLineNum(lineNumber))
+               editor.editBox.GoToPosition(editor.editBox.line, lineNumber, position);
             scroll.x = Max(editor.openedFileInfo.scroll.x, 0);
             scroll.y = Max(editor.openedFileInfo.scroll.y, 0);
             editor.editBox.scroll = scroll;

diff --git a/ide/src/project/ProjectView.ec b/ide/src/project/ProjectView.ec
index 99eba00..ce0769c 100644 (file)
--- a/ide/src/project/ProjectView.ec
+++ b/ide/src/project/ProjectView.ec
@@ -1873,8 +1873,8 @@ class ProjectView : Window
                if(codeEditor && lineNumber)
                {
                   EditBox editBox = codeEditor.editBox;
-                  editBox.GoToLineNum(lineNumber - 1);
-                  editBox.GoToPosition(editBox.line, lineNumber - 1, col ? (col - 1) : 0);
+                  if(editBox.GoToLineNum(lineNumber - 1))
+                     editBox.GoToPosition(editBox.line, lineNumber - 1, col ? (col - 1) : 0);
                }
             }
          }