Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 13.7k
Proper treatment of splicing tuples in array literals#36861
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -17182,7 +17182,7 @@ namespace ts { | ||
| /** | ||
| * Check if a Type was written as a tuple type literal. | ||
| * Prefer using isTupleLikeType() unless the use of `elementTypes` is required. | ||
| * Prefer using isTupleLikeType() unless the use of `elementTypes`/`getTypeArguments` is required. | ||
| */ | ||
| function isTupleType(type: Type): type is TupleTypeReference { | ||
| return !!(getObjectFlags(type) & ObjectFlags.Reference && (<TypeReference>type).target.objectFlags & ObjectFlags.Tuple); | ||
| @@ -22251,58 +22251,69 @@ namespace ts { | ||
| function checkArrayLiteral(node: ArrayLiteralExpression, checkMode: CheckMode | undefined, forceTuple: boolean | undefined): Type { | ||
| const elements = node.elements; | ||
| const elementCount = elements.length; | ||
| let hasNonEndingSpreadElement = false; | ||
| const elementTypes: Type[] = []; | ||
| const inDestructuringPattern = isAssignmentTarget(node); | ||
| let hasEndingSpreadElement = false; | ||
| let hasNonEndingSpreadElement = false; | ||
| const contextualType = getApparentTypeOfContextualType(node); | ||
| const inDestructuringPattern = isAssignmentTarget(node); | ||
| const inConstContext = isConstContext(node); | ||
elibarzilay marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| for (let index = 0; index < elementCount; index++) { | ||
| const e = elements[index]; | ||
| if (inDestructuringPattern && e.kind === SyntaxKind.SpreadElement) { | ||
| // Given the following situation: | ||
| // var c: {}; | ||
| // [...c] = ["", 0]; | ||
| // | ||
| // c is represented in the tree as a spread element in an array literal. | ||
| // But c really functions as a rest element, and its purpose is to provide | ||
| // a contextual type for the right hand side of the assignment. Therefore, | ||
| // instead of calling checkExpression on "...c", which will give an error | ||
| // if c is not iterable/array-like, we need to act as if we are trying to | ||
| // get the contextual element type from it. So we do something similar to | ||
| // getContextualTypeForElementExpression, which will crucially not error | ||
| // if there is no index type / iterated type. | ||
| const restArrayType = checkExpression((<SpreadElement>e).expression, checkMode, forceTuple); | ||
| const restElementType = getIndexTypeOfType(restArrayType, IndexKind.Number) || | ||
| getIteratedTypeOrElementType(IterationUse.Destructuring, restArrayType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false); | ||
| if (restElementType) { | ||
| elementTypes.push(restElementType); | ||
| for (let i = 0; i < elementCount; i++) { | ||
| const e = elements[i]; | ||
| const spread = e.kind === SyntaxKind.SpreadElement && (<SpreadElement>e).expression; | ||
| const spreadType = spread && checkExpression(spread, checkMode, forceTuple); | ||
| if (spreadType && isTupleType(spreadType)) { | ||
| elementTypes.push(...getTypeArguments(spreadType)); | ||
| if (spreadType.target.hasRestElement) { | ||
| if (i === elementCount - 1) hasEndingSpreadElement = true; | ||
| else hasNonEndingSpreadElement = true; | ||
| } | ||
| } | ||
| else { | ||
| const elementContextualType = getContextualTypeForElementExpression(contextualType, index); | ||
| const type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple); | ||
| elementTypes.push(type); | ||
| } | ||
| if (index < elementCount - 1 && e.kind === SyntaxKind.SpreadElement) { | ||
| hasNonEndingSpreadElement = true; | ||
| if (inDestructuringPattern && spreadType) { | ||
| // Given the following situation: | ||
| // var c: {}; | ||
| // [...c] = ["", 0]; | ||
| // | ||
| // c is represented in the tree as a spread element in an array literal. | ||
| // But c really functions as a rest element, and its purpose is to provide | ||
| // a contextual type for the right hand side of the assignment. Therefore, | ||
| // instead of calling checkExpression on "...c", which will give an error | ||
| // if c is not iterable/array-like, we need to act as if we are trying to | ||
| // get the contextual element type from it. So we do something similar to | ||
| // getContextualTypeForElementExpression, which will crucially not error | ||
elibarzilay marked this conversation as resolved.
Outdated
Uh oh!There was an error while loading. Please reload this page. | ||
| // if there is no index type / iterated type. | ||
| const restElementType = getIndexTypeOfType(spreadType, IndexKind.Number) || | ||
| getIteratedTypeOrElementType(IterationUse.Destructuring, spreadType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false); | ||
| if (restElementType) { | ||
| elementTypes.push(restElementType); | ||
| } | ||
| } | ||
| else { | ||
| const elementContextualType = getContextualTypeForElementExpression(contextualType, elementTypes.length); | ||
| const type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple); | ||
| elementTypes.push(type); | ||
| } | ||
| if (spread) { // tuples are done above, so these are only arrays | ||
| if (i === elementCount - 1) hasEndingSpreadElement = true; | ||
| else hasNonEndingSpreadElement = true; | ||
| } | ||
| } | ||
| } | ||
| if (!hasNonEndingSpreadElement) { | ||
| const hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === SyntaxKind.SpreadElement; | ||
| const minLength = elementCount - (hasRestElement ? 1 : 0); | ||
| const minLength = elementTypes.length - (hasEndingSpreadElement ? 1 : 0); | ||
| // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such | ||
| // that we get the same behavior for "var [x, y] = []" and "[x, y] = []". | ||
| let tupleResult; | ||
| if (inDestructuringPattern && minLength > 0) { | ||
| const type = cloneTypeReference(<TypeReference>createTupleType(elementTypes, minLength, hasRestElement)); | ||
| const type = cloneTypeReference(<TypeReference>createTupleType(elementTypes, minLength, hasEndingSpreadElement)); | ||
| type.pattern = node; | ||
| return type; | ||
| } | ||
| else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, inConstContext)) { | ||
| else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasEndingSpreadElement, elementTypes.length, inConstContext)) { | ||
| return createArrayLiteralType(tupleResult); | ||
| } | ||
| else if (forceTuple) { | ||
| return createArrayLiteralType(createTupleType(elementTypes, minLength, hasRestElement)); | ||
| return createArrayLiteralType(createTupleType(elementTypes, minLength, hasEndingSpreadElement)); | ||
| } | ||
| } | ||
| return createArrayLiteralType(createArrayType(elementTypes.length ? | ||
8 changes: 4 additions & 4 deletions
8 tests/baselines/reference/arrayLiteralExpressionContextualTyping.errors.txt
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
2 changes: 1 addition & 1 deletion
2 tests/baselines/reference/arrayLiteralExpressionContextualTyping.types
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
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
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
8 changes: 3 additions & 5 deletions
8 tests/baselines/reference/literalFreshnessPropagationOnNarrowing.errors.txt
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
15 changes: 0 additions & 15 deletions
15 tests/baselines/reference/restElementWithAssignmentPattern1.errors.txt
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
6 changes: 3 additions & 3 deletions
6 tests/baselines/reference/restElementWithAssignmentPattern1.types
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
2 changes: 1 addition & 1 deletion
2 tests/baselines/reference/restElementWithAssignmentPattern3.types
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
6 changes: 3 additions & 3 deletions
6 tests/baselines/reference/restElementWithAssignmentPattern5.types
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
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.