From 0e0af4fbe9042bd14f327bc245995d3ab41b6935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Thu, 14 Mar 2019 15:27:27 +0100 Subject: [PATCH] EA-139675 - NPE: NavigationGutterIconBuilder.calcPsiTargets / add assertion, use IAE --- .../codeInsight/navigation/NavigationGutterIconBuilder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java b/xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java index c8b22e6e9fcc..c650aeec73bb 100644 --- a/xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java +++ b/xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java @@ -323,7 +323,10 @@ public class NavigationGutterIconBuilder { final List list = new ArrayList<>(targets.size()); for (final T target : targets) { for (final PsiElement psiElement : converter.fun(target)) { - assert psiElement != null : converter + " returned null element"; + if (psiElement == null) { + throw new IllegalArgumentException(converter + " returned null element"); + } + if (elements.add(psiElement) && psiElement.isValid()) { list.add(manager.createSmartPsiElementPointer(psiElement)); }