diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java index 94f9b7dec9c..eea900ad450 100644 --- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java @@ -599,7 +599,7 @@ public class DescriptorRenderer implements Renderer { renderName(descriptor, builder); if (descriptor.getUpperBounds().size() == 1) { JetType upperBound = descriptor.getUpperBounds().iterator().next(); - if (upperBound != KotlinBuiltIns.getInstance().getDefaultBound()) { + if (!KotlinBuiltIns.getInstance().getDefaultBound().equals(upperBound)) { builder.append(" : ").append(renderType(upperBound)); } } diff --git a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java index f2a0422fb77..42b900d61c3 100644 --- a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java @@ -43,12 +43,12 @@ public class BoundsSubstitutorTest extends KotlinTestWithEnvironment { public void testSimpleSubstitution() throws Exception { doTest("fun f(l: List): T", - "fun f(l : jet.List) : jet.Any?"); + "fun f(l : jet.List) : jet.Any?"); } public void testParameterInBound() throws Exception { doTest("fun > f(l: List): R", - "fun > f(l : jet.List>) : jet.List"); + "fun > f(l : jet.List>) : jet.List"); } public void testWithWhere() throws Exception { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index 0294282dc3b..c4d6ff36c71 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -176,7 +176,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns boolean firstUpperBound = true; for (JetType upperBound : upperBounds) { String upperBoundText = " : " + renderType(upperBound); - if (upperBound != KotlinBuiltIns.getInstance().getDefaultBound()) { + if (!KotlinBuiltIns.getInstance().getDefaultBound().equals(upperBound)) { if (firstUpperBound) { bodyBuilder.append(upperBoundText); } else { diff --git a/idea/testData/libraries/decompiled/namespace.kt b/idea/testData/libraries/decompiled/namespace.kt index e7811bb88af..5baf0dad8fd 100644 --- a/idea/testData/libraries/decompiled/namespace.kt +++ b/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 testData.libraries.Pair.exProp : jet.String] /* compiled code */ +[public final val testData.libraries.Pair.exProp : jet.String] /* compiled code */ [public final val globalVal : testData.libraries.Pair] /* compiled code */ @@ -23,4 +23,4 @@ package testData.libraries [public final fun main(args : jet.Array) : Unit { /* compiled code */ }] -[public final fun T.filter(predicate : (T) -> jet.Boolean) : T? { /* compiled code */ }] +[public final fun T.filter(predicate : (T) -> jet.Boolean) : T? { /* compiled code */ }]