Updated error message.

DanielRosenwasser · DanielRosenwasser · commit e224083038b1 · 2015-11-03T17:17:53.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -4832,7 +4832,14 @@ namespace ts {
                     sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType);
                     targetType = typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType);
                 }
-                reportError(message || Diagnostics.Type_0_is_not_assignable_to_type_1, sourceType, targetType);
+                
+                if (!message) {
+                    message = relation === comparableRelation ?
+                        Diagnostics.Type_0_is_not_comparable_with_type_1 :
+                        Diagnostics.Type_0_is_not_assignable_to_type_1
+                }
+                
+                reportError(message, sourceType, targetType);
             }
 
             // Compare two types and return
@@ -9411,7 +9418,7 @@ namespace ts {
                 let widenedType = getWidenedType(exprType);
 
                 if (!isTypeComparableTo(targetType, widenedType)) {
-                    checkTypeComparableTo(exprType, targetType, node, Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
+                    checkTypeComparableTo(exprType, targetType, node);
                 }
             }
             return targetType;
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -888,6 +888,10 @@
         "category": "Error",
         "code": 2322
     },
+    "Type '{0}' is not comparable with type '{1}'.": {
+        "category": "Error",
+        "code": 2323
+    },
     "Property '{0}' is missing in type '{1}'.": {
         "category": "Error",
         "code": 2324
@@ -996,10 +1000,6 @@
         "category": "Error",
         "code": 2351
     },
-    "Neither type '{0}' nor type '{1}' is assignable to the other.": {
-        "category": "Error",
-        "code": 2352
-    },
     "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'.": {
         "category": "Error",
         "code": 2353

Original file line number	Diff line number	Diff line change
`@@ -4832,7 +4832,14 @@ namespace ts {`
`4832`	`4832`	`sourceType = typeToString(source, /enclosingDeclaration/ undefined, TypeFormatFlags.UseFullyQualifiedType);`
`4833`	`4833`	`targetType = typeToString(target, /enclosingDeclaration/ undefined, TypeFormatFlags.UseFullyQualifiedType);`
`4834`	`4834`	`}`
`4835`		`- reportError(message \|\| Diagnostics.Type_0_is_not_assignable_to_type_1, sourceType, targetType);`
	`4835`	`+`
	`4836`	`+ if (!message) {`
	`4837`	`+ message = relation === comparableRelation ?`
	`4838`	`+ Diagnostics.Type_0_is_not_comparable_with_type_1 :`
	`4839`	`+ Diagnostics.Type_0_is_not_assignable_to_type_1`
	`4840`	`+ }`
	`4841`	`+`
	`4842`	`+ reportError(message, sourceType, targetType);`
`4836`	`4843`	`}`
`4837`	`4844`
`4838`	`4845`	`// Compare two types and return`
`@@ -9411,7 +9418,7 @@ namespace ts {`
`9411`	`9418`	`let widenedType = getWidenedType(exprType);`
`9412`	`9419`
`9413`	`9420`	`if (!isTypeComparableTo(targetType, widenedType)) {`
`9414`		`- checkTypeComparableTo(exprType, targetType, node, Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);`
	`9421`	`+ checkTypeComparableTo(exprType, targetType, node);`
`9415`	`9422`	`}`
`9416`	`9423`	`}`
`9417`	`9424`	`return targetType;`