[tsx] raise error on single arrow type argument without comma #14135
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| // Same as `generic`. Verify that JSX doesn't change things. | ||
| <T,>(a: T): T => a; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -148,6 +148,8 @@ const TSErrors = makeErrorTemplates( | |
| "A 'set' accessor cannot have rest parameter.", | ||
| SetAccesorCannotHaveReturnType: | ||
| "A 'set' accessor cannot have a return type annotation.", | ||
| SingleTypeParameterWithoutTrailingComma: | ||
| "Single type parameter %0 should have a trailing comma. Example usage: <%0,>.", | ||
| StaticBlockCannotHaveModifier: | ||
| "Static class blocks cannot have any modifier.", | ||
| TypeAnnotationAfterAssign: | ||
|
|
@@ -2922,6 +2924,7 @@ export default (superClass: Class<Parser>): Class<Parser> => | |
| // Either way, we're looking at a '<': tt.jsxTagStart or relational. | ||
|
|
||
| let typeParameters: ?N.TsTypeParameterDeclaration; | ||
| let invalidSingleType: ?N.TsTypeParameter; | ||
| state = state || this.state.clone(); | ||
|
|
||
| const arrow = this.tryParse(abort => { | ||
|
|
@@ -2941,9 +2944,39 @@ export default (superClass: Class<Parser>): Class<Parser> => | |
| this.resetStartLocationFromNode(expr, typeParameters); | ||
| } | ||
| expr.typeParameters = typeParameters; | ||
|
|
||
| // report error if single type parameter used without trailing comma. | ||
| if ( | ||
| this.hasPlugin("jsx") && | ||
| expr.typeParameters.params.length === 1 && | ||
| !expr.typeParameters.extra?.trailingComma | ||
| ) { | ||
| const parameter = expr.typeParameters.params[0]; | ||
| if (parameter.constraint) { | ||
| // If parameter has any constraints, it must contain multiple tokens. | ||
| // <T extends U> is a valid declaration. | ||
| // <T extends {name: string}> is also a valid declaration. | ||
| } else invalidSingleType = parameter; | ||
nicolo-ribaudo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| return expr; | ||
|
There was a problem hiding this comment. Can you move the check before this line? It should simplify |
||
| }, state); | ||
|
|
||
| if (invalidSingleType) { | ||
| this.raise( | ||
| TSErrors.SingleTypeParameterWithoutTrailingComma, | ||
| { | ||
| at: { | ||
| ...invalidSingleType.loc.end, | ||
| column: invalidSingleType.loc.end.column + 1, | ||
|
There was a problem hiding this comment. There is There was a problem hiding this comment. Oh I didn't know that. So you want me to use that method for the position and update the PR right? |
||
| }, | ||
| }, | ||
| process.env.BABEL_8_BREAKING | ||
| ? invalidSingleType.name.name | ||
| : invalidSingleType.name, | ||
| ); | ||
| } | ||
|
|
||
| /*:: invariant(arrow.node != null) */ | ||
| if (!arrow.error && !arrow.aborted) { | ||
| // This error is reported outside of the this.tryParse call so that | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| // Same as `generic`. Verify that JSX doesn't change things. | ||
| <T,>(a: T): T => a; |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to check it only in tsx file? @ozanhonamlioglu
(#14361 )
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nicolo-ribaudo Sounds logical to me, shall I change it with tsx? What is your opinion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TSX is "jsx in TypeScript". This check is only executed when TypeScript is enabled, so it's already only checking for tsx.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In our project, we used the same presets (
@babel/preset-env+@babel/preset-react+@babel/preset-typescript) to transform all the files, which caused the.tsfiles to be processed by the jsx plugin, so the generics in the.tsfiles also triggered theSingleTypeParameterWithoutTrailingCommaerror.This is a wrong usage, we will improve it. Thank you! @ozanhonamlioglu @nicolo-ribaudo