Skip to content

Remove empty intersection types in union types #18438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahejlsberg merged 6 commits into from
Sep 14, 2017
Merged

Remove empty intersection types in union types #18438

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4885560
Eliminate intersections of unit types in union types
ahejlsberg Sep 7, 2017
6c2fe29
Accept new baselines
ahejlsberg Sep 11, 2017
78f4cbe
Add tests
ahejlsberg Sep 13, 2017
c64beb9
Remove intersections of object and nullable types from union types
ahejlsberg Sep 13, 2017
0ac942f
Update test
ahejlsberg Sep 13, 2017
b20d631
Accept new baselines
ahejlsberg Sep 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Accept new baselines
  • Loading branch information
@ahejlsberg
ahejlsberg committed Sep 13, 2017
commit b20d631ba235ae176d12fe95006535b637357e01
2 changes: 1 addition & 1 deletion tests/baselines/reference/restUnion2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ declare const nullAndUndefinedUnion: null | undefined;
var rest4: { };
var {...rest4 } = nullAndUndefinedUnion;

declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined;
var rest5: { n: number, s: string };
var {...rest5 } = unionWithIntersection;

Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/restUnion2.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var {...rest4 } = nullAndUndefinedUnion;
>rest4 : Symbol(rest4, Decl(restUnion2.ts, 11, 3), Decl(restUnion2.ts, 12, 5))
>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(restUnion2.ts, 10, 13))

declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined;
>unionWithIntersection : Symbol(unionWithIntersection, Decl(restUnion2.ts, 14, 13))
>n : Symbol(n, Decl(restUnion2.ts, 14, 39))
>s : Symbol(s, Decl(restUnion2.ts, 14, 55))
Expand Down
7 changes: 3 additions & 4 deletions tests/baselines/reference/restUnion2.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@ var {...rest4 } = nullAndUndefinedUnion;
>rest4 : {}
>nullAndUndefinedUnion : null | undefined

declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
>unionWithIntersection : ({ n: number; } & { s: string; } & undefined) | null
declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined;
>unionWithIntersection : { n: number; } & { s: string; } & undefined
>n : number
>s : string
>null : null

var rest5: { n: number, s: string };
>rest5 : { n: number; s: string; }
Expand All @@ -50,5 +49,5 @@ var rest5: { n: number, s: string };

var {...rest5 } = unionWithIntersection;
>rest5 : { n: number; s: string; }
>unionWithIntersection : ({ n: number; } & { s: string; } & undefined) | null
>unionWithIntersection : { n: number; } & { s: string; } & undefined