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

Removed getAllDescriptors() and getOwnDeclaredDescriptors() from KtScope

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-11-02 16:12:10 +03:00
parent 0b5de434fa
commit f7629b0c84
19 changed files with 15 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.KtClass;
import org.jetbrains.kotlin.psi.KtDeclaration;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.scopes.KtScope;
import org.jetbrains.kotlin.types.KotlinType;
@@ -96,7 +96,7 @@ public class JetTestFunctionDetector {
}
if (scope != null) {
Collection<DeclarationDescriptor> allDescriptors = scope.getDescriptors(DescriptorKindFilter.FUNCTIONS, KtScope.Companion.getALL_NAME_FILTER());
Collection<DeclarationDescriptor> allDescriptors = DescriptorUtils.getAllDescriptors(scope);
List<FunctionDescriptor> testFunctions = ContainerUtil.mapNotNull(
allDescriptors,
new Function<DeclarationDescriptor, FunctionDescriptor>() {
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java
+1 -2
View File
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsKt;
import org.jetbrains.kotlin.name.FqNameUnsafe;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter;
import org.jetbrains.kotlin.resolve.scopes.KtScope;
import java.util.*;
@@ -175,7 +174,7 @@ public class ManglingUtils {
if (jetScope != null) {
final String finalNameToCompare = nameToCompare;
Collection<DeclarationDescriptor> declarations = jetScope.getDescriptors(DescriptorKindFilter.CALLABLES, KtScope.Companion.getALL_NAME_FILTER());
Collection<DeclarationDescriptor> declarations = DescriptorUtils.getAllDescriptors(jetScope);
List<CallableDescriptor> overloadedFunctions =
CollectionsKt.flatMap(declarations, new Function1<DeclarationDescriptor, Iterable<? extends CallableDescriptor>>() {
@Override