Fix #34.

FXMisc · Apr 18, 2014 · 74f3a25 · 74f3a25
1 parent 71fc850
commit 74f3a25
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/EditableStyledDocument.java b/richtextfx/src/main/java/org/fxmisc/richtext/EditableStyledDocument.java
@@ -189,7 +189,9 @@ public void setStyle(int from, int to, S style) {
 
         try(Hold commitOnClose = beginStyleChange(from, to)) {
             Position start = navigator.offsetToPosition(from, Forward);
-            Position end = start.offsetBy(to - from, Backward);
+            Position end = to == from
+                    ? start
+                    : start.offsetBy(to - from, Backward);
             int firstParIdx = start.getMajor();
             int firstParFrom = start.getMinor();
             int lastParIdx = end.getMajor();
@@ -246,7 +248,9 @@ public void setStyleSpans(int from, StyleSpans<? extends S> styleSpans) {
         int len = styleSpans.length();
         try(Hold commitOnClose = beginStyleChange(from, from + len)) {
             Position start = offsetToPosition(from, Forward);
-            Position end = start.offsetBy(len, Backward);
+            Position end = len == 0
+                    ? start
+                    : start.offsetBy(len, Backward);
             int firstParIdx = start.getMajor();
             int firstParFrom = start.getMinor();
             int lastParIdx = end.getMajor();
@@ -444,4 +448,4 @@ private S getStyleForInsertionAt(Position insertionPos) {
         Paragraph<S> par = paragraphs.get(insertionPos.getMajor());
         return par.getStyleAtPosition(insertionPos.getMinor());
     }
-}
+}
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/Paragraph.java b/richtextfx/src/main/java/org/fxmisc/richtext/Paragraph.java
@@ -332,7 +332,9 @@ public StyleSpans<S> getStyleRanges() {
 
     public StyleSpans<S> getStyleRanges(int from, int to) {
         Position start = navigator.offsetToPosition(from, Forward);
-        Position end = start.offsetBy(to - from, Backward);
+        Position end = to == from
+                ? start
+                : start.offsetBy(to - from, Backward);
         int startSegIdx = start.getMajor();
         int endSegIdx = end.getMajor();
 

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocumentBase.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocumentBase.java
@@ -147,7 +147,9 @@ public IndexRange getStyleRangeAtPosition(int paragraph, int position) {
     @Override
     public StyleSpans<S> getStyleSpans(int from, int to) {
         Position start = offsetToPosition(from, Forward);
-        Position end = start.offsetBy(to - from, Backward);
+        Position end = to == from
+                ? start
+                : start.offsetBy(to - from, Backward);
         int startParIdx = start.getMajor();
         int endParIdx = end.getMajor();
 
@@ -220,10 +222,10 @@ private <P, R> R sub(
             SubMap<Paragraph<S>, P> subMap,
             Function<List<P>, R> combine) {
 
-        int length = end - start;
-
         Position start2D = navigator.offsetToPosition(start, Forward);
-        Position end2D = start2D.offsetBy(length, Backward);
+        Position end2D = end == start
+                ? start2D
+                : start2D.offsetBy(end - start, Backward);
         int p1 = start2D.getMajor();
         int col1 = start2D.getMinor();
         int p2 = end2D.getMajor();

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextArea.java
@@ -290,7 +290,9 @@ public <C> StyledTextArea(S initialStyle, BiConsumer<Text, S> applyStyle,
         internalSelection.addListener(obs -> {
             IndexRange sel = internalSelection.get();
             selectionStart2D = offsetToPosition(sel.getStart(), Forward);
-            selectionEnd2D = selectionStart2D.offsetBy(sel.getLength(), Backward);
+            selectionEnd2D = sel.getLength() == 0
+                    ? selectionStart2D
+                    : selectionStart2D.offsetBy(sel.getLength(), Backward);
         });
         internalSelection.set(EMPTY_RANGE);