Skip to content

Stop treating stuff like vertical tabs as line breaks when dealing with unified diffs #435

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.

Sign up for GitHub

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

Merged
ExplodingCabbage merged 5 commits into from
Dec 27, 2023
Merged

Stop treating stuff like vertical tabs as line breaks when dealing with unified diffs #435

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4507160
Add test of vertical tab handling
ExplodingCabbage Dec 20, 2023
0e5bed8
Stop treating stuff like vertical tabs as line breaks when dealing wi…
ExplodingCabbage Dec 20, 2023
3705d2b
Merge branch '6.0.0-staging' into rip-out-handling-for-vertical-tabs-…
ExplodingCabbage Dec 27, 2023
a62a2b4
Add release notes
ExplodingCabbage Dec 27, 2023
be9ad3c
Add a consistency test
ExplodingCabbage Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add release notes
  • Loading branch information
@ExplodingCabbage
ExplodingCabbage committed Dec 27, 2023
commit a62a2b4d752c9c9c4f22a9552111c1dd65b017de
6 changes: 6 additions & 0 deletions release-notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release Notes

## Future breaking 6.0.0 release

[Commits](https://github.com/kpdecker/jsdiff/compare/master...v6.0.0-staging)

- [#435](https://github.com/kpdecker/jsdiff/pull/435) Fix `parsePatch` handling of control characters. `parsePatch` used to interpret various unusual control characters - namely vertical tabs, form feeds, lone carriage returns without a line feed, and EBCDIC NELs - as line breaks when parsing a patch file. This was inconsistent with the behavior of both JsDiff's own `diffLines` method and also the Unix `diff` and `patch` utils, which all simply treat those control characters as ordinary characters. The result of this discrepancy was that some well-formed patches - produced either by `diff` or by JsDiff itself and handled properly by the `patch` util - would be wrongly parsed by `parsePatch`, with the effect that it would disregard the remainder of a hunk after encountering one of these control characters.

## Development

[Commits](https://github.com/kpdecker/jsdiff/compare/v5.1.0...master)
Expand Down