diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
index 0e8a1e60029..a4bb1c5feac 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
@@ -305,7 +305,7 @@ public class DefaultErrorMessages {
MAP.put(TYPE_MISMATCH_IN_CONDITION, "Condition must be of type jet.Boolean, but is of type {0}", RENDER_TYPE);
MAP.put(TYPE_MISMATCH_IN_TUPLE_PATTERN, "Type mismatch: subject is of type {0} but the pattern is of type Tuple{1}", RENDER_TYPE,
TO_STRING); // TODO: message
- MAP.put(TYPE_MISMATCH_IN_BINDING_PATTERN, "{0} must be a supertype of {1}. Use 'is' to match against {0}", RENDER_TYPE, RENDER_TYPE);
+ MAP.put(TYPE_MISMATCH_IN_BINDING_PATTERN, "{0} is not a supertype of {1}. Use ''is'' to match against {0}", RENDER_TYPE, RENDER_TYPE);
MAP.put(INCOMPATIBLE_TYPES, "Incompatible types: {0} and {1}", RENDER_TYPE, RENDER_TYPE);
MAP.put(EXPECTED_CONDITION, "Expected condition of Boolean type");
diff --git a/idea/testData/checker/infos/Autocasts.jet b/idea/testData/checker/infos/Autocasts.jet
index b665d066470..75c9df003e7 100644
--- a/idea/testData/checker/infos/Autocasts.jet
+++ b/idea/testData/checker/infos/Autocasts.jet
@@ -66,7 +66,7 @@ fun f12(a : A?) {
is A -> a.foo()
is Any -> a.foo();
is Any? -> a.bar()
- is val c : B -> c.foo()
+ is val c : B -> c.foo()
is val c is C -> c.bar()
is val c is C -> a.bar()
else -> a?.foo()
@@ -237,17 +237,17 @@ fun mergeAutocasts(a: Any?) {
fun f(): String {
var a: Any = 11
if (a is String) {
- val i: String = a
- a.compareTo("f")
- val f: Function0 = { a }
- return a
+ val i: String = a
+ a.compareTo("f")
+ val f: Function0 = { a }
+ return a
}
return ""
}
fun foo(var a: Any): Int {
if (a is Int) {
- return a
+ return a
}
return 1
}