-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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.
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
Improve union origin preservation in filtering-unionizing binary expressions #61362
Open
Andarist
wants to merge
1
commit into
microsoft:main
Choose a base branch
from
Andarist:improved-union-origin-preservation-in-binary-expressions
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+189
−10
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
62 changes: 62 additions & 0 deletions
62
tests/baselines/reference/unionBinaryExpressionPreserveOrigin1.symbols
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,62 @@ | ||
| //// [tests/cases/compiler/unionBinaryExpressionPreserveOrigin1.ts] //// | ||
|
|
||
| === unionBinaryExpressionPreserveOrigin1.ts === | ||
| // https://github.com/microsoft/TypeScript/issues/43031 | ||
|
|
||
| type Brand<K, T> = K & { __brand: T }; | ||
| >Brand : Symbol(Brand, Decl(unionBinaryExpressionPreserveOrigin1.ts, 0, 0)) | ||
| >K : Symbol(K, Decl(unionBinaryExpressionPreserveOrigin1.ts, 2, 11)) | ||
| >T : Symbol(T, Decl(unionBinaryExpressionPreserveOrigin1.ts, 2, 13)) | ||
| >K : Symbol(K, Decl(unionBinaryExpressionPreserveOrigin1.ts, 2, 11)) | ||
| >__brand : Symbol(__brand, Decl(unionBinaryExpressionPreserveOrigin1.ts, 2, 24)) | ||
| >T : Symbol(T, Decl(unionBinaryExpressionPreserveOrigin1.ts, 2, 13)) | ||
|
|
||
| type BrandedUnknown<T> = Brand<"unknown", T>; | ||
| >BrandedUnknown : Symbol(BrandedUnknown, Decl(unionBinaryExpressionPreserveOrigin1.ts, 2, 38)) | ||
| >T : Symbol(T, Decl(unionBinaryExpressionPreserveOrigin1.ts, 3, 20)) | ||
| >Brand : Symbol(Brand, Decl(unionBinaryExpressionPreserveOrigin1.ts, 0, 0)) | ||
| >T : Symbol(T, Decl(unionBinaryExpressionPreserveOrigin1.ts, 3, 20)) | ||
|
|
||
| type Maybe<T> = T | BrandedUnknown<T>; | ||
| >Maybe : Symbol(Maybe, Decl(unionBinaryExpressionPreserveOrigin1.ts, 3, 45)) | ||
| >T : Symbol(T, Decl(unionBinaryExpressionPreserveOrigin1.ts, 4, 11)) | ||
| >T : Symbol(T, Decl(unionBinaryExpressionPreserveOrigin1.ts, 4, 11)) | ||
| >BrandedUnknown : Symbol(BrandedUnknown, Decl(unionBinaryExpressionPreserveOrigin1.ts, 2, 38)) | ||
| >T : Symbol(T, Decl(unionBinaryExpressionPreserveOrigin1.ts, 4, 11)) | ||
|
|
||
| declare const m1: Maybe<boolean> | undefined; | ||
| >m1 : Symbol(m1, Decl(unionBinaryExpressionPreserveOrigin1.ts, 6, 13)) | ||
| >Maybe : Symbol(Maybe, Decl(unionBinaryExpressionPreserveOrigin1.ts, 3, 45)) | ||
|
|
||
| const test1 = m1 || false; | ||
| >test1 : Symbol(test1, Decl(unionBinaryExpressionPreserveOrigin1.ts, 7, 5)) | ||
| >m1 : Symbol(m1, Decl(unionBinaryExpressionPreserveOrigin1.ts, 6, 13)) | ||
|
|
||
| const test2 = m1 ?? false; | ||
| >test2 : Symbol(test2, Decl(unionBinaryExpressionPreserveOrigin1.ts, 8, 5)) | ||
| >m1 : Symbol(m1, Decl(unionBinaryExpressionPreserveOrigin1.ts, 6, 13)) | ||
|
|
||
| declare const m2: Maybe<null> | undefined; | ||
| >m2 : Symbol(m2, Decl(unionBinaryExpressionPreserveOrigin1.ts, 10, 13)) | ||
| >Maybe : Symbol(Maybe, Decl(unionBinaryExpressionPreserveOrigin1.ts, 3, 45)) | ||
|
|
||
| const test3 = m2 || null; | ||
| >test3 : Symbol(test3, Decl(unionBinaryExpressionPreserveOrigin1.ts, 11, 5)) | ||
| >m2 : Symbol(m2, Decl(unionBinaryExpressionPreserveOrigin1.ts, 10, 13)) | ||
|
|
||
| const test4 = m2 ?? null; | ||
| >test4 : Symbol(test4, Decl(unionBinaryExpressionPreserveOrigin1.ts, 12, 5)) | ||
| >m2 : Symbol(m2, Decl(unionBinaryExpressionPreserveOrigin1.ts, 10, 13)) | ||
|
|
||
| type StrOrNum = string | number | ||
| >StrOrNum : Symbol(StrOrNum, Decl(unionBinaryExpressionPreserveOrigin1.ts, 12, 25)) | ||
|
|
||
| declare const numOrStr: StrOrNum; | ||
| >numOrStr : Symbol(numOrStr, Decl(unionBinaryExpressionPreserveOrigin1.ts, 15, 13)) | ||
| >StrOrNum : Symbol(StrOrNum, Decl(unionBinaryExpressionPreserveOrigin1.ts, 12, 25)) | ||
|
|
||
| const test5 = numOrStr && numOrStr; | ||
| >test5 : Symbol(test5, Decl(unionBinaryExpressionPreserveOrigin1.ts, 16, 5)) | ||
| >numOrStr : Symbol(numOrStr, Decl(unionBinaryExpressionPreserveOrigin1.ts, 15, 13)) | ||
| >numOrStr : Symbol(numOrStr, Decl(unionBinaryExpressionPreserveOrigin1.ts, 15, 13)) | ||
|
|
81 changes: 81 additions & 0 deletions
81
tests/baselines/reference/unionBinaryExpressionPreserveOrigin1.types
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,81 @@ | ||
| //// [tests/cases/compiler/unionBinaryExpressionPreserveOrigin1.ts] //// | ||
|
|
||
| === unionBinaryExpressionPreserveOrigin1.ts === | ||
| // https://github.com/microsoft/TypeScript/issues/43031 | ||
|
|
||
| type Brand<K, T> = K & { __brand: T }; | ||
| >Brand : Brand<K, T> | ||
| > : ^^^^^^^^^^^ | ||
| >__brand : T | ||
| > : ^ | ||
|
|
||
| type BrandedUnknown<T> = Brand<"unknown", T>; | ||
| >BrandedUnknown : BrandedUnknown<T> | ||
| > : ^^^^^^^^^^^^^^^^^ | ||
|
|
||
| type Maybe<T> = T | BrandedUnknown<T>; | ||
| >Maybe : Maybe<T> | ||
| > : ^^^^^^^^ | ||
|
|
||
| declare const m1: Maybe<boolean> | undefined; | ||
| >m1 : Maybe<boolean> | undefined | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| const test1 = m1 || false; | ||
| >test1 : Maybe<boolean> | ||
| > : ^^^^^^^^^^^^^^ | ||
| >m1 || false : Maybe<boolean> | ||
| > : ^^^^^^^^^^^^^^ | ||
| >m1 : Maybe<boolean> | undefined | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| >false : false | ||
| > : ^^^^^ | ||
|
|
||
| const test2 = m1 ?? false; | ||
| >test2 : Maybe<boolean> | ||
| > : ^^^^^^^^^^^^^^ | ||
| >m1 ?? false : Maybe<boolean> | ||
| > : ^^^^^^^^^^^^^^ | ||
| >m1 : Maybe<boolean> | undefined | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| >false : false | ||
| > : ^^^^^ | ||
|
|
||
| declare const m2: Maybe<null> | undefined; | ||
| >m2 : Maybe<null> | undefined | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| const test3 = m2 || null; | ||
| >test3 : Maybe<null> | ||
| > : ^^^^^^^^^^^ | ||
| >m2 || null : Maybe<null> | ||
| > : ^^^^^^^^^^^ | ||
| >m2 : Maybe<null> | undefined | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| const test4 = m2 ?? null; | ||
| >test4 : Maybe<null> | ||
| > : ^^^^^^^^^^^ | ||
| >m2 ?? null : Maybe<null> | ||
| > : ^^^^^^^^^^^ | ||
| >m2 : Maybe<null> | undefined | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| type StrOrNum = string | number | ||
| >StrOrNum : StrOrNum | ||
| > : ^^^^^^^^ | ||
|
|
||
| declare const numOrStr: StrOrNum; | ||
| >numOrStr : StrOrNum | ||
| > : ^^^^^^^^ | ||
|
|
||
| const test5 = numOrStr && numOrStr; | ||
| >test5 : StrOrNum | ||
| > : ^^^^^^^^ | ||
| >numOrStr && numOrStr : StrOrNum | ||
| > : ^^^^^^^^ | ||
| >numOrStr : StrOrNum | ||
| > : ^^^^^^^^ | ||
| >numOrStr : StrOrNum | ||
| > : ^^^^^^^^ | ||
|
|
20 changes: 20 additions & 0 deletions
20
tests/cases/compiler/unionBinaryExpressionPreserveOrigin1.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,20 @@ | ||
| // @strict: true | ||
| // @noEmit: true | ||
|
|
||
| // https://github.com/microsoft/TypeScript/issues/43031 | ||
|
|
||
| type Brand<K, T> = K & { __brand: T }; | ||
| type BrandedUnknown<T> = Brand<"unknown", T>; | ||
| type Maybe<T> = T | BrandedUnknown<T>; | ||
|
|
||
| declare const m1: Maybe<boolean> | undefined; | ||
| const test1 = m1 || false; | ||
| const test2 = m1 ?? false; | ||
|
|
||
| declare const m2: Maybe<null> | undefined; | ||
| const test3 = m2 || null; | ||
| const test4 = m2 ?? null; | ||
|
|
||
| type StrOrNum = string | number | ||
| declare const numOrStr: StrOrNum; | ||
| const test5 = numOrStr && numOrStr; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not like all 3 cases require both
BaseOfLiteralandNullablepreservation but there is no harm in treating them the same way here