Fix after rebase

CHANGELOG.md

@@ -7,7 +7,7 @@ New:
 - Nothing yet!
 
 Changed:
-- Nothing yet!
+- An empty line is not added at the end of the output.
 
 Fixed:
 - Nothing yet!

mosaic-runtime/src/commonMain/kotlin/com/jakewharton/mosaic/rendering.kt

@@ -83,29 +83,27 @@ internal class AnsiRendering(
 
 			// don't need to move cursor up if there was zero or one line
 			if (lastHeight > 1) {
-                ansiMoveCursorUp(lastHeight - 1)
+				ansiMoveCursorUp(lastHeight - 1)
 			}
 			append(ansiMoveCursorToFirstColumn)
 
-			node.measureAndPlace()
-
-			var afterStatic = false // in order not to overwrite last line of static output
-            staticSurfaces.let { staticSurfaces ->
-                node.paintStatics(staticSurfaces, ansiLevel)
-                if (staticSurfaces.isNotEmpty()) {
-                    staticSurfaces.forEach { staticSurface ->
-                        appendSurface(staticSurface, addLineBreakAtBeginning = false)
-                        if (!afterStatic && staticSurface.height > 0) {
-                            afterStatic = true
-                        }
-                    }
-                    staticSurfaces.clear()
-                }
-            }
+			var addLineBreakAtBeginning = false
+			staticSurfaces.let { staticSurfaces ->
+				node.paintStatics(staticSurfaces, ansiLevel)
+				if (staticSurfaces.isNotEmpty()) {
+					staticSurfaces.forEach { staticSurface ->
+						appendSurface(staticSurface, addLineBreakAtBeginning)
+						if (!addLineBreakAtBeginning && staticSurface.height > 0) {
+							addLineBreakAtBeginning = true
+						}
+					}
+					staticSurfaces.clear()
+				}
+			}
 
 			val surface = node.paint(ansiLevel)
 			if (node.height > 0) {
-				appendSurface(surface, addLineBreakAtBeginning = afterStatic)
+				appendSurface(surface, addLineBreakAtBeginning)
 			}
 			lastHeight = surface.height
 

mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/AnsiRenderingTest.kt

@@ -169,11 +169,11 @@ class AnsiRenderingTest {
 
 		assertThat(rendering.render(rootNode).toString()).isEqualTo(
 			"""
-			|${ansiMoveCursorToFirstColumn}One  $ansiClearLineAfterCursor
-			|Two  $ansiClearLineAfterCursor
+			|${ansiMoveCursorToFirstColumn}One$ansiClearLineAfterCursor
+			|Two$ansiClearLineAfterCursor
 			|Three$ansiClearLineAfterCursor
-			|Four $ansiClearLineAfterCursor
-			|Five $ansiClearLineAfterCursor
+			|Four$ansiClearLineAfterCursor
+			|Five$ansiClearLineAfterCursor
 			|Sup$ansiClearLineAfterCursor$ansiClearAllAfterCursor
 			""".trimMargin().wrapWithAnsiSynchronizedUpdate().replaceLineEndingsWithCRLF(),
 		)

mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/TestMosaicComposition.kt

@@ -80,10 +80,10 @@ private class RealTestMosaicComposition(
 		} else {
 			rendering.render(rootNode).toString()
 				.removeSurrounding(ansiBeginSynchronizedUpdate, ansiEndSynchronizedUpdate)
-                .replace(Regex("$ESC\\[\\d+A"), "")
-                .removePrefix(ansiMoveCursorToFirstColumn)
-                .removePrefix(ansiClearAllAfterCursor)
-                .replace(ansiClearLineAfterCursor, "")
+				.replace(Regex("$ESC\\[\\d+A"), "")
+				.removePrefix(ansiMoveCursorToFirstColumn)
+				.removeSuffix(ansiClearAllAfterCursor)
+				.replace(ansiClearLineAfterCursor, "")
 				.replace("\r\n", "\n") // CRLF to LF for simplicity
 		}
 		renderSnapshots.trySend(stringRender)

samples/rrtop/src/main/kotlin/example/RrtopApp.kt

@@ -32,7 +32,7 @@ fun RrtopApp(rrtopViewModel: RrtopViewModel, colorsPalette: RrtopColorsPalette)
 	CompositionLocalProvider(LocalRrtopColorsPalette provides colorsPalette) {
 		Box(
 			modifier = Modifier
-                .size(terminal.size)
+				.size(terminal.size)
 				.background(LocalRrtopColorsPalette.current.mainBg)
 				.onKeyEvent {
 					when (it) {