Skip to content

De-duplicate indentations in JSX Texts - #36552

Merged
Orta Therox (orta) merged 6 commits into
microsoft:masterfrom
orta:fix_20766
Feb 3, 2020
Merged

De-duplicate indentations in JSX Texts#36552
Orta Therox (orta) merged 6 commits into
microsoft:masterfrom
orta:fix_20766

Conversation

@orta

@orta Orta Therox (orta) commented Jan 31, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes #20766 - Some of the interesting notes are in orta#1

@weswigham
Offload all jsx text indentation handling to indentMultilineCommentOr…
b5725bb 
…JsxText
@orta
Merge pull request #1 from weswigham/small-patch-to-fix
d81fe3c 
Offload all jsx text indentation handling to indentMultilineCommentOrJsxText
@orta
Orta Therox (orta) marked this pull request as ready for review February 2, 2020 12:38
@orta Orta Therox (orta) changed the title Refine the token size of JSX Texts to fix formatting issues De-duplicate indentations in JSX Texts Feb 2, 2020
andrewbranch
Andrew Branch (andrewbranch) approved these changes Feb 3, 2020
View reviewed changes

@andrewbranch Andrew Branch (andrewbranch) left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Comment thread src/services/formatting/formatting.ts Outdated
@orta
Orta Therox (orta) merged commit 7726464 into microsoft:master Feb 3, 2020
@orta

Orta Therox (orta) commented Feb 3, 2020

Copy link
Copy Markdown
Contributor Author

TypeScript Bot (@typescript-bot) cherry-pick this to branchname release-3.8

@typescript-bot

TypeScript Bot (typescript-bot) commented Feb 3, 2020

Copy link
Copy Markdown
Contributor

Heya Orta Therox (@orta), I couldn't find the branch 'branchname' on Microsoft/TypeScript. You may need to make it and try again.

@orta

Orta Therox (orta) commented Feb 3, 2020

Copy link
Copy Markdown
Contributor Author

TypeScript Bot (@typescript-bot) cherry-pick this to release-3.8

1 similar comment
@weswigham

Wesley Wigham (weswigham) commented Feb 3, 2020

Copy link
Copy Markdown
Member

TypeScript Bot (@typescript-bot) cherry-pick this to release-3.8

@DanielRosenwasser

Daniel Rosenwasser (DanielRosenwasser) commented Feb 5, 2020

Copy link
Copy Markdown
Member

TypeScript Bot (@typescript-bot) cherry-pick this to release-3.8 and LKG

Daniel Rosenwasser (DanielRosenwasser) pushed a commit that referenced this pull request Feb 5, 2020
Orta @weswigham @DanielRosenwasser
De-duplicate indentations in JSX Texts (#36552)
eaf97e0 
* WIP on making the JSX text node not include whitespace

* Scans to the last newline for JSX correctly

* Handle JSX closing element wrapping

* Offload all jsx text indentation handling to indentMultilineCommentOrJsxText

* Switch from find node -> find inde in formatting

Co-authored-by: Wesley Wigham <wwigham@gmail.com>
@orta

Orta Therox (orta) commented Feb 6, 2020

Copy link
Copy Markdown
Contributor Author

Thanks, was just coming to do that

@DanielRosenwasser

Daniel Rosenwasser (DanielRosenwasser) commented Feb 6, 2020

Copy link
Copy Markdown
Member

Woah, hold up, this thing doesn't make PRs anymore Wesley Wigham (@weswigham)?

@weswigham

Wesley Wigham (weswigham) commented Feb 6, 2020

Copy link
Copy Markdown
Member

Uhhh, that's news to me, especially since I had it open a PR (#36644) just the other day after it was updated.

@weswigham

Wesley Wigham (weswigham) commented Feb 6, 2020

Copy link
Copy Markdown
Member

I think I'm being lied to and that Orta Therox (@orta) manually cherry-picked it, since the cherry-pick script in this branch is out of date :P (y'know, since the last build for this branch is a failure)

@microsoft Microsoft (microsoft) locked as resolved and limited conversation to collaborators Oct 21, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@andrewbranch Andrew Branch (andrewbranch) andrewbranch approved these changes
@sandersn Nathan Shively-Sanders (sandersn) Awaiting requested review from sandersn
@rbuckton Ron Buckton (rbuckton) Awaiting requested review from rbuckton

Assignees

@orta Orta Therox (orta)

Labels

Author: Team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

JSX formatting does not de-indent closing tag with text body

5 participants

@orta @typescript-bot @weswigham @DanielRosenwasser @andrewbranch