Merge pull request #280 from lorentey/minor-rope-updates

[Rope] remove(at:): Fix assertion when removing the last item creates a deficiency
apple · Apr 18, 2023 · 2ca40e2 · 2ca40e2
2 parents 9bb319f + dce7b15
commit 2ca40e2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Sources/RopeModule/Rope/Operations/Rope+Remove.swift b/Sources/RopeModule/Rope/Operations/Rope+Remove.swift
@@ -64,10 +64,10 @@ extension Rope._Node {
       let prepended = fixDeficiency(on: &path)
       isAtEnd = isAtEnd && prepended
     }
-    if isAtEnd {
+    if isAtEnd, path[h] < childCount - 1 {
       path[h] += 1
       path.clear(below: h)
-      isAtEnd = path[h] == childCount
+      isAtEnd = false
     }
     return (r.removed, r.delta, self.isUndersized, isAtEnd)
   }
@@ -134,10 +134,10 @@ extension Rope._Node {
       let prepended = fixDeficiency(on: &path)
       isAtEnd = isAtEnd && prepended
     }
-    if isAtEnd {
+    if isAtEnd, path[h] < childCount - 1 {
       path[h] += 1
       path.clear(below: h)
-      isAtEnd = path[h] == childCount
+      isAtEnd = false
     }
     return (r.removed, r.delta, self.isUndersized, isAtEnd)
   }