Skip to content

Fix regression: use only valid indexes for setting a merged segment #604

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
Oct 3, 2017
Merged

Fix regression: use only valid indexes for setting a merged segment #604

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
23832d7
Use different copy/paste approach, so that thrown exception fails test
JordanMartinez Oct 2, 2017
a01d9c8
Fix regression: only attempt segment merge when one is already stored
JordanMartinez Oct 2, 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
5 changes: 2 additions & 3 deletions richtextfx/src/integrationTest/java/org/fxmisc/richtext/keyboard/CutCopyPasteTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
16 changes: 10 additions & 6 deletions 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 @@ -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()));
Expand Down
⚡