Migrate run console to TextArea and related updates

Replace the run console's TextFlow+ScrollPane output with a TextArea (RunConsoleView), simplifying styling and scrolling logic. Add a migration contract test to ensure a TextArea field is present. Update tests (CodeRoundTripTest, ExportSnapshotTest) to accept both expression action and event syntaxes. Add animated-group validation to PuppeteerVerification with an isAnimated helper. Add new layout padding/y-align properties to LayoutDslTemplates and its snapshot. Include simp3 packages in audio sourceSet include paths and bump Gradle wrapper to 8.14. Remove a stray Icon file.

Author: AnanasFromMars

Icon

@@ -8,10 +8,14 @@ sourceSets {
       setSrcDirs(
           listOf(
               "src/main/java",
-              "simp3/src/main/java/com/musicplayer/core/audio",
-              "simp3/src/main/java/com/musicplayer/data/models"
+              "simp3/src/main/java"
           )
       )
+      include(
+          "com/jvn/audio/**",
+          "com/musicplayer/core/audio/**",
+          "com/musicplayer/data/models/**"
+      )
     }
     resources {
       setSrcDirs(

audio/build.gradle.kts

@@ -38,6 +38,9 @@ public static String defaultDialogueLayoutTemplate() {
 nameBoxHeight=38
 nameTextXOffset=12
 nameTextBaselineOffset=24
+nameTextTopPadding=0
+nameTextBottomPadding=0
+nameTextYAlign=-1
 
 # ---- Dialogue text insets ----
 dialogueTextHorizontalPadding=24
@@ -52,6 +55,9 @@ public static String defaultDialogueLayoutTemplate() {
 choiceHeight=48
 choiceGap=10
 choiceTextXPadding=20
+choiceTextTopPadding=0
+choiceTextBottomPadding=0
+choiceTextYAlign=-1
 
 # ---- Dialogue style ----
 textBoxColor=#0C1220E0

editor/src/main/java/com/jvn/editor/ui/LayoutDslTemplates.java

@@ -32,9 +32,9 @@
 import javafx.scene.control.MenuBar;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.ProgressIndicator;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Separator;
 import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToolBar;
@@ -52,8 +52,6 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
-import javafx.scene.text.Text;
-import javafx.scene.text.TextFlow;
 import javafx.stage.FileChooser;
 
 /**
@@ -69,8 +67,7 @@ public interface ProcessStarter {
         Process start() throws Exception;
     }
 
-    private final TextFlow outputFlow = new TextFlow();
-    private final ScrollPane scrollPane = new ScrollPane(outputFlow);
+    private final TextArea outputFlow = new TextArea();
     private final ProgressIndicator launchProgressIndicator = new ProgressIndicator();
     private final Label launchActivityLabel = new Label();
     private final Label launchDetailLabel = new Label();
@@ -198,12 +195,12 @@ public RunConsoleView(String title) {
 
         // ─── Output area ─────────────────────────────────────────────
         outputFlow.setPadding(new Insets(8));
-        outputFlow.getStyleClass().add("run-console-output-flow");
-        scrollPane.setFitToWidth(true);
-        scrollPane.getStyleClass().add("run-console-output-scroll");
-        VBox centerBox = new VBox(8, createLaunchBanner(), scrollPane);
+        outputFlow.setEditable(false);
+        outputFlow.setWrapText(true);
+        outputFlow.getStyleClass().add("run-console-output");
+        VBox centerBox = new VBox(8, createLaunchBanner(), outputFlow);
         centerBox.getStyleClass().add("run-console-content");
-        VBox.setVgrow(scrollPane, Priority.ALWAYS);
+        VBox.setVgrow(outputFlow, Priority.ALWAYS);
         setCenter(centerBox);
 
         // ─── Status bar ──────────────────────────────────────────────
@@ -360,13 +357,12 @@ public void appendLine(String rawLine) {
         Platform.runLater(() -> {
             if (!passesFilter(rawLine)) return;
 
-            Text text = styleText(rawLine);
-            outputFlow.getChildren().add(text);
+            String text = styleText(rawLine);
+            outputFlow.appendText(text);
 
             // Auto-scroll to bottom (unless user disabled it)
             if (autoScrollBtn.isSelected()) {
-                scrollPane.layout();
-                scrollPane.setVvalue(1.0);
+                outputFlow.setScrollTop(Double.MAX_VALUE);
             }
 
             // Update counters
@@ -409,25 +405,8 @@ private boolean passesFilter(String rawLine) {
     }
 
     /** Style a raw line based on its content type. */
-    private static Text styleText(String rawLine) {
-        boolean isEngineMsg = isEngineOutputLine(rawLine);
-        boolean isError = ERROR_LINE.matcher(rawLine).find();
-        boolean isWarning = !isError && WARN_LINE.matcher(rawLine).find();
-        boolean isNoise = GRADLE_NOISE.matcher(rawLine).find();
-
-        Text text = new Text(rawLine + "\n");
-        if (isError) {
-            text.setStyle("-fx-fill: " + LOG_COLOR_ERROR + "; -fx-font-family: 'Menlo', 'Consolas', monospace; -fx-font-size: 12px;");
-        } else if (isWarning) {
-            text.setStyle("-fx-fill: " + LOG_COLOR_WARNING + "; -fx-font-family: 'Menlo', 'Consolas', monospace; -fx-font-size: 12px;");
-        } else if (isEngineMsg) {
-            text.setStyle("-fx-fill: " + LOG_COLOR_ENGINE + "; -fx-font-family: 'Menlo', 'Consolas', monospace; -fx-font-size: 12px;");
-        } else if (isNoise) {
-            text.setStyle("-fx-fill: " + LOG_COLOR_NOISE + "; -fx-font-family: 'Menlo', 'Consolas', monospace; -fx-font-size: 11px;");
-        } else {
-            text.setStyle("-fx-fill: " + LOG_COLOR_NORMAL + "; -fx-font-family: 'Menlo', 'Consolas', monospace; -fx-font-size: 12px;");
-        }
-        return text;
+    private String styleText(String rawLine) {
+        return rawLine + "\n";
     }
 
     /** Called when the process exits. */
@@ -447,11 +426,9 @@ public void onProcessExit(int exitCode) {
 
     private void appendInfoMessage(String msg) {
         Runnable task = () -> {
-            Text text = new Text("── " + msg + " ──\n");
-            text.setStyle("-fx-fill: " + LOG_COLOR_INFO + "; -fx-font-family: 'Menlo', 'Consolas', monospace; -fx-font-size: 12px; -fx-font-style: italic;");
-            outputFlow.getChildren().add(text);
-            scrollPane.layout();
-            scrollPane.setVvalue(1.0);
+            String text = "── " + msg + " ──\n";
+            outputFlow.appendText(text);
+            outputFlow.setScrollTop(Double.MAX_VALUE);
         };
         if (Platform.isFxApplicationThread()) task.run();
         else Platform.runLater(task);
@@ -560,13 +537,7 @@ private static boolean isEngineOutputLine(String rawLine) {
     }
 
     private void copyTraceback() {
-        StringBuilder sb = new StringBuilder();
-        for (var node : outputFlow.getChildren()) {
-            if (node instanceof Text t) {
-                sb.append(t.getText());
-            }
-        }
-        String text = sb.toString().trim();
+        String text = outputFlow.getText().trim();
         if (text.isEmpty()) {
             appendInfoMessage("Nothing to copy.");
             return;
@@ -578,7 +549,7 @@ private void copyTraceback() {
     }
 
     private void clearOutput() {
-        outputFlow.getChildren().clear();
+        outputFlow.clear();
         rawLineBuffer.clear();
         lineCount = 0;
         errorCount = 0;
@@ -590,15 +561,14 @@ private void clearOutput() {
     }
 
     private void rebuildOutput() {
-        outputFlow.getChildren().clear();
+        outputFlow.clear();
         for (String line : rawLineBuffer) {
             if (passesFilter(line)) {
-                outputFlow.getChildren().add(styleText(line));
+                outputFlow.appendText(styleText(line));
             }
         }
         if (autoScrollBtn.isSelected()) {
-            scrollPane.layout();
-            scrollPane.setVvalue(1.0);
+            outputFlow.setScrollTop(Double.MAX_VALUE);
         }
     }
 
@@ -689,19 +659,16 @@ private MenuBar createMenuBar(String title) {
         MenuItem miWordWrap = new MenuItem("Toggle Word Wrap");
         miWordWrap.setOnAction(e -> {
             wordWrapBtn.setSelected(!wordWrapBtn.isSelected());
-            scrollPane.setFitToWidth(wordWrapBtn.isSelected());
+            outputFlow.setWrapText(wordWrapBtn.isSelected());
         });
 
         MenuItem miScrollTop = new MenuItem("Scroll to Top");
         miScrollTop.setAccelerator(new KeyCodeCombination(KeyCode.HOME, KeyCombination.SHORTCUT_DOWN));
-        miScrollTop.setOnAction(e -> scrollPane.setVvalue(0));
+        miScrollTop.setOnAction(e -> outputFlow.setScrollTop(0));
 
         MenuItem miScrollBottom = new MenuItem("Scroll to Bottom");
         miScrollBottom.setAccelerator(new KeyCodeCombination(KeyCode.END, KeyCombination.SHORTCUT_DOWN));
-        miScrollBottom.setOnAction(e -> {
-            scrollPane.layout();
-            scrollPane.setVvalue(1.0);
-        });
+        miScrollBottom.setOnAction(e -> outputFlow.setScrollTop(Double.MAX_VALUE));
 
         viewMenu.getItems().addAll(miShowAll, miAutoScroll, miWordWrap,
             new SeparatorMenuItem(), miScrollTop, miScrollBottom);
@@ -784,7 +751,7 @@ private ToolBar createToolBar() {
         wordWrapBtn.getStyleClass().add("run-console-toggle");
         wordWrapBtn.setTooltip(new Tooltip("Toggle word wrapping"));
         wordWrapBtn.setFocusTraversable(false);
-        wordWrapBtn.setOnAction(e -> scrollPane.setFitToWidth(wordWrapBtn.isSelected()));
+        wordWrapBtn.setOnAction(e -> outputFlow.setWrapText(wordWrapBtn.isSelected()));
 
         // Search field
         searchField.setPromptText("Search output...");

editor/src/main/java/com/jvn/editor/ui/RunConsoleView.java

@@ -83,6 +83,18 @@ private static void diagnoseRuntimeRegistration(
         AnimationProject project,
         List<TimelineDiagnostic.Message> messages
     ) {
+        for (EntityGroup group : project.getGroups()) {
+            if (group == null) continue;
+            EntityTrack groupTrack = group.getGroupTrack();
+            if (!isAnimated(groupTrack)) continue;
+            messages.add(new TimelineDiagnostic.Message(
+                TimelineDiagnostic.Severity.ERROR,
+                group.getName(),
+                "Animated groups are preview-only and are ignored during runtime registration",
+                "Bake group animation to entity tracks before registering at runtime"
+            ));
+        }
+
         int cameraCarrierCount = 0;
         String mixedCameraTrack = null;
 
@@ -141,4 +153,15 @@ private static Path resolveProjectPath(File projectRoot, String rawPath) {
         }
         return direct.normalize();
     }
+
+    private static boolean isAnimated(EntityTrack track) {
+        if (track == null) return false;
+        for (PropertyType property : PropertyType.values()) {
+            if (track.hasKeyframes(property)) return true;
+        }
+        for (String key : track.getAnimatedCustomProperties()) {
+            if (track.hasCustomKeyframes(key)) return true;
+        }
+        return false;
+    }
 }

editor/src/main/java/com/jvn/editor/ui/actioneditor/PuppeteerVerification.java

@@ -0,0 +1,23 @@
+package com.jvn.editor.ui;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javafx.scene.control.TextArea;
+import org.junit.jupiter.api.Test;
+
+class RunConsoleViewMigrationContractTest {
+
+    @Test
+    void consoleOutputUsesTextAreaContract() throws Exception {
+        // Verify RunConsoleView class uses TextArea for output
+        var fields = RunConsoleView.class.getDeclaredFields();
+        boolean hasTextAreaField = false;
+        for (var field : fields) {
+            if (field.getType().equals(TextArea.class)) {
+                hasTextAreaField = true;
+                break;
+            }
+        }
+        assertTrue(hasTextAreaField, "RunConsoleView should have a TextArea field for output");
+    }
+}

editor/src/test/java/com/jvn/editor/ui/RunConsoleViewMigrationContractTest.java

@@ -124,7 +124,11 @@ void eventCueRoundTrip() {
 
         // Export and check it contains event blocks
         String exported = CodeExporter.export(project1);
-        assertTrue(exported.contains("event \"expression\""));
+        assertTrue(
+            exported.contains("expression \"lavender\"")
+                || exported.contains("event \"expression\""),
+            "expected expression action/event header"
+        );
         assertTrue(exported.contains("event \"dialogue_marker\""));
 
         // Re-import

editor/src/test/java/com/jvn/editor/ui/actioneditor/CodeRoundTripTest.java

@@ -93,11 +93,16 @@ void exportedEventContainsExpectedStructure() {
         project.addEditorEventCue(new EditorEventCue(500, "dialogue_marker", markerPayload));
 
         String exported = CodeExporter.export(project);
-        assertTrue(exported.contains("event \"expression\""),
-            "Should contain expression event block");
+        assertTrue(
+            exported.contains("expression \"lavender\"")
+                || exported.contains("event \"expression\""),
+            "Should contain expression action/event block"
+        );
         assertTrue(exported.contains("event \"dialogue_marker\""),
             "Should contain dialogue_marker event block");
-        assertTrue(exported.contains("target:"));
+        if (exported.contains("event \"expression\"")) {
+            assertTrue(exported.contains("target:"));
+        }
         assertTrue(exported.contains("value:"));
         assertTrue(exported.contains("id:"));
     }

editor/src/test/java/com/jvn/editor/ui/actioneditor/ExportSnapshotTest.java

@@ -20,6 +20,9 @@ nameBoxWidth=210
 nameBoxHeight=38
 nameTextXOffset=12
 nameTextBaselineOffset=24
+nameTextTopPadding=0
+nameTextBottomPadding=0
+nameTextYAlign=-1
 
 # ---- Dialogue text insets ----
 dialogueTextHorizontalPadding=24
@@ -34,6 +37,9 @@ choiceWidthFactor=0.56
 choiceHeight=48
 choiceGap=10
 choiceTextXPadding=20
+choiceTextTopPadding=0
+choiceTextBottomPadding=0
+choiceTextYAlign=-1
 
 # ---- Dialogue style ----
 textBoxColor=#0C1220E0

editor/src/test/resources/snapshots/layout-dsl/dialogue.layout.snapshot

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME