8370253: CodeArea: NPE on copy

Reviewed-by: kcr

Author: Andy Goryachev

modules/jfx.incubator.richtext/src/main/java/com/sun/jfx/incubator/scene/control/richtext/RtfStyledOutput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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
@@ -517,8 +517,13 @@ public void close() throws IOException {
     }
 
     private static Color getTextColor(StyleAttributeMap a) {
-        Color c = a.getTextColor();
-        return c == null ? Color.BLACK : c;
+        if (a != null) {
+            Color c = a.getTextColor();
+            if (c != null) {
+                return c;
+            }
+        }
+        return Color.BLACK;
     }
 
     /** RTF is unable to specify colors inline it seems, needs a color lookup table */

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

@@ -155,24 +155,6 @@ void export(int start, int end, StyledOutput out) throws IOException {
         }
     }
 
-    // for use by SimpleReadOnlyStyledModel
-    StyleAttributeMap getStyleAttributeMap(StyleResolver resolver, int offset) {
-        int off = 0;
-        List<StyledSegment> segments = getSegments();
-        if (segments != null) {
-            int sz = segments.size();
-            for (int i = 0; i < sz; i++) {
-                StyledSegment seg = segments.get(i);
-                int len = seg.getTextLength();
-                if (offset < (off + len) || (i == sz - 1)) {
-                    return seg.getStyleAttributeMap(resolver);
-                }
-                off += len;
-            }
-        }
-        return StyleAttributeMap.EMPTY;
-    }
-
     private static void initAccessor() {
         RichParagraphHelper.setAccessor(new RichParagraphHelper.Accessor() {
             @Override

modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/CodeAreaTest.java

@@ -30,18 +30,27 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.List;
+import java.util.Set;
 import javafx.css.CssMetaData;
 import javafx.css.Styleable;
 import javafx.scene.Scene;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.DataFormat;
+import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import jfx.incubator.scene.control.richtext.CodeArea;
 import jfx.incubator.scene.control.richtext.RichTextArea;
+import jfx.incubator.scene.control.richtext.SyntaxDecorator;
+import jfx.incubator.scene.control.richtext.TextPos;
 import jfx.incubator.scene.control.richtext.model.CodeTextModel;
+import jfx.incubator.scene.control.richtext.model.RichParagraph;
 import jfx.incubator.scene.control.richtext.model.RichTextModel;
+import jfx.incubator.scene.control.richtext.model.StyleAttributeMap;
 import jfx.incubator.scene.control.richtext.skin.CodeAreaSkin;
+import test.jfx.incubator.scene.control.richtext.support.RTUtil;
 import test.jfx.incubator.scene.util.TUtil;
 
 /**
@@ -143,6 +152,62 @@ public void testPropertyBinding() {
 
     // functional API tests
 
+    @Test
+    public void copy() {
+        RTUtil.copyToClipboard("yo");
+        control.appendText("123");
+        control.selectAll();
+        control.copy();
+        assertEquals("123", Clipboard.getSystemClipboard().getString());
+
+        control.select(TextPos.ZERO, TextPos.ofLeading(0, 1));
+        control.copy();
+        assertEquals("1", Clipboard.getSystemClipboard().getString());
+
+        control.select(TextPos.ofLeading(0, 1), TextPos.ofLeading(0, 2));
+        control.copy();
+        assertEquals("2", Clipboard.getSystemClipboard().getString());
+
+        control.select(TextPos.ofLeading(0, 2), TextPos.ofLeading(0, 3));
+        control.copy();
+        assertEquals("3", Clipboard.getSystemClipboard().getString());
+
+        control.appendText("\n4");
+        control.select(new TextPos(0, 3, 2, false), control.getDocumentEnd());
+        control.copy();
+        String nl = System.getProperty("line.separator");
+        assertEquals(nl + "4", Clipboard.getSystemClipboard().getString());
+    }
+
+    @Test
+    public void copyWithSyntaxDecorator() {
+        control.appendText("123");
+        control.setSyntaxDecorator(new SyntaxDecorator() {
+            private static final StyleAttributeMap DIGITS = StyleAttributeMap.builder().setTextColor(Color.MAGENTA).build();
+
+            @Override
+            public RichParagraph createRichParagraph(CodeTextModel model, int index) {
+                String text = model.getPlainText(index);
+                RichParagraph.Builder b = RichParagraph.builder();
+                int len = text.length();
+                b.addSegment(text, 0, 1, null);
+                b.addSegment(text, 1, 2, DIGITS);
+                b.addSegment(text, 2, len, null);
+                return b.build();
+            }
+
+            @Override
+            public void handleChange(CodeTextModel m, TextPos start, TextPos end, int charsTop, int linesAdded, int charsBottom) {
+            }
+        });
+        control.select(TextPos.ZERO);
+        control.selectParagraph();
+        control.copy();
+        Clipboard cb = Clipboard.getSystemClipboard();
+        assertEquals("123", cb.getString());
+        assertEquals(Set.of(DataFormat.PLAIN_TEXT, DataFormat.HTML, DataFormat.RTF), cb.getContentTypes());
+    }
+
     @Test
     public void getControlCssMetaData() {
         List<CssMetaData<? extends Styleable, ?>> md = control.getControlCssMetaData();