Rendering 'where' for properties.

compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java

@@ -485,7 +485,9 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
             renderValVarPrefix(descriptor, builder);
         }
 
-        renderTypeParameters(descriptor.getTypeParameters(), builder);
+        if (renderTypeParameters(descriptor.getTypeParameters(), builder)) {
+            builder.append(" ");
+        }
 
         ReceiverParameterDescriptor receiver = descriptor.getReceiverParameter();
         if (receiver != null) {
@@ -493,6 +495,8 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
         }
         renderName(descriptor, builder);
         builder.append(" : ").append(escape(renderType(descriptor.getType())));
+
+        renderWhereSuffix(descriptor.getTypeParameters(), builder);
     }
 
 

compiler/testData/renderer/GlobalProperties.kt

@@ -13,6 +13,9 @@ get() {}
 
 deprecated("") val deprecatedVal = 5
 
+public val <T> T.extWithTwoUpperBounds: Int where T: CharSequence, T: Number
+get() {}
+
 //package rendererTest defined in root package
 //public final val pub : jet.String defined in rendererTest
 //internal final var int : jet.String defined in rendererTest
@@ -21,3 +24,6 @@ deprecated("") val deprecatedVal = 5
 //public final val jet.Int.ext : jet.Int defined in rendererTest
 //public final fun jet.Int.<get-ext>() : jet.Int defined in rendererTest
 //jet.deprecated internal final val deprecatedVal : jet.Int defined in rendererTest
+//public final val <T> T.extWithTwoUpperBounds : jet.Int where T : jet.CharSequence, T : jet.Number defined in rendererTest
+//<T : jet.CharSequence & jet.Number> defined in rendererTest
+//public final fun T.<get-extWithTwoUpperBounds>() : jet.Int defined in rendererTest

idea/testData/libraries/decompiled/namespace.kt

@@ -7,7 +7,7 @@ package testData.libraries
 
 [public final val jet.String.exProp : jet.String] /* compiled code */
 
-[public final val <T>testData.libraries.Pair<T, T>.exProp : jet.String] /* compiled code */
+[public final val <T> testData.libraries.Pair<T, T>.exProp : jet.String] /* compiled code */
 
 [public final val globalVal : testData.libraries.Pair<jet.Int, jet.String>] /* compiled code */