From 68dd246a4df70e2e311b87dc0dff21b3ddc11ba1 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Thu, 20 Dec 2018 13:57:18 +0300 Subject: [PATCH] resource bundle: check underlying rb is valid when do operations in project view IDEA-180097 --- .../lang/properties/projectView/ResourceBundleNode.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleNode.java b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleNode.java index e43d7dca7c2c..f1cad5d0ed77 100644 --- a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleNode.java +++ b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleNode.java @@ -67,7 +67,9 @@ public class ResourceBundleNode extends ProjectViewNode implemen @Override public VirtualFile getVirtualFile() { - final List list = getResourceBundle().getPropertiesFiles(); + ResourceBundle rb = getResourceBundle(); + if (!rb.isValid()) return null; + final List list = rb.getPropertiesFiles(); if (!list.isEmpty()) { return list.get(0).getVirtualFile(); } @@ -77,7 +79,10 @@ public class ResourceBundleNode extends ProjectViewNode implemen @Override public void update(@NotNull PresentationData presentation) { presentation.setIcon(AllIcons.Nodes.ResourceBundle); - presentation.setPresentableText(PropertiesBundle.message("project.view.resource.bundle.tree.node.text", ObjectUtils.notNull(getValue()).getBaseName())); + ResourceBundle rb = getResourceBundle(); + if (rb.isValid()) { + presentation.setPresentableText(PropertiesBundle.message("project.view.resource.bundle.tree.node.text", rb.getBaseName())); + } } @Override