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

fix(markdown): handle CRLF correctly #5414

Merged
merged 2 commits into from Nov 10, 2018

Conversation

@ikatyang
Copy link
Member

commented Nov 9, 2018

Fixes #5413

We should figure out a better way to completely get rid of CRLF, but I think it needs more time since we don't want to break something like rangeFormat or cusorOffset.

  • I’ve added tests to confirm my change works.
  • (If changing the API or CLI) I’ve documented the changes I’ve made (in the docs/ directory)
  • I’ve read the contributing guidelines.

Try the playground for this PR

@ikatyang ikatyang added this to the 1.15.2 milestone Nov 9, 2018

@schallm

This comment has been minimized.

Copy link

commented Nov 9, 2018

Not sure if this should work (I have never used the playground before), but I tried the following markdown (small version of same issue we are currently seeing) in the playground:

- Option 1
    ```cmd
    dir c:\
    dir d:\
    ```

and received the following error in the output frame:

SyntaxError: Unexpected token, expected ";" (1:10)
> 1 | - Option 1
    |          ^
  2 |     ```cmd
  3 |     dir c:\
  4 |     dir d:\
@j-f1

This comment has been minimized.

Copy link
Member

commented Nov 9, 2018

@schallm You have to select the markdown parser for it to work.

@lipis
lipis approved these changes Nov 10, 2018

@ikatyang ikatyang merged commit 2bb95d8 into prettier:master Nov 10, 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 97.03% (+0%) compared to 12a8fa3
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:fix/markdown/crlf branch Nov 10, 2018

@lock lock bot locked as resolved and limited conversation to collaborators Feb 8, 2019

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
4 participants
You can’t perform that action at this time.