From 660d0e796bee12d2037d094683882fe63e1461b8 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 6 Nov 2014 14:30:42 +0100 Subject: [PATCH] extra care for possible NPE during matching PsiClass implementations with null qname --- .../structuralsearch/impl/matcher/JavaMatchingVisitor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java index e963ec91c2fc..a540080d95d9 100644 --- a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java +++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java @@ -420,7 +420,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor { (elements2 != null) ? elements2.getReferenceElements() : PsiElement.EMPTY_ARRAY ); } - + private boolean compareClasses(final PsiClass clazz, final PsiClass clazz2) { final PsiClass saveClazz = this.myClazz; final MatchContext.MatchedElementsListener oldListener = myMatchingVisitor.getMatchContext().getMatchedElementsListener(); @@ -838,6 +838,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor { String text2; if (el2 instanceof PsiClass) { text2 = ((PsiClass)el2).getQualifiedName(); + if (text2 == null) text2 = el2.getText(); } else { text2 = el2.getText(); }