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

Added rendering variance for type parameters in DescriptorRenderer.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-19 18:46:45 +04:00
parent 1559f983aa
commit 85ce85383b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+7 -1
View File
@@ -469,7 +469,13 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
} }
protected void renderTypeParameter(TypeParameterDescriptor descriptor, StringBuilder builder) { 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(" "); builder.append(renderKeyword("erased")).append(" ");
} }
renderName(descriptor, builder); renderName(descriptor, builder);
compiler/testData/renderer/Classes.kt
+2 -2
View File
@@ -31,8 +31,8 @@ private enum class TheEnum(val rgb : Int) {
//package rendererTest defined in root package //package rendererTest defined in root package
//internal final annotation class TheAnnotation defined in rendererTest //internal final annotation class TheAnnotation defined in rendererTest
//public open class TheClass<T : jet.Int, X> defined in rendererTest //public open class TheClass<out T : jet.Int, X> defined in rendererTest
//<T : jet.Int> defined in rendererTest.TheClass //<out T : jet.Int> defined in rendererTest.TheClass
//<X> defined in rendererTest.TheClass //<X> defined in rendererTest.TheClass
//private final val privateVal : jet.Int defined in rendererTest.TheClass //private final val privateVal : jet.Int defined in rendererTest.TheClass
//internal final val shouldBeFinal : jet.Int defined in rendererTest.TheClass //internal final val shouldBeFinal : jet.Int defined in rendererTest.TheClass