8372438: SimpleViewOnlyStyledModel: non-text paragraphs

Reviewed-by: zelmidaoui, lkostyra

Author: Andy Goryachev

modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/model/SimpleViewOnlyStyledModel.java

@@ -120,7 +120,7 @@ public SimpleViewOnlyStyledModel addSegment(String text) {
     public SimpleViewOnlyStyledModel addWithInlineAndStyleNames(String text, String style, String... css) {
         Objects.requireNonNull(text);
         StyleAttributeMap a = StyleAttributeMap.fromStyles(style, css);
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.addSegment(text, a);
         return this;
     }
@@ -136,7 +136,7 @@ public SimpleViewOnlyStyledModel addWithInlineAndStyleNames(String text, String
     public SimpleViewOnlyStyledModel addWithStyleNames(String text, String... css) {
         Objects.requireNonNull(text);
         StyleAttributeMap a = StyleAttributeMap.fromStyles(null, css);
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.addSegment(text, a);
         return this;
     }
@@ -152,7 +152,7 @@ public SimpleViewOnlyStyledModel addWithStyleNames(String text, String... css) {
     public SimpleViewOnlyStyledModel addWithInlineStyle(String text, String style) {
         Objects.requireNonNull(text);
         StyleAttributeMap a = StyleAttributeMap.fromInlineStyle(style);
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.addSegment(text, a);
         return this;
     }
@@ -168,7 +168,7 @@ public SimpleViewOnlyStyledModel addWithInlineStyle(String text, String style) {
     public SimpleViewOnlyStyledModel addSegment(String text, StyleAttributeMap a) {
         // TODO split into paragraphs if \n is found, or check for \n ?
         Objects.requireNonNull(a);
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.addSegment(text, a);
         return this;
     }
@@ -182,7 +182,7 @@ public SimpleViewOnlyStyledModel addSegment(String text, StyleAttributeMap a) {
      * @return this model instance
      */
     public SimpleViewOnlyStyledModel highlight(int start, int length, Color c) {
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.addHighlight(start, length, c);
         return this;
     }
@@ -198,7 +198,7 @@ public SimpleViewOnlyStyledModel highlight(int start, int length, Color c) {
      * @since 25
      */
     public SimpleViewOnlyStyledModel highlight(int start, int length, String ... css) {
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.addHighlight(start, length, css);
         return this;
     }
@@ -212,7 +212,7 @@ public SimpleViewOnlyStyledModel highlight(int start, int length, String ... css
      * @return this model instance
      */
     public SimpleViewOnlyStyledModel addWavyUnderline(int start, int length, Color c) {
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.addSquiggly(start, length, c);
         return this;
     }
@@ -228,19 +228,24 @@ public SimpleViewOnlyStyledModel addWavyUnderline(int start, int length, Color c
      * @since 25
      */
     public SimpleViewOnlyStyledModel addWavyUnderline(int start, int length, String ... css) {
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.addSquiggly(start, length, css);
         return this;
     }
 
-    private Paragraph lastParagraph() {
+    // returns the last text paragraph, adding one if necessary
+    private Paragraph textParagraph() {
         int sz = paragraphs.size();
-        if (sz == 0) {
-            Paragraph p = new Paragraph();
-            paragraphs.add(p);
-            return p;
+        if (sz > 0) {
+            Paragraph p = paragraphs.get(sz - 1);
+            if (p.isTextParagraph()) {
+                return p;
+            }
+            // not a text paragraph, create new
         }
-        return paragraphs.get(sz - 1);
+        Paragraph p = new Paragraph();
+        paragraphs.add(p);
+        return p;
     }
 
     /**
@@ -293,7 +298,7 @@ public SimpleViewOnlyStyledModel addParagraph(Supplier<Region> generator) {
      * @return this model instance
      */
     public SimpleViewOnlyStyledModel addNodeSegment(Supplier<Node> generator) {
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.addInlineNode(generator);
         return this;
     }
@@ -345,7 +350,7 @@ public StyleAttributeMap getStyleAttributeMap(StyleResolver r, TextPos pos) {
      * @return this model instance
      */
     public SimpleViewOnlyStyledModel setParagraphAttributes(StyleAttributeMap a) {
-        Paragraph p = lastParagraph();
+        Paragraph p = textParagraph();
         p.setParagraphAttributes(a);
         return this;
     }
@@ -359,6 +364,10 @@ static class Paragraph {
         public Paragraph() {
         }
 
+        public boolean isTextParagraph() {
+            return true;
+        }
+
         public static Paragraph of(Supplier<Region> paragraphGenerator) {
             return new Paragraph() {
                 @Override
@@ -376,6 +385,11 @@ public void export(int start, int end, StyledOutput out) throws IOException {
                     StyledSegment seg = StyledSegment.ofRegion(paragraphGenerator);
                     out.consume(seg);
                 }
+
+                @Override
+                public boolean isTextParagraph() {
+                    return false;
+                }
             };
         }
 

modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/model/TestSimpleViewOnlyStyledModel.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.jfx.incubator.scene.control.richtext.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import javafx.scene.layout.Region;
+import org.junit.jupiter.api.Test;
+import jfx.incubator.scene.control.richtext.model.SimpleViewOnlyStyledModel;
+
+/**
+ * Tests SimpleViewOnlyStyledModel.
+ */
+public class TestSimpleViewOnlyStyledModel {
+    @Test
+    public void addTextAfterRegion() {
+        SimpleViewOnlyStyledModel m = new SimpleViewOnlyStyledModel();
+        m.addParagraph(() -> new Region());
+        m.addNodeSegment(() -> new Region());
+        assertEquals(2, m.size());
+    }
+
+    @Test
+    public void addTextAfterRegionAfterText() {
+        SimpleViewOnlyStyledModel m = new SimpleViewOnlyStyledModel();
+        m.addNodeSegment(() -> new Region());
+        m.addParagraph(() -> new Region());
+        m.addSegment("text");
+        assertEquals(3, m.size());
+    }
+}