From c81f1d314c0c498f97c36637e2683c673ec17713 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 14 Sep 2015 12:50:41 +0200
Subject: [PATCH] call hierarchy supports new facades

---
 .../src/org/jetbrains/kotlin/asJava/LightClassUtil.kt    | 1 +
 .../calls/KotlinCallerMethodsTreeStructure.java          | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
index e049f3326fb..ebd478420c7 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
@@ -353,6 +353,7 @@ public object LightClassUtil {
             listOf(getter, setter).filterNotNullTo(allMethods)
             listOf<PsiNamedElement?>(getter, setter, backingField).filterNotNullTo(allDeclarations)
             allDeclarations.addAll(additionalAccessors)
+            additionalAccessors.filterIsInstanceTo<PsiMethod, MutableList<PsiMethod>>(allMethods)
         }
 
         override fun iterator(): Iterator<PsiMethod> = allMethods.iterator()
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java
index d2e20cc2682..db4aa3b9ec4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java
@@ -45,10 +45,7 @@ import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure {
     private final CallerMethodsTreeStructure javaTreeStructure;
@@ -107,8 +104,8 @@ public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure {
             );
         }
         if (element instanceof JetNamedFunction || element instanceof JetSecondaryConstructor) {
-            PsiMethod lightMethod = LightClassUtil.INSTANCE$.getLightClassMethod((JetFunction) element);
-            processPsiMethodCallers(Collections.singleton(lightMethod), descriptor, methodToDescriptorMap, searchScope, false);
+            Collection<PsiMethod> lightMethods = LightClassUtil.INSTANCE$.getLightClassMethods((JetFunction) element);
+            processPsiMethodCallers(lightMethods, descriptor, methodToDescriptorMap, searchScope, false);
         }
         if (element instanceof JetProperty) {
             LightClassUtil.PropertyAccessorsPsiMethods propertyMethods =