Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2016-04-29 09:37:32 +0000
committerTom Schindl2016-04-29 09:37:32 +0000
commit41ea6b53938a1f8270c72ff2fc186c0252e6552a (patch)
treecb2644c2e87b5d45ae721bb1dbb062c488df0c9f
parent5af67711dd43463ffeefa588c3844e47226221ae (diff)
downloadorg.eclipse.efxclipse-41ea6b53938a1f8270c72ff2fc186c0252e6552a.tar.gz
org.eclipse.efxclipse-41ea6b53938a1f8270c72ff2fc186c0252e6552a.tar.xz
org.eclipse.efxclipse-41ea6b53938a1f8270c72ff2fc186c0252e6552a.zip
Bug 492712 - NPE if annotation has no position set
-rw-r--r--bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/internal/AnnotationModelSupport.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/internal/AnnotationModelSupport.java b/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/internal/AnnotationModelSupport.java
index 227b21f2a..c8a0f444e 100644
--- a/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/internal/AnnotationModelSupport.java
+++ b/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/internal/AnnotationModelSupport.java
@@ -151,6 +151,9 @@ public class AnnotationModelSupport {
while( annotationIterator.hasNext() ) {
Annotation a = annotationIterator.next();
Position position = annotationModel.getPosition(a);
+ if( position == null ) {
+ continue;
+ }
int curLineIndex = control.getLineAtOffset(position.offset);
if (curLineIndex == lineIndex) {
int lineBegin = control.getOffsetAtLine(curLineIndex);

Back to the top