Skip to content

Fix either ops bug #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JordanMartinez merged 2 commits into from
Aug 10, 2017
Merged

Fix either ops bug #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c7b5e8
Fix bug: if using EitherOps, return left, not right, ops' empty seg
JordanMartinez Aug 8, 2017
c90cb8c
Fix bug: ignore styles when both texts are empty segs
JordanMartinez Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion richtextfx/src/main/java/org/fxmisc/richtext/model/Paragraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,11 @@ public Paragraph<PS, SEG, S> subSequence(int start) {
throw new IllegalArgumentException("start must not be negative (was: " + start + ")");
} else if(start == 0) {
return this;
} else if(start <= length()) {
} else if (start == length()) {
// in case one is using EitherOps<SegmentOps, SegmentOps>, force the empty segment
// to use the left ops' default empty seg, not the right one's empty seg
return new Paragraph<>(paragraphStyle, segmentOps, segmentOps.createEmpty());
} else if(start < length()) {
Position pos = navigator.offsetToPosition(start, Forward);
int segIdx = pos.getMajor();
List<SEG> segs = new ArrayList<>(segments.size() - segIdx);
Expand Down
5 changes: 3 additions & 2 deletions richtextfx/src/main/java/org/fxmisc/richtext/model/StyledText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,9 @@ public String toString() {
public boolean equals(Object obj) {
if(obj instanceof StyledText) {
StyledText<?> that = (StyledText<?>) obj;
return Objects.equals(this.text, that.text)
&& Objects.equals(this.style, that.style);
return (this.text.isEmpty() && that.text.isEmpty())
|| (Objects.equals(this.text, that.text)
&& Objects.equals(this.style, that.style));
} else {
return false;
}
Expand Down
⚡