Merge pull request #718 from JordanMartinez/fixUnconsecutiveStyleIssue

Fix unconsecutive style issue

Author: JordanMartinez

richtextfx/src/integrationTest/java/org/fxmisc/richtext/SceneGraphTests.java

@@ -82,6 +82,10 @@ protected List<Path> getBorderPaths(int index) {
         return getParagraphTextChildren(index, n -> n instanceof BorderPath, n -> (BorderPath) n);
     }
 
+    protected List<Path> getBackgroundPaths(int index) {
+        return getParagraphTextChildren(index, n -> n instanceof BackgroundPath, n -> (BackgroundPath) n);
+    }
+
     private <T> List<T> getParagraphTextChildren(int index, Predicate<Node> instanceOfCheck, Function<Node, T> cast) {
         TextFlow tf = getParagraphText(index);
 

richtextfx/src/integrationTest/java/org/fxmisc/richtext/style/StylingTests.java

@@ -173,4 +173,21 @@ public void consecutive_underline_styles_that_are_the_same_are_rendered_with_one
 
         assertEquals(1, getUnderlinePaths(0).size());
     }
+
+    @Test
+    public void unconsecutive_background_styles_should_each_be_rendered_with_their_own_shape() {
+        String style = "-rtfx-background-color: #ccc;";
+        interact(() -> {
+            // Text:  |aba abba|
+            // Style: |x x x  x|
+
+            area.replaceText("aba abba");
+            area.setStyle(0, 1, style);
+            area.setStyle(2, 3, style);
+            area.setStyle(4, 5, style);
+            area.setStyle(7, 8, style);
+        });
+        List<Path> paths = getBackgroundPaths(0);
+        assertEquals(4, paths.size());
+    }
 }

richtextfx/src/main/java/org/fxmisc/richtext/ParagraphText.java

@@ -13,6 +13,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -27,7 +28,6 @@
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.IndexRange;
-import javafx.scene.layout.Background;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.LineTo;
@@ -158,27 +158,15 @@ public ObjectProperty<Paint> highlightTextFillProperty() {
         });
 
         // set up custom css shape helpers
-        Supplier<Path> createBackgroundShape = () -> {
-            Path shape = new BackgroundPath();
-            shape.setManaged(false);
-            shape.layoutXProperty().bind(leftInset);
-            shape.layoutYProperty().bind(topInset);
-            return shape;
-        };
-        Supplier<Path> createBorderShape = () -> {
-            Path shape = new BorderPath();
-            shape.setManaged(false);
-            shape.layoutXProperty().bind(leftInset);
-            shape.layoutYProperty().bind(topInset);
-            return shape;
-        };
-        Supplier<Path> createUnderlineShape = () -> {
-            Path shape = new UnderlinePath();
+        UnaryOperator<Path> configurePath = shape -> {
             shape.setManaged(false);
             shape.layoutXProperty().bind(leftInset);
             shape.layoutYProperty().bind(topInset);
             return shape;
         };
+        Supplier<Path> createBackgroundShape = () -> configurePath.apply(new BackgroundPath());
+        Supplier<Path> createBorderShape = () -> configurePath.apply(new BorderPath());
+        Supplier<Path> createUnderlineShape = () -> configurePath.apply(new UnderlinePath());
 
         Consumer<Collection<Path>> clearUnusedShapes = paths -> getChildren().removeAll(paths);
         Consumer<Path> addToBackground = path -> getChildren().add(0, path);
@@ -482,8 +470,8 @@ private void updateSharedShapeRange(T value, int start, int end, BiFunction<T, T
                 T lastShapeValue = lastShapeValueRange._1;
 
                 // calculate smallest possible position which is consecutive to the given start position
-                final int prevEndNext = lastShapeValueRange.get2().getEnd() + 1;
-                if (start <= prevEndNext &&         // Consecutive?
+                final int prevEndNext = lastShapeValueRange.get2().getEnd();
+                if (start == prevEndNext &&                // Consecutive?
                     equals.apply(lastShapeValue, value)) { // Same style?
 
                     IndexRange lastRange = lastShapeValueRange._2;