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

commented Jul 31, 2018

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 Jul 31, 2018

@lipis
lipis approved these changes Jul 31, 2018

@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

@j-f1
j-f1 approved these changes Jul 31, 2018

@ikatyang ikatyang merged commit 10df246 into prettier:master Aug 1, 2018

10 checks passed

ci/circleci: build_prod Your tests passed on CircleCI!
Details
ci/circleci: checkout_code Your tests passed on CircleCI!
Details
ci/circleci: test_prod_node4 Your tests passed on CircleCI!
Details
ci/circleci: test_prod_node9 Your tests passed on CircleCI!
Details
ci/circleci: test_prod_standalone Your tests passed on CircleCI!
Details
codecov/patch 100% of diff hit (target 80%)
Details
codecov/project 96.48% (+<.01%) compared to 4b8e18f
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details

@ikatyang ikatyang deleted the ikatyang:feat/yaml-single-line-mapping-item branch Aug 1, 2018

@kachkaev

This comment has been minimized.

Copy link
Contributor

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

This comment has been minimized.

Copy link
Member

commented Aug 2, 2018

Let's do 1.14.1 :)

@kachkaev

This comment has been minimized.

Copy link
Contributor

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

This comment has been minimized.

Copy link
Member Author

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

This comment has been minimized.

Copy link
Member Author

commented Aug 8, 2018

Just released 1.14.1, sorry for the delay.

@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.
Projects
None yet
5 participants
You can’t perform that action at this time.