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

Minor. Simplify type aliases computation

Browse Source 
computeNonDeclaredTypeAliases is always empty
This commit is contained in:
Denis Zharkov
2016-08-12 16:44:46 +03:00
parent 2251e3b1e9
commit f50d0b63f0
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+2 -5
View File
@@ -99,15 +99,12 @@ abstract class DeserializedMemberScope protected constructor(
} }
private fun computeTypeAliases(name: Name): Collection<TypeAliasDescriptor> { private fun computeTypeAliases(name: Name): Collection<TypeAliasDescriptor> {
val protos = typeAliasProtos[name].orEmpty() val protos = typeAliasProtos[name] ?: return emptyList()
val descriptors = protos.mapTo(linkedSetOf()) { val descriptors = protos.mapTo(linkedSetOf()) {
c.memberDeserializer.loadTypeAlias(it) c.memberDeserializer.loadTypeAlias(it)
} }
computeNonDeclaredTypeAliases(name, descriptors)
return descriptors.toReadOnlyList()
}
protected open fun computeNonDeclaredTypeAliases(name: Name, descriptors: MutableCollection<TypeAliasDescriptor>) { return descriptors.toReadOnlyList()
} }
override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor> = properties(name) override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor> = properties(name)