From 9a484ec24c91e8f08f36b1faca2e2b367b6f7a5b Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 17 Oct 2012 16:06:32 +0200 Subject: [PATCH] EA-40089 - NPE: PropertiesUtil.getPackageQualifiedName --- .../src/com/intellij/lang/properties/BundleNameEvaluator.java | 4 ++++ .../src/com/intellij/lang/properties/PropertiesUtil.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/properties/src/com/intellij/lang/properties/BundleNameEvaluator.java b/plugins/properties/src/com/intellij/lang/properties/BundleNameEvaluator.java index e593671dc0d1..49877d3b3b04 100644 --- a/plugins/properties/src/com/intellij/lang/properties/BundleNameEvaluator.java +++ b/plugins/properties/src/com/intellij/lang/properties/BundleNameEvaluator.java @@ -32,6 +32,10 @@ public interface BundleNameEvaluator { } final PsiDirectory directory = psiFile.getParent(); + if (directory == null) { + return null; + } + final String packageQualifiedName = PropertiesUtil.getPackageQualifiedName(directory); if (packageQualifiedName != null) { diff --git a/plugins/properties/src/com/intellij/lang/properties/PropertiesUtil.java b/plugins/properties/src/com/intellij/lang/properties/PropertiesUtil.java index 06fc55c43354..ed3995267205 100644 --- a/plugins/properties/src/com/intellij/lang/properties/PropertiesUtil.java +++ b/plugins/properties/src/com/intellij/lang/properties/PropertiesUtil.java @@ -204,7 +204,7 @@ public class PropertiesUtil { } @Nullable - public static String getPackageQualifiedName(PsiDirectory directory) { + public static String getPackageQualifiedName(@NotNull PsiDirectory directory) { return ProjectRootManager.getInstance(directory.getProject()).getFileIndex().getPackageNameByDirectory(directory.getVirtualFile()); }