From 85ce85383be0c0838fca0ca2503cc9c3ac0573ff Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Apr 2012 18:46:45 +0400 Subject: [PATCH] Added rendering variance for type parameters in DescriptorRenderer. --- .../src/org/jetbrains/jet/resolve/DescriptorRenderer.java | 8 +++++++- compiler/testData/renderer/Classes.kt | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java index 7d8ddddf43b..a2ff448bc28 100644 --- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java @@ -469,7 +469,13 @@ public class DescriptorRenderer implements Renderer { } protected void renderTypeParameter(TypeParameterDescriptor descriptor, StringBuilder builder) { - if (!descriptor.isReified()) { + if (descriptor.isReified()) { + String variance = descriptor.getVariance().toString(); + if (!variance.isEmpty()) { + builder.append(renderKeyword(variance)).append(" "); + } + } + else { builder.append(renderKeyword("erased")).append(" "); } renderName(descriptor, builder); diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt index e5e9b52e2fc..e69596a832a 100644 --- a/compiler/testData/renderer/Classes.kt +++ b/compiler/testData/renderer/Classes.kt @@ -31,8 +31,8 @@ private enum class TheEnum(val rgb : Int) { //package rendererTest defined in root package //internal final annotation class TheAnnotation defined in rendererTest -//public open class TheClass defined in rendererTest -// defined in rendererTest.TheClass +//public open class TheClass defined in rendererTest +// defined in rendererTest.TheClass // defined in rendererTest.TheClass //private final val privateVal : jet.Int defined in rendererTest.TheClass //internal final val shouldBeFinal : jet.Int defined in rendererTest.TheClass