azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call hierarchy supports new facades

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-09-14 12:50:41 +02:00
parent 35de13a6b2
commit c81f1d314c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
+1
View File
@@ -353,6 +353,7 @@ public object LightClassUtil {
listOf(getter, setter).filterNotNullTo(allMethods) listOf(getter, setter).filterNotNullTo(allMethods)
listOf<PsiNamedElement?>(getter, setter, backingField).filterNotNullTo(allDeclarations) listOf<PsiNamedElement?>(getter, setter, backingField).filterNotNullTo(allDeclarations)
allDeclarations.addAll(additionalAccessors) allDeclarations.addAll(additionalAccessors)
additionalAccessors.filterIsInstanceTo<PsiMethod, MutableList<PsiMethod>>(allMethods)
} }
override fun iterator(): Iterator<PsiMethod> = allMethods.iterator() override fun iterator(): Iterator<PsiMethod> = allMethods.iterator()
idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java
+3 -6
View File
@@ -45,10 +45,7 @@ import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
import java.util.Collections; import java.util.*;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure { public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure {
private final CallerMethodsTreeStructure javaTreeStructure; private final CallerMethodsTreeStructure javaTreeStructure;
@@ -107,8 +104,8 @@ public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure {
); );
} }
if (element instanceof JetNamedFunction || element instanceof JetSecondaryConstructor) { if (element instanceof JetNamedFunction || element instanceof JetSecondaryConstructor) {
PsiMethod lightMethod = LightClassUtil.INSTANCE$.getLightClassMethod((JetFunction) element); Collection<PsiMethod> lightMethods = LightClassUtil.INSTANCE$.getLightClassMethods((JetFunction) element);
processPsiMethodCallers(Collections.singleton(lightMethod), descriptor, methodToDescriptorMap, searchScope, false); processPsiMethodCallers(lightMethods, descriptor, methodToDescriptorMap, searchScope, false);
} }
if (element instanceof JetProperty) { if (element instanceof JetProperty) {
LightClassUtil.PropertyAccessorsPsiMethods propertyMethods = LightClassUtil.PropertyAccessorsPsiMethods propertyMethods =