Refactor of common path to return a list (#2466)

Found in my stash list...
cashapp · Nov 20, 2024 · 9426a4d · 9426a4d
1 parent 717bb60
commit 9426a4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/...tocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/guest/GuestProtocolAdapter.kt b/...tocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/guest/GuestProtocolAdapter.kt
@@ -149,7 +149,7 @@ public abstract class GuestProtocolAdapter(
   public abstract fun removeWidget(id: Id)
 
   @RedwoodCodegenApi
-  public val childrenVisitor: ProtocolWidget.ChildrenVisitor = if (synthesizeSubtreeRemoval) {
+  public val childrenRemover: ProtocolWidget.ChildrenVisitor = if (synthesizeSubtreeRemoval) {
     object : ProtocolWidget.ChildrenVisitor {
       override fun visit(
         parent: ProtocolWidget,

diff --git a/...col-guest/src/commonMain/kotlin/app/cash/redwood/protocol/guest/ProtocolWidgetChildren.kt b/...col-guest/src/commonMain/kotlin/app/cash/redwood/protocol/guest/ProtocolWidgetChildren.kt
@@ -37,25 +37,26 @@ public class ProtocolWidgetChildren(
   }
 
   override fun remove(index: Int, count: Int) {
-    if (guestAdapter.synthesizeSubtreeRemoval) {
+    val removedIds = if (guestAdapter.synthesizeSubtreeRemoval) {
       // This boxes Id values. Don't bother optimizing since it only serves very old hosts.
-      val removedIds = ArrayList<Id>(count)
-      for (i in index until index + count) {
-        val widget = _widgets[i]
-        removedIds += widget.id
-        guestAdapter.removeWidget(widget.id)
+      buildList(count) {
+        for (i in index until index + count) {
+          val widget = _widgets[i]
+          this += widget.id
+          guestAdapter.removeWidget(widget.id)
 
-        widget.depthFirstWalk(guestAdapter.childrenVisitor)
+          widget.depthFirstWalk(guestAdapter.childrenRemover)
+        }
       }
-      guestAdapter.appendRemove(id, tag, index, count, removedIds)
     } else {
       for (i in index until index + count) {
         val widget = _widgets[i]
         guestAdapter.removeWidget(widget.id)
-        widget.depthFirstWalk(guestAdapter.childrenVisitor)
+        widget.depthFirstWalk(guestAdapter.childrenRemover)
       }
-      guestAdapter.appendRemove(id, tag, index, count, emptyList())
+      emptyList()
     }
+    guestAdapter.appendRemove(id, tag, index, count, removedIds)
 
     _widgets.remove(index, count)
   }