Merge branch 'topic/vadim/25' into '25.1'

Don't move cursor forward when it points after last character. See merge request eng/ide/VSS!343
AdaCore · Nov 14, 2024 · b559b9d · b559b9d
2 parents 3a9fb02 + 8641e53
commit b559b9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/source/text/implementation/vss-implementation-text_handlers-utf8-dynamic.adb b/source/text/implementation/vss-implementation-text_handlers-utf8-dynamic.adb
@@ -576,7 +576,9 @@ package body VSS.Implementation.Text_Handlers.UTF8.Dynamic is
          return;
       end if;
 
-      Unchecked_Forward (Self.Pointer.Storage, After);
+      if To.Index <= Self.Length then
+         Unchecked_Forward (Self.Pointer.Storage, After);
+      end if;
 
       Size   := After.UTF8_Offset - From.UTF8_Offset;
       Length := After.Index - From.Index;

diff --git a/source/text/implementation/vss-implementation-text_handlers-utf8-static.adb b/source/text/implementation/vss-implementation-text_handlers-utf8-static.adb
@@ -515,7 +515,9 @@ package body VSS.Implementation.Text_Handlers.UTF8.Static is
          return;
       end if;
 
-      Unchecked_Forward (Self.Storage, After);
+      if To.Index <= Self.Length then
+         Unchecked_Forward (Self.Storage, After);
+      end if;
 
       Size   := After.UTF8_Offset - From.UTF8_Offset;
       Length := After.Index - From.Index;