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
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()) {