Merge pull request #43 from copper-leaf/dev

Merge dev into main for 3.0.1 release
copper-leaf · May 14, 2023 · 72f24f7 · 72f24f7
2 parents 35b4604 + 269605d
commit 72f24f7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
-## 3.0.0 - 2022-11-28
+## 3.0.1 - 2022-05-13
+
+- Fixes regression in BallastSavedStateInterceptor
+
+## 3.0.0 - 2022-05-07
 
 - Updates to Kotlin 1.8.20
 - Drops support for deprecated KMPP targets:

diff --git a/...rc/main/kotlin/com/copperleaf/ballast/debugger/idea/features/debugger/ui/widgets/utils.kt b/...rc/main/kotlin/com/copperleaf/ballast/debugger/idea/features/debugger/ui/widgets/utils.kt
@@ -313,16 +313,18 @@ fun IntellijEditor(
         }
 
         SelectionContainer {
-            lines.forEachIndexed { index, line ->
-                Row {
-                    DisableSelection {
-                        Text("${index + 1}", Modifier.width(24.dp))
+            Column {
+                lines.forEachIndexed { index, line ->
+                    Row {
+                        DisableSelection {
+                            Text("${index + 1}", Modifier.width(24.dp))
+                        }
+                        Text(
+                            text = line,
+                            color = color,
+                            fontFamily = FontFamily.Monospace,
+                        )
                     }
-                    Text(
-                        text = line,
-                        color = color,
-                        fontFamily = FontFamily.Monospace,
-                    )
                 }
             }
         }

diff --git a/...e/src/commonMain/kotlin/com/copperleaf/ballast/savedstate/BallastSavedStateInterceptor.kt b/...e/src/commonMain/kotlin/com/copperleaf/ballast/savedstate/BallastSavedStateInterceptor.kt
@@ -57,6 +57,8 @@ public class BallastSavedStateInterceptor<Inputs : Any, Events : Any, State : An
 
                         is BallastNotification.EventProcessingStarted,
                         is BallastNotification.EventProcessingStopped,
+                        is BallastNotification.InterceptorAttached,
+                        is BallastNotification.InterceptorFailed,
                         is BallastNotification.UnhandledError -> {
                             // these notifications are fine to be sent any time, we can ignore them
                         }