Skip to content

fix(45802): keep children of mismatched jsx element #45839

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.

Sign up for GitHub

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
merged 2 commits into from
Sep 20, 2021
+47 −19
Merged

fix(45802): keep children of mismatched jsx element #45839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8873e84
fix(45802): keep children of mismatched jsx element
hi-ogawa Sep 12, 2021
e44f0dd
Apply suggestions from code review
hi-ogawa Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/compiler/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5042,12 +5042,12 @@ namespace ts {
&& !tagNamesAreEquivalent(lastChild.openingElement.tagName, lastChild.closingElement.tagName)
&& tagNamesAreEquivalent(opening.tagName, lastChild.closingElement.tagName)) {
// when an unclosed JsxOpeningElement incorrectly parses its parent's JsxClosingElement,
// restructure (<div>(...<span></div>)) --> (<div>(...<span></span>)</div>)
// restructure (<div>(...<span>...</div>)) --> (<div>(...<span>...</>)</div>)
// (no need to error; the parent will error)
const end = lastChild.openingElement.end; // newly-created children and closing are both zero-width end/end
const end = lastChild.children.end;
const newLast = finishNode(factory.createJsxElement(
lastChild.openingElement,
createNodeArray([], end, end),
lastChild.children,
finishNode(factory.createJsxClosingElement(finishNode(factory.createIdentifier(""), end, end)), end, end)),
lastChild.openingElement.pos,
end);
Expand Down
22 changes: 16 additions & 6 deletions tests/baselines/reference/jsxUnclosedParserRecovery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,12 @@ var donkey = <div>
</div>;
function noCloseBracketTypeArgAttrs() { }
var donkey = <div>
<diddy></></div>;
<diddy>
</></div>;
function noSelfclose() { }
var donkey = <div>
<diddy bananas="please"></></div>;
<diddy bananas="please">
</></div>;
function noSelfcloseTypeArgAttrs() { }
var donkey = <div>
< />
Expand Down Expand Up @@ -234,10 +236,14 @@ var donkey = <div>
</div>;
function noCloseBracketTypeArgAttrsTrailingTag() { }
var donkey = <div>
<diddy></></div>;
<diddy>
<diddy />
</></div>;
function noSelfcloseTrailingTag() { }
var donkey = <div>
<diddy bananas="please"></></div>;
<diddy bananas="please">
<diddy />
</></div>;
function noSelfcloseTypeArgAttrsTrailingTag() { }
var donkey = <div>
<Cranky Wrinkly Funky/>
Expand Down Expand Up @@ -270,8 +276,12 @@ var donkey = <div>
</div>;
function noCloseBracketTypeArgAttrsTrailingText() { }
var donkey = <div>
<diddy></></div>;
<diddy>
Cranky Wrinkly Funky
</></div>;
function noSelfcloseTrailingText() { }
var donkey = <div>
<diddy bananas="please"></></div>;
<diddy bananas="please">
Cranky Wrinkly Funky
</></div>;
function noSelfcloseTypeArgAttrsTrailingText() { }
22 changes: 12 additions & 10 deletions tests/baselines/reference/jsxUnclosedParserRecovery.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,15 @@ var donkey = <div>
>div : any

<diddy>
><diddy> : any
><diddy> <diddy/> : any
>diddy : () => any

<diddy/>
> : any
><diddy/> : any
>diddy : () => any

</div>;
> : any
>div : any

function noSelfcloseTrailingTag() { }
Expand All @@ -355,14 +357,16 @@ var donkey = <div>
>div : any

<diddy<boolean> bananas="please">
><diddy<boolean> bananas="please"> : any
><diddy<boolean> bananas="please"> <diddy/> : any
>diddy : () => any
>bananas : string

<diddy/>
> : any
><diddy/> : any
>diddy : () => any

</div>;
> : any
>div : any

function noSelfcloseTypeArgAttrsTrailingTag() { }
Expand Down Expand Up @@ -508,13 +512,12 @@ var donkey = <div>
>div : any

<diddy>
><diddy> : any
><diddy> Cranky Wrinkly Funky : any
>diddy : () => any

Cranky Wrinkly Funky
> : any

</div>;
> : any
>div : any

function noSelfcloseTrailingText() { }
Expand All @@ -526,14 +529,13 @@ var donkey = <div>
>div : any

<diddy<boolean> bananas="please">
><diddy<boolean> bananas="please"> : any
><diddy<boolean> bananas="please"> Cranky Wrinkly Funky : any
>diddy : () => any
>bananas : string

Cranky Wrinkly Funky
> : any

</div>;
> : any
>div : any

function noSelfcloseTypeArgAttrsTrailingText() { }
Expand Down
8 changes: 8 additions & 0 deletions tests/cases/fourslash/autoCloseFragment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@
//// <>/*8*/</>
////</div>;

// @Filename: /9.tsx
////const x = <p>
//// <>
//// <>/*9*/
//// </>
////</p>

verify.jsxClosingTag({
0: { newText: "</>" },
1: undefined,
Expand All @@ -48,4 +55,5 @@ verify.jsxClosingTag({
6: { newText: "</>" },
7: { newText: "</>" },
8: undefined,
9: { newText: "</>" },
});
8 changes: 8 additions & 0 deletions tests/cases/fourslash/autoCloseTag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@
//// <div>/*8*/</div>
////</div>;

// @Filename: /9.tsx
////const x = <p>
//// <div>
//// <div>/*9*/
//// </div>
////</p>

verify.jsxClosingTag({
0: { newText: "</div>" },
1: undefined,
Expand All @@ -48,4 +55,5 @@ verify.jsxClosingTag({
6: { newText: "</div>" },
7: { newText: "</p>" },
8: undefined,
9: { newText: "</div>" },
});