Merge pull request microsoft#19926 from Microsoft/improvePrimitiveComparable

ahejlsberg · web-flow · commit b8fbf884d0f0 · 2017-11-11T09:15:24.000-08:00
Bidirectional comparable relation for primitive types
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -8907,7 +8907,9 @@ namespace ts {
             if (target.flags & TypeFlags.StringOrNumberLiteral && target.flags & TypeFlags.FreshLiteral) {
                 target = (<LiteralType>target).regularType;
             }
-            if (source === target || relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {
+            if (source === target ||
+                relation === comparableRelation && !(target.flags & TypeFlags.Never) && isSimpleTypeRelatedTo(target, source, relation) ||
+                relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {
                 return true;
             }
             if (source.flags & TypeFlags.Object && target.flags & TypeFlags.Object) {
@@ -9050,7 +9052,8 @@ namespace ts {
                     return isIdenticalTo(source, target);
                 }
 
-                if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined)) return Ternary.True;
+                if (relation === comparableRelation && !(target.flags & TypeFlags.Never) && isSimpleTypeRelatedTo(target, source, relation) ||
+                    isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined)) return Ternary.True;
 
                 if (isObjectLiteralType(source) && source.flags & TypeFlags.FreshLiteral) {
                     if (hasExcessProperties(<FreshObjectLiteralType>source, target, reportErrors)) {
diff --git a/tests/baselines/reference/independentPropertyVariance.js b/tests/baselines/reference/independentPropertyVariance.js
@@ -0,0 +1,13 @@
+//// [independentPropertyVariance.ts]
+// Verify that properties can vary independently in comparable relationship
+
+declare const x: { a: 1, b: string };
+declare const y: { a: number, b: 'a' };
+
+x === y;
+
+
+//// [independentPropertyVariance.js]
+"use strict";
+// Verify that properties can vary independently in comparable relationship
+x === y;
diff --git a/tests/baselines/reference/independentPropertyVariance.symbols b/tests/baselines/reference/independentPropertyVariance.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/conformance/types/typeRelationships/comparable/independentPropertyVariance.ts ===
+// Verify that properties can vary independently in comparable relationship
+
+declare const x: { a: 1, b: string };
+>x : Symbol(x, Decl(independentPropertyVariance.ts, 2, 13))
+>a : Symbol(a, Decl(independentPropertyVariance.ts, 2, 18))
+>b : Symbol(b, Decl(independentPropertyVariance.ts, 2, 24))
+
+declare const y: { a: number, b: 'a' };
+>y : Symbol(y, Decl(independentPropertyVariance.ts, 3, 13))
+>a : Symbol(a, Decl(independentPropertyVariance.ts, 3, 18))
+>b : Symbol(b, Decl(independentPropertyVariance.ts, 3, 29))
+
+x === y;
+>x : Symbol(x, Decl(independentPropertyVariance.ts, 2, 13))
+>y : Symbol(y, Decl(independentPropertyVariance.ts, 3, 13))
+
diff --git a/tests/baselines/reference/independentPropertyVariance.types b/tests/baselines/reference/independentPropertyVariance.types
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/types/typeRelationships/comparable/independentPropertyVariance.ts ===
+// Verify that properties can vary independently in comparable relationship
+
+declare const x: { a: 1, b: string };
+>x : { a: 1; b: string; }
+>a : 1
+>b : string
+
+declare const y: { a: number, b: 'a' };
+>y : { a: number; b: "a"; }
+>a : number
+>b : "a"
+
+x === y;
+>x === y : boolean
+>x : { a: 1; b: string; }
+>y : { a: number; b: "a"; }
+
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/independentPropertyVariance.ts b/tests/cases/conformance/types/typeRelationships/comparable/independentPropertyVariance.ts
@@ -0,0 +1,8 @@
+// @strict: true
+
+// Verify that properties can vary independently in comparable relationship
+
+declare const x: { a: 1, b: string };
+declare const y: { a: number, b: 'a' };
+
+x === y;

Original file line number	Diff line number	Diff line change
`@@ -8907,7 +8907,9 @@ namespace ts {`
`8907`	`8907`	`if (target.flags & TypeFlags.StringOrNumberLiteral && target.flags & TypeFlags.FreshLiteral) {`
`8908`	`8908`	`target = (<LiteralType>target).regularType;`
`8909`	`8909`	`}`
`8910`		`- if (source === target \|\| relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {`
	`8910`	`+ if (source === target \|\|`
	`8911`	`+ relation === comparableRelation && !(target.flags & TypeFlags.Never) && isSimpleTypeRelatedTo(target, source, relation) \|\|`
	`8912`	`+ relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {`
`8911`	`8913`	`return true;`
`8912`	`8914`	`}`
`8913`	`8915`	`if (source.flags & TypeFlags.Object && target.flags & TypeFlags.Object) {`
`@@ -9050,7 +9052,8 @@ namespace ts {`
`9050`	`9052`	`return isIdenticalTo(source, target);`
`9051`	`9053`	`}`
`9052`	`9054`
`9053`		`- if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined)) return Ternary.True;`
	`9055`	`+ if (relation === comparableRelation && !(target.flags & TypeFlags.Never) && isSimpleTypeRelatedTo(target, source, relation) \|\|`
	`9056`	`+ isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined)) return Ternary.True;`
`9054`	`9057`
`9055`	`9058`	`if (isObjectLiteralType(source) && source.flags & TypeFlags.FreshLiteral) {`
`9056`	`9059`	`if (hasExcessProperties(<FreshObjectLiteralType>source, target, reportErrors)) {`