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

Replaced usages of getAllDescriptors() from Kotlin code with getDescriptors()

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-10 22:24:01 +03:00
parent 16c7201b34
commit ff4d91d47b
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
+1 -1
View File
@@ -117,7 +117,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() {
}
private fun checkClass(classDescriptor: ClassDescriptor) {
classDescriptor.getDefaultType().getMemberScope().getAllDescriptors().filterIsInstance(javaClass<CallableDescriptor>()).forEach {
classDescriptor.getDefaultType().getMemberScope().getDescriptors().filterIsInstance(javaClass<CallableDescriptor>()).forEach {
checkCallable(it)
}
generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt
+2 -2
View File
@@ -51,12 +51,12 @@ fun generate(): String {
val builtIns = KotlinBuiltIns.getInstance()
[suppress("UNCHECKED_CAST")]
val allPrimitiveTypes = builtIns.getBuiltInsPackageScope().getAllDescriptors()
val allPrimitiveTypes = builtIns.getBuiltInsPackageScope().getDescriptors()
.filter { it is ClassDescriptor && builtIns.isPrimitiveType(it.getDefaultType()) } as List<ClassDescriptor>
for (descriptor in allPrimitiveTypes + builtIns.getString()) {
[suppress("UNCHECKED_CAST")]
val functions = descriptor.getMemberScope(Collections.emptyList()).getAllDescriptors()
val functions = descriptor.getMemberScope(Collections.emptyList()).getDescriptors()
.filter { it is FunctionDescriptor && !EXCLUDED_FUNCTIONS.contains(it.getName().asString()) } as List<FunctionDescriptor>
for (function in functions) {
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
+1 -1
View File
@@ -153,7 +153,7 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
builder.append(subindent)
appendDescriptor(classObject, subindent)
}
for (member in sortDeclarations(descriptor.getDefaultType().getMemberScope().getAllDescriptors())) {
for (member in sortDeclarations(descriptor.getDefaultType().getMemberScope().getDescriptors())) {
if (member.getContainingDeclaration() != descriptor) {
continue
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
+1 -1
View File
@@ -68,7 +68,7 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
JavaProtoBufUtil.readPackageDataFrom(annotationData),
deserializationContext
) { listOf() }
return membersScope.getAllDescriptors()
return membersScope.getDescriptors()
}
private val localClassFinder = object : KotlinClassFinder {
idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt
+1 -1
View File
@@ -50,7 +50,7 @@ public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider<Tr
val children = ArrayList<TreeElement>()
val defaultType = descriptor.getDefaultType()
for (memberDescriptor in defaultType.getMemberScope().getAllDescriptors()) {
for (memberDescriptor in defaultType.getMemberScope().getDescriptors()) {
if (memberDescriptor !is CallableMemberDescriptor) continue
when (memberDescriptor.getKind()) {