Fixed an issue with satisfies "resolving" generic types of references
#60710
Conversation
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
Andarist
commented
Dec 7, 2024
| const exprType = checkExpression(expression, checkMode); | ||
| const targetType = getTypeFromTypeNode(target); | ||
| if (isErrorType(targetType)) { | ||
| return targetType; | ||
| } | ||
| const errorNode = findAncestor(target.parent, n => n.kind === SyntaxKind.SatisfiesExpression || n.kind === SyntaxKind.JSDocSatisfiesTag); | ||
| checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, errorNode, expression, Diagnostics.Type_0_does_not_satisfy_the_expected_type_1); | ||
| return exprType; | ||
| return checkExpression(expression, checkMode | CheckMode.SatisfiesOutput); |
There was a problem hiding this comment.
exprType is used to check the assignability, it may contain "resolved" types for narrowable references. So the assignability works like it works in:
const x: "A" = genericReferenceNarrowedDownToA;But the output type is different because we should propagate that "resolved" type in:
// actual on main: `"A"`
// expected: `AB extends "A" | "B"`
const x = genericReferenceNarrowedDownToA satisfies "A";
Andarist
commented
Dec 7, 2024
| @@ -160,8 +160,8 @@ function g1<T extends Box<T> | undefined>(x: T) { | |||
| > : ^^^^^^^ | |||
| >isBox : (x: any) => x is Box<unknown> | |||
| > : ^ ^^ ^^^^^ | |||
| >x : Box<T> | undefined | |||
| > : ^^^^^^^^^^^^^^^^^^ | |||
| >x : T | |||
There was a problem hiding this comment.
all the baseline changes like this are caused by the fact that now hasContextualTypeWithNoGenericTypes returns false when the contextual type is any, and thus substituteConstraints gets computed as false in getNarrowableTypeForReference
Andarist
commented
Dec 7, 2024
Comment on lines
+30
to
+31
| description: "Add missing function declaration 'added2'", | ||
| index: 1, |
There was a problem hiding this comment.
this was a mistake in the original test case, goTo.marker("2") has no effect on verify.codeFix, we need to use a global index here to test the codefix at that marker
Andarist
commented
Dec 7, 2024
| @@ -19,24 +19,24 @@ verify.codeFix({ | |||
| added2(et) | |||
| } | |||
|
|
|||
| function added1(et: string) { | |||
| function added1<T extends "phone" | "home">(et: T) { | |||
There was a problem hiding this comment.
I believe this was the original true intention here but the type widened since it had a union constraint. This was introduced in #49727 , cc @JoshuaKGoldberg
Andarist
commented
Dec 7, 2024
| @@ -15,7 +15,7 @@ verify.codeFix({ | |||
| added(keyofTypeof); | |||
| } | |||
|
|
|||
| function added(keyofTypeof: string | number | symbol) { | |||
| function added<T>(keyofTypeof: keyof T) { | |||
There was a problem hiding this comment.
This isn't a particularly great codefix... since keyof T when T doesn't appear "naked" somewhere in the parameters list is usually a lousy parameter. I don't think it's worth fighting it here though as it could appear naked somewhere.
Andarist
commented
Dec 7, 2024
| : getContextualType(node, /*contextFlags*/ undefined)); | ||
| return contextualType && !isGenericType(contextualType); | ||
| getContextualType(node, (checkMode & CheckMode.RestBindingElement ? ContextFlags.SkipBindingPatterns : 0) | (checkMode & CheckMode.SatisfiesOutput ? ContextFlags.SkipSatisfies : 0)); | ||
| return contextualType && !(contextualType.flags & TypeFlags.Any) && !isGenericType(contextualType); |
There was a problem hiding this comment.
The added !(contextualType.flags & TypeFlags.Any) bit here isn't exactly related to satisfies at all. I have added it to account for auto types, that affected all the baselines that had any as the contextual type in a few places. It also affected those codefixes for missing function declarations since the error type (a special kind of any) was the contextual type for those arguments here. I think those changes are positive
|
@typescript-bot test it |
|
@jakebailey Here are the results of running the user tests with tsc comparing Everything looks good! |
|
Hey @jakebailey, the results of running the DT tests are ready. Everything looks the same! |
|
@jakebailey Here they are:
tscComparison Report - baseline..pr
System info unknown
Hosts
Scenarios
Developer Information: |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
@jakebailey Here are the results of running the top 400 repos with tsc comparing Everything looks good! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #52394
fixes #60698