Support annotated strings for static logging

mattprecious · Dec 28, 2024 · 9464924 · 9464924
1 parent cd6857e
commit 9464924
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/commonMain/kotlin/com/mattprecious/stacker/command/StackerCommand.kt b/src/commonMain/kotlin/com/mattprecious/stacker/command/StackerCommand.kt
@@ -8,6 +8,7 @@ import androidx.compose.runtime.remember
 import com.github.ajalt.clikt.core.Abort
 import com.github.ajalt.clikt.core.CliktCommand
 import com.jakewharton.mosaic.runMosaicBlocking
+import com.jakewharton.mosaic.text.AnnotatedString
 import com.mattprecious.stacker.config.ConfigManager
 import com.mattprecious.stacker.lock.Locker
 import com.mattprecious.stacker.rendering.LocalPrinter
@@ -91,6 +92,10 @@ internal abstract class StackerCommand(
 			printer.printStatic(message)
 		}
 
+		fun printStatic(message: AnnotatedString) {
+			printer.printStatic(message)
+		}
+
 		suspend fun <R> render(content: @Composable (onResult: (R) -> Unit) -> Unit): R {
 			state.value = State.Rendering(content)
 			return state.filterIsInstance<State.DeliveringRenderResult<R>>().first().result.also {

diff --git a/src/commonMain/kotlin/com/mattprecious/stacker/rendering/printer.kt b/src/commonMain/kotlin/com/mattprecious/stacker/rendering/printer.kt
@@ -3,15 +3,20 @@ package com.mattprecious.stacker.rendering
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.runtime.staticCompositionLocalOf
+import com.jakewharton.mosaic.text.AnnotatedString
+import com.jakewharton.mosaic.text.buildAnnotatedString
 import com.jakewharton.mosaic.ui.Static
 import com.jakewharton.mosaic.ui.Text
 
 val LocalPrinter = staticCompositionLocalOf { Printer() }
 
 class Printer {
-	private val messages = SnapshotStateList<String>()
+	private val messages = SnapshotStateList<AnnotatedString>()
 
 	fun printStatic(message: String) {
+		messages += buildAnnotatedString { append(message) }
+	}
+	fun printStatic(message: AnnotatedString) {
 		messages += message
 	}