fixup some edge cases

dlants · Dec 14, 2024 · d5e6620 · d5e6620
1 parent be7fbc7
commit d5e6620
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/rplugin/node/magenta/src/chat/message.ts b/rplugin/node/magenta/src/chat/message.ts
@@ -67,7 +67,7 @@ export const update: Update<Msg, Model> = (msg, model) => {
 
 export const view: View<{ model: Model; dispatch: Dispatch<Msg> }> = ({
   model,
-}) => d`\
+}) => d`
 ### ${model.role}:
 
 ${model.parts.map((part) => partView({ model: part }))}`;
diff --git a/rplugin/node/magenta/src/tea/update.ts b/rplugin/node/magenta/src/tea/update.ts
@@ -156,7 +156,9 @@ export async function update({
             ...current,
             children: nextChildren,
             startPos,
-            endPos: nextChildren[nextChildren.length - 1].endPos,
+            endPos: nextChildren.length
+              ? nextChildren[nextChildren.length - 1].endPos
+              : updatePos(current.endPos),
           };
           return nextMountedNode;
         } else {
@@ -179,6 +181,9 @@ export async function update({
           const nextChild = nextNode.children[i];
           nextChildren.push(await visitNode(currentChild, nextChild));
         }
+        let endPos = nextChildren.length
+          ? nextChildren[nextChildren.length - 1].endPos
+          : updatePos(current.endPos);
 
         if (current.children.length > nextNode.children.length) {
           const oldChildrenEndPos = updatePos(
@@ -187,7 +192,7 @@ export async function update({
           // remove all the nodes between the end of the last child and where the remaining children would go.
           await replaceBetweenPositions({
             ...mount,
-            startPos: nextChildren[nextChildren.length - 1].endPos,
+            startPos: endPos,
             endPos: oldChildrenEndPos,
             lines: [],
           });
@@ -201,19 +206,17 @@ export async function update({
             childIdx += 1
           ) {
             nextChildren.push(
-              await insertNode(
-                nextNode.children[childIdx],
-                nextChildren[nextChildren.length - 1].endPos,
-              ),
+              await insertNode(nextNode.children[childIdx], endPos),
             );
           }
+          endPos = nextChildren[nextChildren.length - 1].endPos;
         }
 
         const nextMountedNode = {
           ...current,
           children: nextChildren,
           startPos,
-          endPos: nextChildren[nextChildren.length - 1].endPos,
+          endPos,
         };
         return nextMountedNode;
       }