-
Notifications
You must be signed in to change notification settings - Fork 12.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Exclude enum/number compatibility rule from comparable relation (#42472)
* Exclude old number/enum literal compatibility rule from comparable relation * Add tests * Accept new baselines
- Loading branch information
1 parent
ba56fca
commit f918bd9
Showing
6 changed files
with
373 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
tests/baselines/reference/equalityWithEnumTypes.errors.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
tests/cases/conformance/types/typeRelationships/comparable/equalityWithEnumTypes.ts(14,9): error TS2367: This condition will always return 'true' since the types 'E1' and '0' have no overlap. | ||
tests/cases/conformance/types/typeRelationships/comparable/equalityWithEnumTypes.ts(23,9): error TS2367: This condition will always return 'true' since the types 'E1' and '3' have no overlap. | ||
|
||
|
||
==== tests/cases/conformance/types/typeRelationships/comparable/equalityWithEnumTypes.ts (2 errors) ==== | ||
// Literal enum type | ||
enum E1 { | ||
a = 1, | ||
b = 2, | ||
} | ||
|
||
// Numeric enum type | ||
enum E2 { | ||
a = 1 << 0, | ||
b = 1 << 1 | ||
} | ||
|
||
function f1(v: E1) { | ||
if (v !== 0) { // Error | ||
~~~~~~~ | ||
!!! error TS2367: This condition will always return 'true' since the types 'E1' and '0' have no overlap. | ||
v; | ||
} | ||
if (v !== 1) { | ||
v; | ||
} | ||
if (v !== 2) { | ||
v; | ||
} | ||
if (v !== 3) { // Error | ||
~~~~~~~ | ||
!!! error TS2367: This condition will always return 'true' since the types 'E1' and '3' have no overlap. | ||
v; | ||
} | ||
} | ||
|
||
function f2(v: E2) { | ||
if (v !== 0) { | ||
v; | ||
} | ||
if (v !== 1) { | ||
v; | ||
} | ||
if (v !== 2) { | ||
v; | ||
} | ||
if (v !== 3) { | ||
v; | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
//// [equalityWithEnumTypes.ts] | ||
// Literal enum type | ||
enum E1 { | ||
a = 1, | ||
b = 2, | ||
} | ||
|
||
// Numeric enum type | ||
enum E2 { | ||
a = 1 << 0, | ||
b = 1 << 1 | ||
} | ||
|
||
function f1(v: E1) { | ||
if (v !== 0) { // Error | ||
v; | ||
} | ||
if (v !== 1) { | ||
v; | ||
} | ||
if (v !== 2) { | ||
v; | ||
} | ||
if (v !== 3) { // Error | ||
v; | ||
} | ||
} | ||
|
||
function f2(v: E2) { | ||
if (v !== 0) { | ||
v; | ||
} | ||
if (v !== 1) { | ||
v; | ||
} | ||
if (v !== 2) { | ||
v; | ||
} | ||
if (v !== 3) { | ||
v; | ||
} | ||
} | ||
|
||
|
||
//// [equalityWithEnumTypes.js] | ||
"use strict"; | ||
// Literal enum type | ||
var E1; | ||
(function (E1) { | ||
E1[E1["a"] = 1] = "a"; | ||
E1[E1["b"] = 2] = "b"; | ||
})(E1 || (E1 = {})); | ||
// Numeric enum type | ||
var E2; | ||
(function (E2) { | ||
E2[E2["a"] = 1] = "a"; | ||
E2[E2["b"] = 2] = "b"; | ||
})(E2 || (E2 = {})); | ||
function f1(v) { | ||
if (v !== 0) { // Error | ||
v; | ||
} | ||
if (v !== 1) { | ||
v; | ||
} | ||
if (v !== 2) { | ||
v; | ||
} | ||
if (v !== 3) { // Error | ||
v; | ||
} | ||
} | ||
function f2(v) { | ||
if (v !== 0) { | ||
v; | ||
} | ||
if (v !== 1) { | ||
v; | ||
} | ||
if (v !== 2) { | ||
v; | ||
} | ||
if (v !== 3) { | ||
v; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
=== tests/cases/conformance/types/typeRelationships/comparable/equalityWithEnumTypes.ts === | ||
// Literal enum type | ||
enum E1 { | ||
>E1 : Symbol(E1, Decl(equalityWithEnumTypes.ts, 0, 0)) | ||
|
||
a = 1, | ||
>a : Symbol(E1.a, Decl(equalityWithEnumTypes.ts, 1, 9)) | ||
|
||
b = 2, | ||
>b : Symbol(E1.b, Decl(equalityWithEnumTypes.ts, 2, 10)) | ||
} | ||
|
||
// Numeric enum type | ||
enum E2 { | ||
>E2 : Symbol(E2, Decl(equalityWithEnumTypes.ts, 4, 1)) | ||
|
||
a = 1 << 0, | ||
>a : Symbol(E2.a, Decl(equalityWithEnumTypes.ts, 7, 9)) | ||
|
||
b = 1 << 1 | ||
>b : Symbol(E2.b, Decl(equalityWithEnumTypes.ts, 8, 15)) | ||
} | ||
|
||
function f1(v: E1) { | ||
>f1 : Symbol(f1, Decl(equalityWithEnumTypes.ts, 10, 1)) | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 12, 12)) | ||
>E1 : Symbol(E1, Decl(equalityWithEnumTypes.ts, 0, 0)) | ||
|
||
if (v !== 0) { // Error | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 12, 12)) | ||
|
||
v; | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 12, 12)) | ||
} | ||
if (v !== 1) { | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 12, 12)) | ||
|
||
v; | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 12, 12)) | ||
} | ||
if (v !== 2) { | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 12, 12)) | ||
|
||
v; | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 12, 12)) | ||
} | ||
if (v !== 3) { // Error | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 12, 12)) | ||
|
||
v; | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 12, 12)) | ||
} | ||
} | ||
|
||
function f2(v: E2) { | ||
>f2 : Symbol(f2, Decl(equalityWithEnumTypes.ts, 25, 1)) | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 27, 12)) | ||
>E2 : Symbol(E2, Decl(equalityWithEnumTypes.ts, 4, 1)) | ||
|
||
if (v !== 0) { | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 27, 12)) | ||
|
||
v; | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 27, 12)) | ||
} | ||
if (v !== 1) { | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 27, 12)) | ||
|
||
v; | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 27, 12)) | ||
} | ||
if (v !== 2) { | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 27, 12)) | ||
|
||
v; | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 27, 12)) | ||
} | ||
if (v !== 3) { | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 27, 12)) | ||
|
||
v; | ||
>v : Symbol(v, Decl(equalityWithEnumTypes.ts, 27, 12)) | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
=== tests/cases/conformance/types/typeRelationships/comparable/equalityWithEnumTypes.ts === | ||
// Literal enum type | ||
enum E1 { | ||
>E1 : E1 | ||
|
||
a = 1, | ||
>a : E1.a | ||
>1 : 1 | ||
|
||
b = 2, | ||
>b : E1.b | ||
>2 : 2 | ||
} | ||
|
||
// Numeric enum type | ||
enum E2 { | ||
>E2 : E2 | ||
|
||
a = 1 << 0, | ||
>a : E2 | ||
>1 << 0 : number | ||
>1 : 1 | ||
>0 : 0 | ||
|
||
b = 1 << 1 | ||
>b : E2 | ||
>1 << 1 : number | ||
>1 : 1 | ||
>1 : 1 | ||
} | ||
|
||
function f1(v: E1) { | ||
>f1 : (v: E1) => void | ||
>v : E1 | ||
|
||
if (v !== 0) { // Error | ||
>v !== 0 : boolean | ||
>v : E1 | ||
>0 : 0 | ||
|
||
v; | ||
>v : E1 | ||
} | ||
if (v !== 1) { | ||
>v !== 1 : boolean | ||
>v : E1 | ||
>1 : 1 | ||
|
||
v; | ||
>v : E1.b | ||
} | ||
if (v !== 2) { | ||
>v !== 2 : boolean | ||
>v : E1 | ||
>2 : 2 | ||
|
||
v; | ||
>v : E1.a | ||
} | ||
if (v !== 3) { // Error | ||
>v !== 3 : boolean | ||
>v : E1 | ||
>3 : 3 | ||
|
||
v; | ||
>v : E1 | ||
} | ||
} | ||
|
||
function f2(v: E2) { | ||
>f2 : (v: E2) => void | ||
>v : E2 | ||
|
||
if (v !== 0) { | ||
>v !== 0 : boolean | ||
>v : E2 | ||
>0 : 0 | ||
|
||
v; | ||
>v : E2 | ||
} | ||
if (v !== 1) { | ||
>v !== 1 : boolean | ||
>v : E2 | ||
>1 : 1 | ||
|
||
v; | ||
>v : E2 | ||
} | ||
if (v !== 2) { | ||
>v !== 2 : boolean | ||
>v : E2 | ||
>2 : 2 | ||
|
||
v; | ||
>v : E2 | ||
} | ||
if (v !== 3) { | ||
>v !== 3 : boolean | ||
>v : E2 | ||
>3 : 3 | ||
|
||
v; | ||
>v : E2 | ||
} | ||
} | ||
|
43 changes: 43 additions & 0 deletions
43
tests/cases/conformance/types/typeRelationships/comparable/equalityWithEnumTypes.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
// @strict: true | ||
|
||
// Literal enum type | ||
enum E1 { | ||
a = 1, | ||
b = 2, | ||
} | ||
|
||
// Numeric enum type | ||
enum E2 { | ||
a = 1 << 0, | ||
b = 1 << 1 | ||
} | ||
|
||
function f1(v: E1) { | ||
if (v !== 0) { // Error | ||
v; | ||
} | ||
if (v !== 1) { | ||
v; | ||
} | ||
if (v !== 2) { | ||
v; | ||
} | ||
if (v !== 3) { // Error | ||
v; | ||
} | ||
} | ||
|
||
function f2(v: E2) { | ||
if (v !== 0) { | ||
v; | ||
} | ||
if (v !== 1) { | ||
v; | ||
} | ||
if (v !== 2) { | ||
v; | ||
} | ||
if (v !== 3) { | ||
v; | ||
} | ||
} |