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

JSDoc: Fixed line ends #2523

Merged
merged 1 commit into from
Aug 31, 2020

Conversation

RunDevelopment
Copy link
Member

In two recent pull requests, we had this issue.

This is a temporary fix to adjust the wrong line ends until the issue is fixed upstream.

I would like to merge this soon because it can really hinder contributors because is prevents the CI from passing (which is a requirement to merge any pull request).

@mAAdhaTTah

Copy link
Member

@mAAdhaTTah mAAdhaTTah left a comment

Choose a reason for hiding this comment

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

Cursory review of the links PRs suggest this isn't related to the input files, correct? If not, then good to merge. Does seem weird they're generated CLRF line endings from LF input files.

@RunDevelopment
Copy link
Member Author

It does depend on the line ends of the input file. If the input file uses LF, everything will be fine but under Windows, you can configure git to checkout code and convert the line ends to CRLF (which is the default I think?).

Also, it doesn't generate CRLF from LF. It generates CR from CRLF which is the problem.

@RunDevelopment
Copy link
Member Author

@mAAdhaTTah Is this good to merge?

@mAAdhaTTah
Copy link
Member

Yeah go for it.

@RunDevelopment RunDevelopment merged commit bf169e5 into PrismJS:master Aug 31, 2020
@RunDevelopment RunDevelopment deleted the jsdoc-line-ends-fix branch August 31, 2020 15:49
quentinvernot pushed a commit to TankerHQ/prismjs that referenced this pull request Sep 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants