From c3918826519068dc99a462bb826eedf63e6ab37d Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 24 Dec 2015 12:57:47 +0300 Subject: [PATCH] Minor: Fix NPE (EA-76742) --- .../idea/hierarchy/calls/KotlinCallHierarchyProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyProvider.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyProvider.java index 0cf8870ec74..802285fbb43 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyProvider.java @@ -43,7 +43,7 @@ public class KotlinCallHierarchyProvider implements HierarchyProvider { if (element == null) return null; element = HierarchyUtils.getCallHierarchyElement(element); - if (element instanceof KtFile || element.getLanguage() != KotlinLanguage.INSTANCE) return null; + if (element instanceof KtFile || element == null || element.getLanguage() != KotlinLanguage.INSTANCE) return null; return element; }