Skip to content

[StickyScrolling] Avoid out of bound error when styling sticky lines #2757

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
Jan 28, 2025
Merged

[StickyScrolling] Avoid out of bound error when styling sticky lines #2757

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
6 changes: 6 additions & 0 deletions ...rg.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ public String getText() {
@Override
public StyleRange[] getStyleRanges() {
StyledText textWidget= sourceViewer.getTextWidget();
int widgetLineNumber = getWidgetLineNumber();

if (widgetLineNumber > textWidget.getLineCount()) {
return null;
}

int offsetAtLine= textWidget.getOffsetAtLine(getWidgetLineNumber());
StyleRange[] styleRanges= textWidget.getStyleRanges(offsetAtLine, getText().length());
for (StyleRange styleRange : styleRanges) {
Expand Down
11 changes: 11 additions & 0 deletions ....ui.editors.tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyLineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package org.eclipse.ui.internal.texteditor.stickyscroll;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;

import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -94,6 +95,16 @@ public void testGetStyleRanges() {
assertEquals(2, styleRanges[1].length);
}

@Test
public void testGetStyleRangesIgnoresOutOfBoundLines() {
textWidget.setText("line1\nline2\nline3");

StickyLine stickyLineOutOfBound = new StickyLine(10, sourceViewer);
StyleRange[] styleRanges = stickyLineOutOfBound.getStyleRanges();

assertNull(styleRanges);
}

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