[482602] Avoid NPE for breakpoints on comments and defines Change-Id: Id06775926a54082371a1a125335cfac710be2c8e Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
diff --git a/plugins/org.eclipse.xpand.ui/src/org/eclipse/xpand/ui/debug/XpandPluginAdapter.java b/plugins/org.eclipse.xpand.ui/src/org/eclipse/xpand/ui/debug/XpandPluginAdapter.java index 9bbe53c..8f45c9d 100644 --- a/plugins/org.eclipse.xpand.ui/src/org/eclipse/xpand/ui/debug/XpandPluginAdapter.java +++ b/plugins/org.eclipse.xpand.ui/src/org/eclipse/xpand/ui/debug/XpandPluginAdapter.java
@@ -15,6 +15,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.eclipse.core.resources.IResource; @@ -96,6 +97,8 @@ @Override protected List<ISyntaxElement> collectFirstLevelElements( final IXtendXpandResource res) { + if (res == null) + return Collections.emptyList(); List<ISyntaxElement> result = new ArrayList<ISyntaxElement>(); XpandDefinition[] defs = ((Template) res.getExtXptResource()) .getDefinitions(); @@ -213,6 +216,8 @@ break; } } + if (element == null) + return rootElem; return getContainingElement((SyntaxElement) element, position); }