Resolve keyof and index operations instead of their targets. #58758
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
typescript-bot
added
the
For Uncommitted Bug
jakebailey
reviewed
Jun 3, 2024
| @@ -11644,6 +11644,14 @@ export function unwrapParenthesizedExpression(o: Expression) { | |||
| return o; | |||
| } | |||
|
|
|||
| /** @internal */ | |||
| export function unwrapParenthesizedType(o: TypeNode) { | |||
There was a problem hiding this comment.
I'm surprised we don't already have this helper...
There was a problem hiding this comment.
I was surprised too. But I could not find it if it exists. There is one that walks up.
There was a problem hiding this comment.
Ah, it's skipTypeParentheses.
There was a problem hiding this comment.
Oh. Didn't think to look for that. I'll fix it tomorrow.
src/compiler/checker.ts
Outdated
Comment on lines
8626
to
8656
| function tryVisitIndexAccess(node: IndexedAccessTypeNode): TypeNode | undefined { | ||
| const resultObjectType = tryVisitSimpleTypeNode(node.objectType); | ||
| if (resultObjectType === undefined) { | ||
| return undefined; | ||
| } | ||
| return factory.updateIndexedAccessTypeNode(node, resultObjectType, visitNode(node.indexType, visitExistingNodeTreeSymbols, isTypeNode)!); | ||
| } | ||
| function tryVisitKeyOf(node: TypeOperatorNode): TypeNode | undefined { | ||
| Debug.assertEqual(node.operator, SyntaxKind.KeyOfKeyword); | ||
| const type = tryVisitSimpleTypeNode(node.type); | ||
| if (type === undefined) { | ||
| return undefined; | ||
| } | ||
| return factory.updateTypeOperatorNode(node, type); | ||
| } | ||
| function tryVisitTypeQuery(node: TypeQueryNode): TypeNode | undefined { | ||
| const { introducesError, node: exprName } = trackExistingEntityName(node.exprName, context); | ||
| if (!introducesError) { | ||
| return factory.updateTypeQueryNode( | ||
| node, | ||
| exprName, | ||
| visitNodes(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode), | ||
| ); | ||
| } | ||
|
|
||
| const serializedName = serializeTypeName(context, node.exprName, /*isTypeOf*/ true); | ||
| if (serializedName) { | ||
| return setTextRange(context, serializedName, node.exprName); | ||
| } | ||
| } | ||
| function tryVisitTypeReference(node: TypeReferenceNode): TypeNode | undefined { |
There was a problem hiding this comment.
Suggested change
| function tryVisitIndexAccess(node: IndexedAccessTypeNode): TypeNode | undefined { | |
| const resultObjectType = tryVisitSimpleTypeNode(node.objectType); | |
| if (resultObjectType === undefined) { | |
| return undefined; | |
| } | |
| return factory.updateIndexedAccessTypeNode(node, resultObjectType, visitNode(node.indexType, visitExistingNodeTreeSymbols, isTypeNode)!); | |
| } | |
| function tryVisitKeyOf(node: TypeOperatorNode): TypeNode | undefined { | |
| Debug.assertEqual(node.operator, SyntaxKind.KeyOfKeyword); | |
| const type = tryVisitSimpleTypeNode(node.type); | |
| if (type === undefined) { | |
| return undefined; | |
| } | |
| return factory.updateTypeOperatorNode(node, type); | |
| } | |
| function tryVisitTypeQuery(node: TypeQueryNode): TypeNode | undefined { | |
| const { introducesError, node: exprName } = trackExistingEntityName(node.exprName, context); | |
| if (!introducesError) { | |
| return factory.updateTypeQueryNode( | |
| node, | |
| exprName, | |
| visitNodes(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode), | |
| ); | |
| } | |
| const serializedName = serializeTypeName(context, node.exprName, /*isTypeOf*/ true); | |
| if (serializedName) { | |
| return setTextRange(context, serializedName, node.exprName); | |
| } | |
| } | |
| function tryVisitTypeReference(node: TypeReferenceNode): TypeNode | undefined { | |
| function tryVisitIndexAccess(node: IndexedAccessTypeNode): TypeNode | undefined { | |
| const resultObjectType = tryVisitSimpleTypeNode(node.objectType); | |
| if (resultObjectType === undefined) { | |
| return undefined; | |
| } | |
| return factory.updateIndexedAccessTypeNode(node, resultObjectType, visitNode(node.indexType, visitExistingNodeTreeSymbols, isTypeNode)!); | |
| } | |
| function tryVisitKeyOf(node: TypeOperatorNode): TypeNode | undefined { | |
| Debug.assertEqual(node.operator, SyntaxKind.KeyOfKeyword); | |
| const type = tryVisitSimpleTypeNode(node.type); | |
| if (type === undefined) { | |
| return undefined; | |
| } | |
| return factory.updateTypeOperatorNode(node, type); | |
| } | |
| function tryVisitTypeQuery(node: TypeQueryNode): TypeNode | undefined { | |
| const { introducesError, node: exprName } = trackExistingEntityName(node.exprName, context); | |
| if (!introducesError) { | |
| return factory.updateTypeQueryNode( | |
| node, | |
| exprName, | |
| visitNodes(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode), | |
| ); | |
| } | |
| const serializedName = serializeTypeName(context, node.exprName, /*isTypeOf*/ true); | |
| if (serializedName) { | |
| return setTextRange(context, serializedName, node.exprName); | |
| } | |
| } | |
| function tryVisitTypeReference(node: TypeReferenceNode): TypeNode | undefined { |
There was a problem hiding this comment.
It's just newlines between the declarations
| } | ||
| return visitNode(node, visitExistingNodeTreeSymbols, isTypeNode); | ||
| } | ||
| function tryVisitIndexAccess(node: IndexedAccessTypeNode): TypeNode | undefined { |
|
Seems reasonable. Can you just address the style nits? I don't have edit access. |
typescript-bot
added
For Milestone Bug
DanielRosenwasser
approved these changes
Jun 3, 2024
|
@typescript-bot cherry-pick to release-5.5 |
|
Hey, @DanielRosenwasser! I've created #58767 for you. |
DanielRosenwasser
added a commit
that referenced
this pull request
Jun 3, 2024
…e-5.5 (#58767) Co-authored-by: Titian Cernicova-Dragomir <[email protected]> Co-authored-by: Daniel Rosenwasser <[email protected]>
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 #58752