From b300329e21fd17ac4c85b0f511d79fd6554fcb6f Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 25 Dec 2012 01:34:35 +0400
Subject: [PATCH] Rendering variance when type parameter is reified.

---
 .../jet/renderer/DescriptorRendererImpl.java         | 12 +++++-------
 compiler/testData/renderer/Classes.kt                |  8 +++++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
index 08ae12cd6b6..60439e7a9ec 100644
--- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
@@ -313,15 +313,13 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
             builder.append(lt());
         }
 
-        if (!descriptor.isReified()) {
-            String variance = descriptor.getVariance().toString();
-            if (!variance.isEmpty()) {
-                builder.append(renderKeyword(variance)).append(" ");
-            }
-        }
-        else {
+        if (descriptor.isReified()) {
             builder.append(renderKeyword("reified")).append(" ");
         }
+        String variance = descriptor.getVariance().toString();
+        if (!variance.isEmpty()) {
+            builder.append(renderKeyword(variance)).append(" ");
+        }
         renderName(descriptor, builder);
         if (descriptor.getUpperBounds().size() == 1) {
             JetType upperBound = descriptor.getUpperBounds().iterator().next();
diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt
index d6f3342ac84..0960dc6f2e9 100644
--- a/compiler/testData/renderer/Classes.kt
+++ b/compiler/testData/renderer/Classes.kt
@@ -24,6 +24,8 @@ trait TheTrait {
   }
 }
 
+public class WithReified<reified A, reified out B>
+
 //package rendererTest defined in root package
 //internal final annotation class TheAnnotation : jet.Annotation defined in rendererTest
 //public ctor TheAnnotation() defined in rendererTest.TheAnnotation
@@ -42,4 +44,8 @@ trait TheTrait {
 //internal abstract fun abstractFun() : Unit defined in rendererTest.TheTrait
 //class object : rendererTest.TheClass<jet.Int, jet.Int> defined in rendererTest.TheTrait
 //private ctor <class-object-for-TheTrait>() defined in rendererTest.TheTrait.<class-object-for-TheTrait>
-//internal final fun classObjectFunction() : jet.Int defined in rendererTest.TheTrait.<class-object-for-TheTrait>
\ No newline at end of file
+//internal final fun classObjectFunction() : jet.Int defined in rendererTest.TheTrait.<class-object-for-TheTrait>
+//public final class WithReified<reified A, reified out B> defined in rendererTest
+//public ctor WithReified<reified A, reified out B>() defined in rendererTest.WithReified
+//<reified A> defined in rendererTest.WithReified
+//<reified out B> defined in rendererTest.WithReified
\ No newline at end of file