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

Avoid calling KotlinBuiltIns.getInstance() in DescriptorRendererImpl

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-09-21 15:47:18 +03:00
parent 9f858cbc56
commit 9b0970e1a9
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+4 -5
View File
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.descriptors.annotations.ANNOTATION_MODIFIERS_FQ_NAME
import org.jetbrains.kotlin.descriptors.annotations.Annotated import org.jetbrains.kotlin.descriptors.annotations.Annotated
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.FqNameBase import org.jetbrains.kotlin.name.FqNameBase
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -37,7 +36,7 @@ import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.ErrorUtils.UninferredParameterTypeConstructor import org.jetbrains.kotlin.types.ErrorUtils.UninferredParameterTypeConstructor
import org.jetbrains.kotlin.types.TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE import org.jetbrains.kotlin.types.TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE
import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass
import java.util.ArrayList import java.util.*
internal class DescriptorRendererImpl( internal class DescriptorRendererImpl(
val options: DescriptorRendererOptionsImpl val options: DescriptorRendererOptionsImpl
@@ -502,14 +501,14 @@ internal class DescriptorRendererImpl(
val upperBoundsCount = typeParameter.getUpperBounds().size() val upperBoundsCount = typeParameter.getUpperBounds().size()
if ((upperBoundsCount > 1 && !topLevel) || upperBoundsCount == 1) { if ((upperBoundsCount > 1 && !topLevel) || upperBoundsCount == 1) {
val upperBound = typeParameter.getUpperBounds().iterator().next() val upperBound = typeParameter.getUpperBounds().iterator().next()
if (KotlinBuiltIns.getInstance().getDefaultBound() != upperBound) { if (!KotlinBuiltIns.isDefaultBound(upperBound)) {
builder.append(" : ").append(renderType(upperBound)) builder.append(" : ").append(renderType(upperBound))
} }
} }
else if (topLevel) { else if (topLevel) {
var first = true var first = true
for (upperBound in typeParameter.getUpperBounds()) { for (upperBound in typeParameter.getUpperBounds()) {
if (upperBound == KotlinBuiltIns.getInstance().getDefaultBound()) { if (KotlinBuiltIns.isDefaultBound(upperBound)) {
continue continue
} }
if (first) { if (first) {
@@ -797,7 +796,7 @@ internal class DescriptorRendererImpl(
private fun renderSuperTypes(klass: ClassDescriptor, builder: StringBuilder) { private fun renderSuperTypes(klass: ClassDescriptor, builder: StringBuilder) {
if (withoutSuperTypes) return if (withoutSuperTypes) return
if (klass == KotlinBuiltIns.getInstance().getNothing()) return if (KotlinBuiltIns.isNothing(klass.defaultType)) return
val supertypes = klass.getTypeConstructor().getSupertypes() val supertypes = klass.getTypeConstructor().getSupertypes()
if (supertypes.isEmpty() || supertypes.size() == 1 && KotlinBuiltIns.isAnyOrNullableAny(supertypes.iterator().next())) return if (supertypes.isEmpty() || supertypes.size() == 1 && KotlinBuiltIns.isAnyOrNullableAny(supertypes.iterator().next())) return