Skip to content

[StickyScrolling] Prevent out of bounds errors by validating sticky l… #2769

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
Feb 5, 2025
Merged

[StickyScrolling] Prevent out of bounds errors by validating sticky l… #2769

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
2 changes: 1 addition & 1 deletion ...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 @@ -55,7 +55,7 @@ public StyleRange[] getStyleRanges() {
StyledText textWidget= sourceViewer.getTextWidget();
int widgetLineNumber = getWidgetLineNumber();

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

Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -441,7 +441,7 @@ public void controlMoved(ControlEvent e) {
private boolean areStickyLinesOutDated(StyledText textWidget) {
if (stickyLines.size() > 0) {
int lastStickyLineNumber = stickyLines.get(stickyLines.size() - 1).getLineNumber();
return lastStickyLineNumber > textWidget.getLineCount();
return lastStickyLineNumber >= textWidget.getLineCount();
}
return false;
}
Expand Down
5 changes: 3 additions & 2 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 @@ -100,9 +100,10 @@ public void testGetStyleRangesIgnoresOutOfBoundLines() {
textWidget.setText("line1\nline2\nline3");

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

assertNull(styleRanges);
stickyLineOutOfBound = new StickyLine(3, sourceViewer);
assertNull(stickyLineOutOfBound.getStyleRanges());
}

@Test
Expand Down
3 changes: 2 additions & 1 deletion ...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 @@ -256,7 +256,7 @@ public void testLayoutStickyLinesCanvasOnResize() {
public void testDontLayoutOutDatedStickyLinesOnResize() {
sourceViewer.getTextWidget().setBounds(0, 0, 200, 200);

List<IStickyLine> stickyLines = List.of(new StickyLineStub("line 10", 10));
List<IStickyLine> stickyLines = List.of(new StickyLineStub("line 1", 1));
stickyScrollingControl.setStickyLines(stickyLines);

Canvas stickyControlCanvas = getStickyControlCanvas(shell);
Expand Down Expand Up @@ -329,6 +329,7 @@ public void testHorizontalScrollingIsDispatched() {
@Test
public void testLimitStickyLinesToTextWidgetHeight() {
sourceViewer.getTextWidget().setBounds(0, 0, 200, 200);
sourceViewer.getTextWidget().setText("line1\nline2");
List<IStickyLine> stickyLines = List.of(new StickyLineStub("line 2", 1));
stickyScrollingControl.setStickyLines(stickyLines);

Expand Down
Loading