Combine keyof T inferences #22525
Merged
Combine keyof T inferences #22525
Conversation
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
sandersn
reviewed
Mar 14, 2018
src/compiler/checker.ts
Outdated
| @@ -11987,19 +11994,19 @@ namespace ts { | |||
| // If all inferences were made from contravariant positions, infer a common subtype. Otherwise, if | |||
| // union types were requested or if all inferences were made from the return type position, infer a | |||
| // union type. Otherwise, infer a common supertype. | |||
| const unwidenedType = context.flags & InferenceFlags.InferUnionTypes || inference.priority & InferencePriority.PriorityImpliesUnion ? | |||
| const unwidenedType = context.flags & InferenceFlags.InferUnionTypes || inference.priority & InferencePriority.PriorityImpliesCombination ? | |||
There was a problem hiding this comment.
can you extract this into a function similar to getContravariantInference? Or naming it something besides unwidenedType would make it more obvious why we check PriorityImpliesCombination and get the union, but then get the intersection if that type is never.
There was a problem hiding this comment.
@sandersn how is it now?
|
Also fixes #22376 since it adds the lower priority for "literal"→keyof inferences. |
sandersn
approved these changes
Mar 14, 2018
src/compiler/checker.ts
Outdated
| // Extract all object literal types and replace them with a single widened and normalized type. | ||
| const candidates = widenObjectLiteralCandidates(inference.candidates); | ||
| // We widen inferred literal types if | ||
| // all inferences were made to top-level ocurrences of the type parameter, and |
|
I added the test for #22376 to the PR. |
…cript into combine-keyof-inferences
|
@sandersn I've moved the tests |
ahejlsberg
approved these changes
Mar 19, 2018
DanielRosenwasser
pushed a commit
that referenced
this pull request
Mar 20, 2018
* Combine keyof T inferences * Extract covariant inference derivation into function * Test:keyof inference lower priority than return inference for #22376 * Update 'expected' comment in keyofInferenceLowerPriorityThanReturn * Update comment in test too, not just baselines * Fix typo * Move tests
DanielRosenwasser
added a commit
that referenced
this pull request
Mar 20, 2018
…-2.8 [release-2.8] Combine keyof T inferences (#22525)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #21553 kinda. The example will now typecheck (instead of error) as expected, but the inferred type for
Twon't be the default (as it used to be when we made no inference), instead it'll be the combination of all thekeyof Tinferences we made.This is pretty much the contravariant equivalent of how we now combine mapped type key inferences into a union.
Fixes #22376