mirror of
https://github.com/microsoft/TypeScript.git
synced 2025-11-18 17:21:48 +00:00
Improve error range for ts2657 (jsx expr must have parent element), add code fix for it (#37917)
* fix: range of ts2657 (jsx expr must have parent) and remove 2695 (LHS expr of comma has no side effects) * feat: add code fix for 2657 * fix: resolve review * chore: hoist a var * chore: add test for skipTrivia * fix: rebase error * Update src/compiler/diagnosticMessages.json Co-authored-by: Andrew Branch <andrewbranch@users.noreply.github.com> * Update src/services/codefixes/wrapJsxInFragment.ts Co-authored-by: Andrew Branch <andrewbranch@users.noreply.github.com> Co-authored-by: Andrew Branch <andrew@wheream.io> Co-authored-by: Andrew Branch <andrewbranch@users.noreply.github.com>
This commit is contained in:
co-authored by
Andrew Branch
Andrew Branch
parent
4f0b81d415
commit
8e290e5aae
@@ -0,0 +1,71 @@
|
||||
/* @internal */
|
||||
namespace ts.codefix {
|
||||
const fixID = "wrapJsxInFragment";
|
||||
const errorCodes = [Diagnostics.JSX_expressions_must_have_one_parent_element.code];
|
||||
registerCodeFix({
|
||||
errorCodes,
|
||||
getCodeActions: context => {
|
||||
const { jsx } = context.program.getCompilerOptions();
|
||||
if (jsx !== JsxEmit.React && jsx !== JsxEmit.ReactNative) {
|
||||
return undefined;
|
||||
}
|
||||
const { sourceFile, span } = context;
|
||||
const node = findNodeToFix(sourceFile, span.start);
|
||||
if (!node) return undefined;
|
||||
const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, node));
|
||||
return [createCodeFixAction(fixID, changes, Diagnostics.Wrap_in_JSX_fragment, fixID, Diagnostics.Wrap_all_unparented_JSX_in_JSX_fragment)];
|
||||
},
|
||||
fixIds: [fixID],
|
||||
getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => {
|
||||
const node = findNodeToFix(context.sourceFile, diag.start);
|
||||
if (!node) return undefined;
|
||||
doChange(changes, context.sourceFile, node);
|
||||
}),
|
||||
});
|
||||
|
||||
function findNodeToFix(sourceFile: SourceFile, pos: number): BinaryExpression | undefined {
|
||||
// The error always at 1st token that is "<" in "<a /><a />"
|
||||
const lessThanToken = getTokenAtPosition(sourceFile, pos);
|
||||
const firstJsxElementOrOpenElement = lessThanToken.parent;
|
||||
let binaryExpr = firstJsxElementOrOpenElement.parent;
|
||||
if (!isBinaryExpression(binaryExpr)) {
|
||||
// In case the start element is a JsxSelfClosingElement, it the end.
|
||||
// For JsxOpenElement, find one more parent
|
||||
binaryExpr = binaryExpr.parent;
|
||||
if (!isBinaryExpression(binaryExpr)) return undefined;
|
||||
}
|
||||
if (!nodeIsMissing(binaryExpr.operatorToken)) return undefined;
|
||||
return binaryExpr;
|
||||
}
|
||||
|
||||
function doChange(changeTracker: textChanges.ChangeTracker, sf: SourceFile, node: Node) {
|
||||
const jsx = flattenInvalidBinaryExpr(node);
|
||||
if (jsx) changeTracker.replaceNode(sf, node, createJsxFragment(createJsxOpeningFragment(), jsx, createJsxJsxClosingFragment()));
|
||||
}
|
||||
// The invalid syntax is constructed as
|
||||
// InvalidJsxTree :: One of
|
||||
// JsxElement CommaToken InvalidJsxTree
|
||||
// JsxElement CommaToken JsxElement
|
||||
function flattenInvalidBinaryExpr(node: Node): JsxChild[] | undefined {
|
||||
const children: JsxChild[] = [];
|
||||
let current = node;
|
||||
while (true) {
|
||||
if (isBinaryExpression(current) && nodeIsMissing(current.operatorToken) && current.operatorToken.kind === SyntaxKind.CommaToken) {
|
||||
children.push(<JsxChild>current.left);
|
||||
if (isJsxChild(current.right)) {
|
||||
children.push(current.right);
|
||||
// Indicates the tree has go to the bottom
|
||||
return children;
|
||||
}
|
||||
else if (isBinaryExpression(current.right)) {
|
||||
current = current.right;
|
||||
continue;
|
||||
}
|
||||
// Unreachable case
|
||||
else return undefined;
|
||||
}
|
||||
// Unreachable case
|
||||
else return undefined;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -97,6 +97,7 @@
|
||||
"codefixes/useDefaultImport.ts",
|
||||
"codefixes/useBigintLiteral.ts",
|
||||
"codefixes/fixAddModuleReferTypeMissingTypeof.ts",
|
||||
"codefixes/wrapJsxInFragment.ts",
|
||||
"codefixes/convertToMappedObjectType.ts",
|
||||
"codefixes/removeUnnecessaryAwait.ts",
|
||||
"codefixes/splitTypeOnlyImport.ts",
|
||||
|
||||
Reference in New Issue
Block a user