Adjusted tests to the new DescriptorRenderer behaviour

compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParametersWithBounds.txt

@@ -1,7 +1,7 @@
 package test
 
-public /*synthesized*/ fun </*0*/ A, /*1*/ B : jet.List<A>?> GenericInterfaceParametersWithBounds(/*0*/ function : (jet.Array<out A>?, B?) -> jet.Unit) : test.GenericInterfaceParametersWithBounds<A, B> where A : jet.Comparable<A>?, A : java.lang.Cloneable?
+public /*synthesized*/ fun </*0*/ A : jet.Comparable<A>?, /*1*/ B : jet.List<A>?> GenericInterfaceParametersWithBounds(/*0*/ function: (jet.Array<out A>?, B?) -> jet.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : java.lang.Cloneable?
 
-public trait GenericInterfaceParametersWithBounds</*0*/ A, /*1*/ B : jet.List<A>?> : java.lang.Object where A : jet.Comparable<A>?, A : java.lang.Cloneable? {
+public trait GenericInterfaceParametersWithBounds</*0*/ A : jet.Comparable<A>?, /*1*/ B : jet.List<A>?> : java.lang.Object where A : java.lang.Cloneable? {
     public abstract fun method(/*0*/ p0: jet.Array<out A>?, /*1*/ p1: B?): jet.Unit
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt

@@ -2,5 +2,5 @@ package test
 
 public open class MethodTypePTwoUpperBounds : java.lang.Object {
     public constructor MethodTypePTwoUpperBounds()
-    public open fun </*0*/ T> foo() : jet.Unit where T : java.lang.Cloneable?, T : java.lang.Runnable?
+    public open fun </*0*/ T : java.lang.Cloneable?> foo(): jet.Unit where T : java.lang.Runnable?
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt

@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithTypeParameters : java.lang.Object {
     public constructor MethodWithTypeParameters()
-    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A, /*1*/ p1 : jet.List<B>, /*2*/ p2 : jet.MutableList<in jet.String?>) : jet.Unit where B : java.lang.Runnable, B : jet.List<java.lang.Cloneable>
+    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable> foo(/*0*/ p0: A, /*1*/ p1: jet.List<B>, /*2*/ p2: jet.MutableList<in jet.String?>): jet.Unit where B : jet.List<java.lang.Cloneable>
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.txt

@@ -2,5 +2,5 @@ package test
 
 public open class MissingUpperBound : java.lang.Object {
     public constructor MissingUpperBound()
-    public open fun </*0*/ A> foo() : jet.String? where A : java.lang.Runnable?, A : java.lang.Cloneable?
+    public open fun </*0*/ A : java.lang.Runnable?> foo(): jet.String? where A : java.lang.Cloneable?
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt

@@ -2,5 +2,5 @@ package test
 
 public open class WrongTypeParameterBoundStructure1 : java.lang.Object {
     public constructor WrongTypeParameterBoundStructure1()
-    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : jet.Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
+    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable?> foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Unit where B : jet.List<java.lang.Cloneable>?
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt

@@ -2,5 +2,5 @@ package test
 
 public open class WrongTypeParameterBoundStructure2 : java.lang.Object {
     public constructor WrongTypeParameterBoundStructure2()
-    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : jet.Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
+    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable?> foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Unit where B : jet.List<java.lang.Cloneable>?
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt

@@ -3,10 +3,10 @@ package test
 public trait TwoBounds : java.lang.Object {
     
     public trait Sub : test.TwoBounds.Super {
-        public abstract override /*1*/ fun </*0*/ B> foo(/*0*/ p0 : B) : jet.Unit where B : jet.CharSequence, B : java.lang.Cloneable
+        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence> foo(/*0*/ p0: B): jet.Unit where B : java.lang.Cloneable
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun </*0*/ A> foo(/*0*/ p0 : A) : jet.Unit where A : jet.CharSequence, A : java.lang.Cloneable
+        public abstract fun </*0*/ A : jet.CharSequence> foo(/*0*/ p0: A): jet.Unit where A : java.lang.Cloneable
     }
 }

compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt

@@ -1,5 +1,5 @@
 package test
 
-internal final class Clock</*0*/ A> where A : java.lang.Number, A : java.io.Serializable {
+internal final class Clock</*0*/ A : java.lang.Number> where A : java.io.Serializable {
-    /*primary*/ public constructor Clock</*0*/ A>()
+    /*primary*/ public constructor Clock</*0*/ A : java.lang.Number>() where A : java.io.Serializable
 }

compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt

@@ -1,6 +1,6 @@
 package test
 
-internal fun </*0*/ T> foo() : jet.Unit where T : test.Foo, T : test.Bar
+internal fun </*0*/ T : test.Foo> foo(): jet.Unit where T : test.Bar
 
 internal trait Bar {
 }

compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt

@@ -1,3 +1,3 @@
 package test
 
-internal fun </*0*/ A> tres() : jet.Int where A : java.lang.Number, A : java.io.Serializable
+internal fun </*0*/ A : java.lang.Number> tres(): jet.Int where A : java.io.Serializable

compiler/testData/renderer/Classes.kt

@@ -51,5 +51,5 @@ public trait TwoUpperBounds<T> where T: Number, T: Any
 //public constructor WithReified<reified A, reified out B>() defined in rendererTest.WithReified
 //<reified A> defined in rendererTest.WithReified
 //<reified out B> defined in rendererTest.WithReified
-//public trait TwoUpperBounds<T> where T : jet.Number, T : jet.Any defined in rendererTest
+//public trait TwoUpperBounds<T : jet.Number> where T : jet.Any defined in rendererTest
 //<T : jet.Number & jet.Any> defined in rendererTest.TwoUpperBounds

compiler/testData/renderer/GlobalFunctions.kt

@@ -33,6 +33,6 @@ deprecated("") fun deprecatedFun()
 //value-parameter val a: jet.Array<T> defined in rendererTest.withTypeParam
 //internal trait Foo defined in rendererTest
 //internal trait Bar defined in rendererTest
-//internal fun <P> funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Foo, P : rendererTest.Bar defined in rendererTest
+//internal fun <P : rendererTest.Foo> funTypeParameterWithTwoUpperBounds(): jet.Int where P : rendererTest.Bar defined in rendererTest
 //<P : rendererTest.Foo & rendererTest.Bar> defined in rendererTest.funTypeParameterWithTwoUpperBounds
 //jet.deprecated internal fun deprecatedFun(): jet.Unit defined in rendererTest

compiler/testData/renderer/GlobalProperties.kt

@@ -24,6 +24,6 @@ get() {}
 //public val jet.Int.ext: jet.Int defined in rendererTest
 //public fun jet.Int.<get-ext>(): jet.Int defined in rendererTest
 //jet.deprecated internal val deprecatedVal: jet.Int defined in rendererTest
-//public val <T> T.extWithTwoUpperBounds : jet.Int where T : jet.CharSequence, T : jet.Number defined in rendererTest
+//public val <T : jet.CharSequence> T.extWithTwoUpperBounds: jet.Int where T : jet.Number defined in rendererTest
 //<T : jet.CharSequence & jet.Number> defined in rendererTest
 //public fun T.<get-extWithTwoUpperBounds>(): jet.Int defined in rendererTest

compiler/testData/renderer/KeywordsInNames.kt

@@ -25,6 +25,6 @@ fun <`in`: `trait`> `trait`.`fun`(`false`: `trait`): `trait` where `in`: Number
 //public constructor `class`() defined in `class`.`class`
 //internal val `is`: `class`.`class` defined in root package
 //internal val `in`: `class`<`trait`> defined in root package
-//internal fun <`in`> `trait`.`fun`(`false` : `trait`) : `trait` where `in` : `trait`, `in` : jet.Number defined in root package
+//internal fun <`in` : `trait`> `trait`.`fun`(`false`: `trait`): `trait` where `in` : jet.Number defined in root package
 //<`in` : `trait` & jet.Number> defined in `fun`
 //value-parameter val `false`: `trait` defined in `fun`

idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after

@@ -4,8 +4,7 @@ trait Trait {
 
 class TraitImpl : Trait {
 
-    override fun <A, B: Runnable, E: Map.Entry<A, B>> foo()
+    override fun <A, B: Runnable, E: Map.Entry<A, B>> foo() where B: Cloneable, B: Comparable<B> {
-            where B: Cloneable, B: Comparable<B> {
         throw UnsupportedOperationException()
     }
 }

idea/testData/diagnosticMessage/conflictingSubstitutions1.html

@@ -9,7 +9,7 @@ T</b>
 <td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;">
 <b>
 fun</b>
- &lt;T, E>
+ &lt;T, E : java.lang.Cloneable>
  writeToMyList</td>
 <td style="white-space:nowrap;font-weight:bold;">
 (</td>
@@ -22,7 +22,7 @@ t : T</td>
 <td style="white-space:nowrap;font-weight:bold;">
 : jet.Unit <b>
 where</b>
- E : java.lang.Cloneable, E : java.io.Closeable</td>
+ E : java.io.Closeable</td>
 </tr>
 <tr>
 <td colspan="8" style="white-space:nowrap;">

idea/testData/quickfix/override/nothingToOverride/afterAddParameterMultiple.kt

@@ -1,5 +1,5 @@
 // "Change function signature..." "true"
-// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>abstract</b> <b>fun</b> f(a: jet.String): jet.Unit <i>defined in</i> A</html>
+// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>internal</b> <b>abstract</b> <b>fun</b> f(a: jet.String): jet.Unit <i>defined in</i> A</html>
 trait A {
     fun f(a: Int)
     fun f(a: String)

idea/testData/quickfix/override/nothingToOverride/beforeAddParameterMultiple.kt

@@ -1,5 +1,5 @@
 // "Change function signature..." "true"
-// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>abstract</b> <b>fun</b> f(a: jet.String): jet.Unit <i>defined in</i> A</html>
+// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>internal</b> <b>abstract</b> <b>fun</b> f(a: jet.String): jet.Unit <i>defined in</i> A</html>
 trait A {
     fun f(a: Int)
     fun f(a: String)

idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverrideAmbiguity.kt

@@ -1,6 +1,6 @@
 // "Change 'B.foo' function return type to 'Int'" "false"
 // "Change 'B.foo' function return type to 'Long'" "false"
-// "Remove explicitly specified return type in 'B.foo' function" "false"
+// "Remove explicitly specified return type" "false"
 // ERROR: <html>Return type is 'jet.String', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>fun</b> foo(): jet.Int <i>defined in</i> A</html>
 abstract class A {
     abstract fun foo() : Int;