Port "Improve type discrimination algorithm" from tsgo #61828
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,28 @@ | ||
| missingDiscriminants.ts(17,23): error TS2353: Object literal may only specify known properties, and 'subkind' does not exist in type '{ kind: "b"; }'. | ||
| missingDiscriminants.ts(18,34): error TS2353: Object literal may only specify known properties, and 'subkind' does not exist in type '{ kind: "b"; }'. | ||
|
|
||
|
|
||
| ==== missingDiscriminants.ts (2 errors) ==== | ||
| // https://github.com/microsoft/typescript-go/issues/1020 | ||
|
|
||
| type Thing = | ||
| | { str: "a", num: 0 } | ||
| | { str: "b" } | ||
| | { num: 1 } | ||
|
|
||
| const thing1: Thing = { str: "a", num: 0 } | ||
| const thing2: Thing = { str: "b", num: 1 } // Shouldn't be error | ||
| const thing3: Thing = { num: 1, str: "b" } // Shouldn't be error | ||
|
|
||
| type Item = | ||
| | { kind: "a", subkind: 0, value: string } | ||
| | { kind: "a", subkind: 1, value: number } | ||
| | { kind: "b" } | ||
|
|
||
| const item1: Item = { subkind: 1, kind: "b" } // Error, type "b" not assignable to type "a" | ||
| ~~~~~~~ | ||
| !!! error TS2353: Object literal may only specify known properties, and 'subkind' does not exist in type '{ kind: "b"; }'. | ||
| const item2: Item = { kind: "b", subkind: 1 } // Error, 'subkind' isn't a known property | ||
| ~~~~~~~ | ||
| !!! error TS2353: Object literal may only specify known properties, and 'subkind' does not exist in type '{ kind: "b"; }'. | ||
|
|
This file contains hidden or 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,64 @@ | ||
| //// [tests/cases/compiler/missingDiscriminants.ts] //// | ||
|
|
||
| === missingDiscriminants.ts === | ||
| // https://github.com/microsoft/typescript-go/issues/1020 | ||
|
|
||
| type Thing = | ||
| >Thing : Symbol(Thing, Decl(missingDiscriminants.ts, 0, 0)) | ||
|
|
||
| | { str: "a", num: 0 } | ||
| >str : Symbol(str, Decl(missingDiscriminants.ts, 3, 5)) | ||
| >num : Symbol(num, Decl(missingDiscriminants.ts, 3, 15)) | ||
|
|
||
| | { str: "b" } | ||
| >str : Symbol(str, Decl(missingDiscriminants.ts, 4, 5)) | ||
|
|
||
| | { num: 1 } | ||
| >num : Symbol(num, Decl(missingDiscriminants.ts, 5, 5)) | ||
|
|
||
| const thing1: Thing = { str: "a", num: 0 } | ||
| >thing1 : Symbol(thing1, Decl(missingDiscriminants.ts, 7, 5)) | ||
| >Thing : Symbol(Thing, Decl(missingDiscriminants.ts, 0, 0)) | ||
| >str : Symbol(str, Decl(missingDiscriminants.ts, 7, 23)) | ||
| >num : Symbol(num, Decl(missingDiscriminants.ts, 7, 33)) | ||
|
|
||
| const thing2: Thing = { str: "b", num: 1 } // Shouldn't be error | ||
| >thing2 : Symbol(thing2, Decl(missingDiscriminants.ts, 8, 5)) | ||
| >Thing : Symbol(Thing, Decl(missingDiscriminants.ts, 0, 0)) | ||
| >str : Symbol(str, Decl(missingDiscriminants.ts, 8, 23)) | ||
| >num : Symbol(num, Decl(missingDiscriminants.ts, 8, 33)) | ||
|
|
||
| const thing3: Thing = { num: 1, str: "b" } // Shouldn't be error | ||
| >thing3 : Symbol(thing3, Decl(missingDiscriminants.ts, 9, 5)) | ||
| >Thing : Symbol(Thing, Decl(missingDiscriminants.ts, 0, 0)) | ||
| >num : Symbol(num, Decl(missingDiscriminants.ts, 9, 23)) | ||
| >str : Symbol(str, Decl(missingDiscriminants.ts, 9, 31)) | ||
|
|
||
| type Item = | ||
| >Item : Symbol(Item, Decl(missingDiscriminants.ts, 9, 42)) | ||
|
|
||
| | { kind: "a", subkind: 0, value: string } | ||
| >kind : Symbol(kind, Decl(missingDiscriminants.ts, 12, 5)) | ||
| >subkind : Symbol(subkind, Decl(missingDiscriminants.ts, 12, 16)) | ||
| >value : Symbol(value, Decl(missingDiscriminants.ts, 12, 28)) | ||
|
|
||
| | { kind: "a", subkind: 1, value: number } | ||
| >kind : Symbol(kind, Decl(missingDiscriminants.ts, 13, 5)) | ||
| >subkind : Symbol(subkind, Decl(missingDiscriminants.ts, 13, 16)) | ||
| >value : Symbol(value, Decl(missingDiscriminants.ts, 13, 28)) | ||
|
|
||
| | { kind: "b" } | ||
| >kind : Symbol(kind, Decl(missingDiscriminants.ts, 14, 5)) | ||
|
|
||
| const item1: Item = { subkind: 1, kind: "b" } // Error, type "b" not assignable to type "a" | ||
| >item1 : Symbol(item1, Decl(missingDiscriminants.ts, 16, 5)) | ||
| >Item : Symbol(Item, Decl(missingDiscriminants.ts, 9, 42)) | ||
| >subkind : Symbol(subkind, Decl(missingDiscriminants.ts, 16, 21)) | ||
| >kind : Symbol(kind, Decl(missingDiscriminants.ts, 16, 33)) | ||
|
|
||
| const item2: Item = { kind: "b", subkind: 1 } // Error, 'subkind' isn't a known property | ||
| >item2 : Symbol(item2, Decl(missingDiscriminants.ts, 17, 5)) | ||
| >Item : Symbol(Item, Decl(missingDiscriminants.ts, 9, 42)) | ||
| >kind : Symbol(kind, Decl(missingDiscriminants.ts, 17, 21)) | ||
| >subkind : Symbol(subkind, Decl(missingDiscriminants.ts, 17, 32)) | ||
|
|
This file contains hidden or 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,117 @@ | ||
| //// [tests/cases/compiler/missingDiscriminants.ts] //// | ||
|
|
||
| === missingDiscriminants.ts === | ||
| // https://github.com/microsoft/typescript-go/issues/1020 | ||
|
|
||
| type Thing = | ||
| >Thing : Thing | ||
| > : ^^^^^ | ||
|
|
||
| | { str: "a", num: 0 } | ||
| >str : "a" | ||
| > : ^^^ | ||
| >num : 0 | ||
| > : ^ | ||
|
|
||
| | { str: "b" } | ||
| >str : "b" | ||
| > : ^^^ | ||
|
|
||
| | { num: 1 } | ||
| >num : 1 | ||
| > : ^ | ||
|
|
||
| const thing1: Thing = { str: "a", num: 0 } | ||
| >thing1 : Thing | ||
| > : ^^^^^ | ||
| >{ str: "a", num: 0 } : { str: "a"; num: 0; } | ||
| > : ^^^^^^^^^^^^^^^^^^^^^ | ||
| >str : "a" | ||
| > : ^^^ | ||
| >"a" : "a" | ||
| > : ^^^ | ||
| >num : 0 | ||
| > : ^ | ||
| >0 : 0 | ||
| > : ^ | ||
|
|
||
| const thing2: Thing = { str: "b", num: 1 } // Shouldn't be error | ||
| >thing2 : Thing | ||
| > : ^^^^^ | ||
| >{ str: "b", num: 1 } : { str: "b"; num: 1; } | ||
| > : ^^^^^^^^^^^^^^^^^^^^^ | ||
| >str : "b" | ||
| > : ^^^ | ||
| >"b" : "b" | ||
| > : ^^^ | ||
| >num : 1 | ||
| > : ^ | ||
| >1 : 1 | ||
| > : ^ | ||
|
|
||
| const thing3: Thing = { num: 1, str: "b" } // Shouldn't be error | ||
| >thing3 : Thing | ||
| > : ^^^^^ | ||
| >{ num: 1, str: "b" } : { num: 1; str: "b"; } | ||
| > : ^^^^^^^^^^^^^^^^^^^^^ | ||
| >num : 1 | ||
| > : ^ | ||
| >1 : 1 | ||
| > : ^ | ||
| >str : "b" | ||
| > : ^^^ | ||
| >"b" : "b" | ||
| > : ^^^ | ||
|
|
||
| type Item = | ||
| >Item : Item | ||
| > : ^^^^ | ||
|
|
||
| | { kind: "a", subkind: 0, value: string } | ||
| >kind : "a" | ||
| > : ^^^ | ||
| >subkind : 0 | ||
| > : ^ | ||
| >value : string | ||
| > : ^^^^^^ | ||
|
|
||
| | { kind: "a", subkind: 1, value: number } | ||
| >kind : "a" | ||
| > : ^^^ | ||
| >subkind : 1 | ||
| > : ^ | ||
| >value : number | ||
| > : ^^^^^^ | ||
|
|
||
| | { kind: "b" } | ||
| >kind : "b" | ||
| > : ^^^ | ||
|
|
||
| const item1: Item = { subkind: 1, kind: "b" } // Error, type "b" not assignable to type "a" | ||
| >item1 : Item | ||
| > : ^^^^ | ||
| >{ subkind: 1, kind: "b" } : { subkind: number; kind: "b"; } | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| >subkind : number | ||
| > : ^^^^^^ | ||
| >1 : 1 | ||
| > : ^ | ||
| >kind : "b" | ||
| > : ^^^ | ||
| >"b" : "b" | ||
| > : ^^^ | ||
|
|
||
| const item2: Item = { kind: "b", subkind: 1 } // Error, 'subkind' isn't a known property | ||
| >item2 : Item | ||
| > : ^^^^ | ||
| >{ kind: "b", subkind: 1 } : { kind: "b"; subkind: number; } | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| >kind : "b" | ||
| > : ^^^ | ||
| >"b" : "b" | ||
| > : ^^^ | ||
| >subkind : number | ||
| > : ^^^^^^ | ||
| >1 : 1 | ||
| > : ^ | ||
|
|
This file contains hidden or 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 hidden or 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,21 @@ | ||
| // @strict: true | ||
| // @noEmit: true | ||
|
|
||
| // https://github.com/microsoft/typescript-go/issues/1020 | ||
|
|
||
| type Thing = | ||
| | { str: "a", num: 0 } | ||
| | { str: "b" } | ||
| | { num: 1 } | ||
|
|
||
| const thing1: Thing = { str: "a", num: 0 } | ||
| const thing2: Thing = { str: "b", num: 1 } // Shouldn't be error | ||
| const thing3: Thing = { num: 1, str: "b" } // Shouldn't be error | ||
|
|
||
| type Item = | ||
| | { kind: "a", subkind: 0, value: string } | ||
| | { kind: "a", subkind: 1, value: number } | ||
| | { kind: "b" } | ||
|
|
||
| const item1: Item = { subkind: 1, kind: "b" } // Error, type "b" not assignable to type "a" | ||
| const item2: Item = { kind: "b", subkind: 1 } // Error, 'subkind' isn't a known property |
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.
[nitpick] This boolean condition is getting lengthy and complex; consider extracting the kind checks into a well-named helper function (e.g.,
shouldReuseImportFix(existingFix, importKind)) for readability.Copilot uses AI. Check for mistakes.