Merge pull request FXMisc#604 from JordanMartinez/fixRegression

Fix regression: use only valid indexes for setting a merged segment
afester · Oct 3, 2017 · ce00638 · ce00638
2 parents ed98ae5 + a01d9c8
commit ce00638
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/richtextfx/src/integrationTest/java/org/fxmisc/richtext/keyboard/CutCopyPasteTests.java b/richtextfx/src/integrationTest/java/org/fxmisc/richtext/keyboard/CutCopyPasteTests.java
@@ -303,9 +303,8 @@ public void setup() {
 
             @Test
             public void copying_and_pasting_should_not_throw_exception() {
-                push(CONTROL, C);
-
-                push(CONTROL, V);
+                interact(area::copy);
+                interact(area::paste);
             }
         }
     }

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/model/Paragraph.java b/richtextfx/src/main/java/org/fxmisc/richtext/model/Paragraph.java
@@ -46,13 +46,17 @@ private static <SEG, S> Tuple2<List<SEG>, StyleSpans<S>> decompose(List<StyledSe
         StyleSpansBuilder<S> builder = new StyleSpansBuilder<>();
         for (StyledSegment<SEG, S> styledSegment : list) {
             // attempt to merge differently-styled consecutive segments into one
-            int lastIndex = segs.size() - 1;
-            SEG previousSeg = segs.get(lastIndex);
-            Optional<SEG> merged = segmentOps.joinSeg(previousSeg, styledSegment.getSegment());
-            if (merged.isPresent()) {
-                segs.set(lastIndex, merged.get());
-            } else {
+            if (segs.isEmpty()) {
                 segs.add(styledSegment.getSegment());
+            } else {
+                int lastIndex = segs.size() - 1;
+                SEG previousSeg = segs.get(lastIndex);
+                Optional<SEG> merged = segmentOps.joinSeg(previousSeg, styledSegment.getSegment());
+                if (merged.isPresent()) {
+                    segs.set(lastIndex, merged.get());
+                } else {
+                    segs.add(styledSegment.getSegment());
+                }
             }
             // builder merges styles shared between consecutive different segments
             builder.add(styledSegment.getStyle(), segmentOps.length(styledSegment.getSegment()));