Skip to content
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

feat(yaml): do not put singleline values on a separate line from the key #4916

Merged

Conversation

ikatyang
Copy link
Member

Fixes #4913

Only apply to alias and plain/quoteSingle/quoteDouble with

  • no backslash newline
  • or no literal newline and proseWrap: preserve
  • or no newline and proseWrap: never
  • or no whitespace and proseWrap: always

in mapping items with implicit key, otherwise it's impossible to do prose wrapping.

@ikatyang ikatyang requested a review from lipis July 31, 2018 09:23
@j-f1 j-f1 changed the title feay(yaml): do not put singleline values on a separate line from the key feat(yaml): do not put singleline values on a separate line from the key Jul 31, 2018
@ikatyang ikatyang merged commit 10df246 into prettier:master Aug 1, 2018
@ikatyang ikatyang deleted the feat/yaml-single-line-mapping-item branch August 1, 2018 16:15
@kachkaev
Copy link
Member

kachkaev commented Aug 2, 2018

Many thanks for this PR @ikatyang! Are you planning to release this in 1.14.1 or will the fix have to wait till 1.15.0?

@lipis
Copy link
Member

lipis commented Aug 2, 2018

Let's do 1.14.1 :)

@kachkaev
Copy link
Member

kachkaev commented Aug 2, 2018

@lipis that'd be great! The sooner the release, the fewer projects will contain two commits with quite a lot of zero-sum diffing 😄

@ikatyang
Copy link
Member Author

ikatyang commented Aug 2, 2018

Probably in one day or two, I'd like to get #4861 and #4919 fixed, and we should fix the release script (#4905) before releasing so that we don't need to release it manually.

@ikatyang
Copy link
Member Author

ikatyang commented Aug 8, 2018

Just released 1.14.1, sorry for the delay.

@lock lock bot added the locked-due-to-inactivity Please open a new issue and fill out the template instead of commenting. label Nov 6, 2018
@lock lock bot locked as resolved and limited conversation to collaborators Nov 6, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
locked-due-to-inactivity Please open a new issue and fill out the template instead of commenting.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants