-
Notifications
You must be signed in to change notification settings - Fork 509
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
Remove linedelimiters, improve handling of Windows vs Unix line endings #518
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
…riginal location and places I dumbly copied it to
ryota-ka
added a commit
to ryota-ka/DefinitelyTyped
that referenced
this pull request
Oct 1, 2024
ryota-ka
added a commit
to ryota-ka/DefinitelyTyped
that referenced
this pull request
Oct 8, 2024
ryota-ka
added a commit
to ryota-ka/DefinitelyTyped
that referenced
this pull request
Oct 8, 2024
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.
The
linedelimiters
property was added to patch objects in #141 / #144 but IMO it never made any sense. I take several issues with it:\r
character at the end of a line would be simpler.toPos
use camelCase, butlinedelimiters
is all lowercase for some reason.linedelimiters
added, jsdiff had no sensible support for Windows-Unix interoperability.To spell out what I mean by the last point, consider what happens when we try to apply this patch, with Unix line endings...
... to this source file, with Windows line endings:
We get this result:
Is this useful to anyone? The logic introduced in #144 means that this doesn't outright fail to apply due to the line ending mismatch, but instead we end up with output that's mixing Windows-style and Unix-style line endings. Surely that's never what anyone's going to want? If we're going to make a Unix-style patch be applicable to a Windows-style text file, then we should go the whole way and have the inserted lines end up with Windows-style line endings too - otherwise we're simply broken in a more complicated way than if the patch outright failed to apply, like I think it would've done before #144.
This PR makes jsdiff go the whole way: we now, by default, automatically convert a patch being applied to use the line ending style of the file being patched.
Resolves #434