Fixed local extends constraints of infer type parameters when they can contain type variables#60345
Open
Andarist wants to merge 2 commits intomicrosoft:mainfrom
Conversation
…can contain type variables
typescript-bot
added
the
For Uncommitted Bug
Andarist
force-pushed
the
fix/infer-type-params-with-instantiatable-extends-constraints
branch
from
659c426 to
7cf0d7c
Compare
Andarist
commented
Oct 26, 2024
Comment on lines
+19227
to
+19229
| function maybeCloneInferTypeParameter(p: TypeParameter) { | ||
| return getConstraintDeclaration(p) && couldContainTypeVariables(getConstraintFromTypeParameter(p)!) ? cloneTypeParameter(p) : p; | ||
| } |
Contributor
Author
There was a problem hiding this comment.
this only clones type parameters with "local" constraints (the ones added by infer R extends C syntax)
It could do the same with all constraints, using this patch:
git diff
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index a8803f5823..52f44bcebe 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -19117,9 +19117,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
}
const context = createInferenceContext(freshParams, /*signature*/ undefined, InferenceFlags.None);
- if (mapper) {
- context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
- }
if (!checkTypeDeferred) {
// We don't want inferences from constraints as they may cause us to eagerly resolve the
// conditional type instead of deferring resolution. Also, we always want strict function
@@ -19220,7 +19217,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
function maybeCloneInferTypeParameter(p: TypeParameter) {
- return getConstraintDeclaration(p) && couldContainTypeVariables(getConstraintFromTypeParameter(p)!) ? cloneTypeParameter(p) : p;
+ const constraint = getConstraintFromTypeParameter(p);
+ return constraint && couldContainTypeVariables(constraint) ? cloneTypeParameter(p) : p;
}
function getTrueTypeFromConditionalType(type: ConditionalType) {
diff --git a/tests/baselines/reference/inferTypes1.types b/tests/baselines/reference/inferTypes1.types
index edc97a2ea1..f6018d54a3 100644
--- a/tests/baselines/reference/inferTypes1.types
+++ b/tests/baselines/reference/inferTypes1.types
@@ -1,5 +1,8 @@
//// [tests/cases/conformance/types/conditional/inferTypes1.ts] ////
+=== Performance Stats ===
+Instantiation count: 1,000
+
=== inferTypes1.ts ===
type Unpacked<T> =
>Unpacked : Unpacked<T>As we can see, we could drop the context.nonFixingMapper manipulation and simplify the logic here - but that would create more type parameter clones and that's even caught by this diff (Instantiation count was reported by one of the tests when using this patch)
|
thank you very much @Andarist, how long do you reckon before this might be merged ? |
Contributor
Author
|
@zedryas that's not up to me, we have to wait for the review and merge by one of the TS team members |
Member
|
@typescript-bot test it |
Collaborator
Collaborator
|
@jakebailey Here are the results of running the user tests with tsc comparing Everything looks good! |
Collaborator
|
Hey @jakebailey, the results of running the DT tests are ready. Everything looks the same! |
Collaborator
|
@jakebailey Here they are:
tscComparison Report - baseline..pr
System info unknown
Hosts
Scenarios
Developer Information: |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Collaborator
|
@jakebailey Here are the results of running the top 400 repos with tsc comparing Everything looks good! |
|
Any update on this merge request? cc @weswigham (i do tag because you were the reviewer on #57362 ) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 #60299
this reverts a good chunk of #57362 but it also makes some modifications to the code that was removed there
cc @weswigham