Skip to content

Fix IllegalArgumentException when styling the sticky lines #2497

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
merged 1 commit into from
Nov 6, 2024
Merged

Fix IllegalArgumentException when styling the sticky lines #2497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions ...i.editors/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,20 +242,20 @@ private void styleStickyLines() {
return;
}

int stickyLineOffset= 0;
List<StyleRange> styleRanges= new ArrayList<>();
for (IStickyLine stickyLine : stickyLines) {
List<StyleRange> stickyLinesStyleRanges= new ArrayList<>();
int stickyLineTextOffset= 0;
for (int i= 0; i < getNumberStickyLines(); i++) {
IStickyLine stickyLine= stickyLines.get(i);
StyleRange[] ranges= stickyLine.getStyleRanges();
if (ranges != null) {
for (StyleRange styleRange : ranges) {
styleRange.start+= stickyLineOffset;
styleRanges.add(styleRange);
styleRange.start+= stickyLineTextOffset;
stickyLinesStyleRanges.add(styleRange);
}
}

stickyLineOffset+= stickyLine.getText().length() + System.lineSeparator().length();
stickyLineTextOffset+= stickyLine.getText().length() + System.lineSeparator().length();
}
stickyLineText.setStyleRanges(styleRanges.toArray(StyleRange[]::new));
stickyLineText.setStyleRanges(stickyLinesStyleRanges.toArray(StyleRange[]::new));

stickyLineNumber.setFont(textWidget.getFont());
stickyLineNumber.setStyleRange(new StyleRange(0, stickyLineNumber.getText().length(), settings.lineNumberColor(), null));
Expand Down
23 changes: 23 additions & 0 deletions ...tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,29 @@ public void testCopyStyleRanges() {
assertEquals(separatorColor, styleRanges[1].background);
}

@Test
public void testCopyStyleRangesWithLimitedStickyLines() {
settings = new StickyScrollingControlSettings(1, lineNumberColor, hoverColor, backgroundColor, separatorColor,
true);
stickyScrollingControl.applySettings(settings);

StyleRange styleRangeLine1 = new StyleRange(0, 1, lineNumberColor, backgroundColor);
StyleRange styleRangeLine2 = new StyleRange(0, 2, hoverColor, separatorColor);
List<IStickyLine> stickyLines = List.of(//
new StickyLineStub("line 1", 0, new StyleRange[] { styleRangeLine1 }),
new StickyLineStub("line 2", 0, new StyleRange[] { styleRangeLine2 }));
stickyScrollingControl.setStickyLines(stickyLines);

StyledText stickyLineText = getStickyLineText();

StyleRange[] styleRanges = stickyLineText.getStyleRanges();
assertEquals(1, styleRanges.length);
assertEquals(0, styleRanges[0].start);
assertEquals(1, styleRanges[0].length);
assertEquals(lineNumberColor, styleRanges[0].foreground);
assertEquals(backgroundColor, styleRanges[0].background);
}

@Test
public void testWithoutVerticalRuler() {
sourceViewer = new SourceViewer(shell, null, SWT.None);
Expand Down
Loading