From 096f4ef5c2a1b2ffc1146b08c41ea530a8f38db1 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Wed, 21 Dec 2016 12:45:20 +0100 Subject: [PATCH] logging for (IDEA-165626) --- .../com/intellij/util/text/ElementPresentation.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/util/text/ElementPresentation.java b/java/java-impl/src/com/intellij/util/text/ElementPresentation.java index 513b838b51d9..1a839014c617 100644 --- a/java/java-impl/src/com/intellij/util/text/ElementPresentation.java +++ b/java/java-impl/src/com/intellij/util/text/ElementPresentation.java @@ -15,6 +15,7 @@ */ package com.intellij.util.text; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.util.PsiFormatUtil; @@ -202,6 +203,7 @@ public abstract class ElementPresentation { } private static class ForClass extends ElementPresentation { + private static final Logger LOG = Logger.getInstance(ForClass.class); private final PsiClass myPsiClass; public ForClass(PsiClass psiClass) { @@ -218,7 +220,13 @@ public abstract class ElementPresentation { } public String getComment() { - PsiPackage psiPackage = JavaDirectoryService.getInstance().getPackage(myPsiClass.getContainingFile().getContainingDirectory()); + PsiFile file = myPsiClass.getContainingFile(); + PsiDirectory dir = file.getContainingDirectory(); + if (dir == null) { + LOG.info("psiClass: " + myPsiClass + "; in file: " + file); + return ""; + } + PsiPackage psiPackage = JavaDirectoryService.getInstance().getPackage(dir); if (psiPackage == null) return ""; return forElement(psiPackage).getQualifiedName(); }