-
Notifications
You must be signed in to change notification settings - Fork 121
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
Improve line-endings for windows. #296
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jaapio
force-pushed
the
fix/287-line-endings
branch
2 times, most recently
from
August 26, 2021 20:13
6684643
to
1e51a49
Compare
jaapio
force-pushed
the
fix/287-line-endings
branch
from
August 26, 2021 20:24
1e51a49
to
653fed4
Compare
jaapio
force-pushed
the
fix/287-line-endings
branch
from
August 26, 2021 20:32
653fed4
to
6fa60f9
Compare
jaapio
commented
Aug 26, 2021
@@ -146,7 +145,7 @@ private function lex(string $contents): array | |||
*/ | |||
private function removeSuperfluousStartingWhitespace(string $contents): string | |||
{ | |||
$lines = explode("\n", $contents); | |||
$lines = Utils::pregSplit("/\r\n?|\n/", $contents); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This an actual bugfix. windows line endings were not handled here.
jaapio
commented
Aug 26, 2021
@@ -96,7 +101,7 @@ public function getDocComment(DocBlock $docblock): string | |||
|
|||
$comment = $this->addTagBlock($docblock, $wrapLength, $indent, $comment); | |||
|
|||
return $comment . $indent . ' */'; | |||
return str_replace("\n", $this->lineEnding, $comment . $indent . ' */'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
new feature :-)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Switch to internal usage of normalized line endings using
\n
. This make testing of the library easier and will fit most use cases. When users want to reconstruct the processed docblocks, the recommendation is to use the serializer. Which configurable with the correct line endings from this patch.fixes #287