Skip to content

Simple fix for NPE in ProjectionViewer.resetVisibleRegion #3460

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
Oct 28, 2025
+9 −5
Merged

Simple fix for NPE in ProjectionViewer.resetVisibleRegion #3460

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
14 changes: 9 additions & 5 deletions ...ipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,9 @@ public void setVisibleRegion(int start, int length) {
expandOutsideCurrentVisibleRegion(document);
collapseOutsideOfNewVisibleRegion(start, end, document);
fConfiguredVisibleRegion= newVisibleRegion;
hideProjectionAnnotationsOutsideOfVisibleRegion();
if (fProjectionAnnotationModel != null) {
hideProjectionAnnotationsOutsideOfVisibleRegion();
}
} catch (BadLocationException e) {
ILog log= ILog.of(getClass());
log.log(new Status(IStatus.WARNING, getClass(), IStatus.OK, null, e));
Expand Down Expand Up @@ -887,10 +889,12 @@ public void resetVisibleRegion() {
super.resetVisibleRegion();
}
fConfiguredVisibleRegion= null;
for (Iterator<Annotation> it= fProjectionAnnotationModel.getAnnotationIterator(); it.hasNext();) {
Annotation annotation= it.next();
if (annotation instanceof ProjectionAnnotation a) {
a.setHidden(false);
if (fProjectionAnnotationModel != null) {
for (Iterator<Annotation> it= fProjectionAnnotationModel.getAnnotationIterator(); it.hasNext();) {
Annotation annotation= it.next();
if (annotation instanceof ProjectionAnnotation a) {
a.setHidden(false);
}
}
}
}
Expand Down
Loading