diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index 4f736ac9a58..30e699c6d96 100644 --- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -473,8 +473,6 @@ public class DescriptorRendererImpl implements DescriptorRenderer { } } } - Collections.sort(upperBoundStrings); // TODO workaround for failing load kotlin test - if (!upperBoundStrings.isEmpty()) { builder.append(" ").append(renderKeyword("where")).append(" "); builder.append(StringUtil.join(upperBoundStrings, ", ")); diff --git a/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt b/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt index fa4c81b594d..46e0bf5df7b 100644 --- a/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt +++ b/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt @@ -2,5 +2,5 @@ package test public open class MissingUpperBound : java.lang.Object { public constructor MissingUpperBound() - public open fun foo() : jet.String? where A : java.lang.Cloneable?, A : java.lang.Runnable? + public open fun foo() : jet.String? where A : java.lang.Runnable?, A : java.lang.Cloneable? } diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt b/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt index d4beb2ffc15..5cce855ca7a 100644 --- a/compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt +++ b/compiler/testData/loadJava/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 foo(/*0*/ p0 : B) : Unit where B : java.lang.Cloneable, B : jet.CharSequence + public abstract override /*1*/ fun foo(/*0*/ p0 : B) : Unit where B : jet.CharSequence, B : java.lang.Cloneable } public trait Super : java.lang.Object { - public abstract fun foo(/*0*/ p0 : A) : Unit where A : java.lang.Cloneable, A : jet.CharSequence + public abstract fun foo(/*0*/ p0 : A) : Unit where A : jet.CharSequence, A : java.lang.Cloneable } } diff --git a/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt index c925bc56975..bb01930c327 100644 --- a/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt +++ b/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt @@ -1,5 +1,5 @@ package test -internal final class Clock where A : java.io.Serializable, A : java.lang.Number { +internal final class Clock where A : java.lang.Number, A : java.io.Serializable { /*primary*/ public constructor Clock() } diff --git a/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt deleted file mode 100644 index fa9ed623134..00000000000 --- a/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt +++ /dev/null @@ -1,3 +0,0 @@ -package test - -class Clock where A : java.io.Serializable, A : java.lang.Number diff --git a/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt deleted file mode 100644 index c925bc56975..00000000000 --- a/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -internal final class Clock where A : java.io.Serializable, A : java.lang.Number { - /*primary*/ public constructor Clock() -} diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt index 58918918e48..b76ba474dfd 100644 --- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt +++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt @@ -1,6 +1,6 @@ package test -internal fun foo() : Unit where T : test.Bar, T : test.Foo +internal fun foo() : Unit where T : test.Foo, T : test.Bar internal trait Bar { } diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt index 0b199d58097..25fcd475030 100644 --- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt +++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt @@ -1,3 +1,3 @@ package test -internal fun tres() : jet.Int where A : java.io.Serializable, A : java.lang.Number +internal fun tres() : jet.Int where A : java.lang.Number, A : java.io.Serializable diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt deleted file mode 100644 index 74d650134c5..00000000000 --- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt +++ /dev/null @@ -1,3 +0,0 @@ -package test - -fun cuatro() where A : java.io.Serializable, A : java.lang.Number = 1 diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt deleted file mode 100644 index da68bf14cab..00000000000 --- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt +++ /dev/null @@ -1,3 +0,0 @@ -package test - -internal fun cuatro() : jet.Int where A : java.io.Serializable, A : java.lang.Number diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt index 881bfa442c8..a49fe87ad17 100644 --- a/compiler/testData/renderer/Classes.kt +++ b/compiler/testData/renderer/Classes.kt @@ -51,5 +51,5 @@ public trait TwoUpperBounds where T: Number, T: Any //public constructor WithReified() defined in rendererTest.WithReified // defined in rendererTest.WithReified // defined in rendererTest.WithReified -//public trait TwoUpperBounds where T : jet.Any, T : jet.Number defined in rendererTest +//public trait TwoUpperBounds where T : jet.Number, T : jet.Any defined in rendererTest // defined in rendererTest.TwoUpperBounds diff --git a/compiler/testData/renderer/GlobalFunctions.kt b/compiler/testData/renderer/GlobalFunctions.kt index 64aef977dd1..88de33deb0b 100644 --- a/compiler/testData/renderer/GlobalFunctions.kt +++ b/compiler/testData/renderer/GlobalFunctions.kt @@ -33,6 +33,6 @@ deprecated("") fun deprecatedFun() //value-parameter val a : jet.Array defined in rendererTest.withTypeParam //internal trait Foo defined in rendererTest //internal trait Bar defined in rendererTest -//internal fun

funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Bar, P : rendererTest.Foo defined in rendererTest +//internal fun

funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Foo, P : rendererTest.Bar defined in rendererTest //

defined in rendererTest.funTypeParameterWithTwoUpperBounds //jet.deprecated internal fun deprecatedFun() : Unit defined in rendererTest diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java index 09971468640..934dd5f4b99 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java @@ -95,11 +95,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT doTest("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.kt"); } - @TestMetadata("ClassParamUpperInterfaceClassBound.kt") - public void testClassParamUpperInterfaceClassBound() throws Exception { - doTest("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt"); - } - @TestMetadata("ClassTwoParams.kt") public void testClassTwoParams() throws Exception { doTest("compiler/testData/loadKotlin/class/ClassTwoParams.kt"); @@ -417,11 +412,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); } - @TestMetadata("FunParamUpperInterfaceClassBound.kt") - public void testFunParamUpperInterfaceClassBound() throws Exception { - doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt"); - } - @TestMetadata("FunParamVaragParam.kt") public void testFunParamVaragParam() throws Exception { doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index d1f6fbc09e8..cfa0c74362a 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -97,11 +97,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.kt"); } - @TestMetadata("ClassParamUpperInterfaceClassBound.kt") - public void testClassParamUpperInterfaceClassBound() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt"); - } - @TestMetadata("ClassTwoParams.kt") public void testClassTwoParams() throws Exception { doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/ClassTwoParams.kt"); @@ -419,11 +414,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); } - @TestMetadata("FunParamUpperInterfaceClassBound.kt") - public void testFunParamUpperInterfaceClassBound() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt"); - } - @TestMetadata("FunParamVaragParam.kt") public void testFunParamVaragParam() throws Exception { doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); @@ -1816,9 +1806,9 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/lazyResolve/namespaceComparator"), "kt", true); } - @TestMetadata("classObject.kt") + @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/classObject.kt"); + doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/ClassObject.kt"); } @TestMetadata("classObjectAnnotation.kt") diff --git a/idea/testData/diagnosticMessage/conflictingSubstitutions1.html b/idea/testData/diagnosticMessage/conflictingSubstitutions1.html index 7bed579e118..d4856e6bdf5 100644 --- a/idea/testData/diagnosticMessage/conflictingSubstitutions1.html +++ b/idea/testData/diagnosticMessage/conflictingSubstitutions1.html @@ -22,7 +22,7 @@ t : T : Unit where - E : java.io.Closeable, E : java.lang.Cloneable + E : java.lang.Cloneable, E : java.io.Closeable