-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10216 from Microsoft/structurallyIdenticalInstanceof
Improve instanceof with structurally identical types
- Loading branch information
Showing
7 changed files
with
664 additions
and
13 deletions.
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
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
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
172 changes: 172 additions & 0 deletions
172
tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
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,172 @@ | ||
| //// [instanceofWithStructurallyIdenticalTypes.ts] | ||
| // Repro from #7271 | ||
|
|
||
| class C1 { item: string } | ||
| class C2 { item: string[] } | ||
| class C3 { item: string } | ||
|
|
||
| function foo1(x: C1 | C2 | C3): string { | ||
| if (x instanceof C1) { | ||
| return x.item; | ||
| } | ||
| else if (x instanceof C2) { | ||
| return x.item[0]; | ||
| } | ||
| else if (x instanceof C3) { | ||
| return x.item; | ||
| } | ||
| return "error"; | ||
| } | ||
|
|
||
| function isC1(c: C1 | C2 | C3): c is C1 { return c instanceof C1 } | ||
| function isC2(c: C1 | C2 | C3): c is C2 { return c instanceof C2 } | ||
| function isC3(c: C1 | C2 | C3): c is C3 { return c instanceof C3 } | ||
|
|
||
| function foo2(x: C1 | C2 | C3): string { | ||
| if (isC1(x)) { | ||
| return x.item; | ||
| } | ||
| else if (isC2(x)) { | ||
| return x.item[0]; | ||
| } | ||
| else if (isC3(x)) { | ||
| return x.item; | ||
| } | ||
| return "error"; | ||
| } | ||
|
|
||
| // More tests | ||
|
|
||
| class A { a: string } | ||
| class A1 extends A { } | ||
| class A2 { a: string } | ||
| class B extends A { b: string } | ||
|
|
||
| function goo(x: A) { | ||
| if (x instanceof A) { | ||
| x; // A | ||
| } | ||
| else { | ||
| x; // never | ||
| } | ||
| if (x instanceof A1) { | ||
| x; // A1 | ||
| } | ||
| else { | ||
| x; // A | ||
| } | ||
| if (x instanceof A2) { | ||
| x; // A2 | ||
| } | ||
| else { | ||
| x; // A | ||
| } | ||
| if (x instanceof B) { | ||
| x; // B | ||
| } | ||
| else { | ||
| x; // A | ||
| } | ||
| } | ||
|
|
||
|
|
||
| //// [instanceofWithStructurallyIdenticalTypes.js] | ||
| // Repro from #7271 | ||
| var __extends = (this && this.__extends) || function (d, b) { | ||
| for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; | ||
| function __() { this.constructor = d; } | ||
| d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); | ||
| }; | ||
| var C1 = (function () { | ||
| function C1() { | ||
| } | ||
| return C1; | ||
| }()); | ||
| var C2 = (function () { | ||
| function C2() { | ||
| } | ||
| return C2; | ||
| }()); | ||
| var C3 = (function () { | ||
| function C3() { | ||
| } | ||
| return C3; | ||
| }()); | ||
| function foo1(x) { | ||
| if (x instanceof C1) { | ||
| return x.item; | ||
| } | ||
| else if (x instanceof C2) { | ||
| return x.item[0]; | ||
| } | ||
| else if (x instanceof C3) { | ||
| return x.item; | ||
| } | ||
| return "error"; | ||
| } | ||
| function isC1(c) { return c instanceof C1; } | ||
| function isC2(c) { return c instanceof C2; } | ||
| function isC3(c) { return c instanceof C3; } | ||
| function foo2(x) { | ||
| if (isC1(x)) { | ||
| return x.item; | ||
| } | ||
| else if (isC2(x)) { | ||
| return x.item[0]; | ||
| } | ||
| else if (isC3(x)) { | ||
| return x.item; | ||
| } | ||
| return "error"; | ||
| } | ||
| // More tests | ||
| var A = (function () { | ||
| function A() { | ||
| } | ||
| return A; | ||
| }()); | ||
| var A1 = (function (_super) { | ||
| __extends(A1, _super); | ||
| function A1() { | ||
| _super.apply(this, arguments); | ||
| } | ||
| return A1; | ||
| }(A)); | ||
| var A2 = (function () { | ||
| function A2() { | ||
| } | ||
| return A2; | ||
| }()); | ||
| var B = (function (_super) { | ||
| __extends(B, _super); | ||
| function B() { | ||
| _super.apply(this, arguments); | ||
| } | ||
| return B; | ||
| }(A)); | ||
| function goo(x) { | ||
| if (x instanceof A) { | ||
| x; // A | ||
| } | ||
| else { | ||
| x; // never | ||
| } | ||
| if (x instanceof A1) { | ||
| x; // A1 | ||
| } | ||
| else { | ||
| x; // A | ||
| } | ||
| if (x instanceof A2) { | ||
| x; // A2 | ||
| } | ||
| else { | ||
| x; // A | ||
| } | ||
| if (x instanceof B) { | ||
| x; // B | ||
| } | ||
| else { | ||
| x; // A | ||
| } | ||
| } |
Oops, something went wrong.