Skip to content

Backport redos 3.5.1 #656

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

Open
mukilane wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Backport redos 3.5.1 #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9f00db
Backport https://github.com/kpdecker/jsdiff/pull/647
ExplodingCabbage Jan 20, 2026
2f5bf5e
Backport https://github.com/kpdecker/jsdiff/pull/649
ExplodingCabbage Jan 20, 2026
e8bb422
v3.5.1
mukilane Jan 23, 2026
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "diff",
"version": "3.5.0",
"version": "3.5.1",
"description": "A javascript text diff implementation.",
"keywords": [
"diff",
Expand Down
16 changes: 8 additions & 8 deletions src/patch/parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ export function parsePatch(uniDiff, options = {}) {
}

// Diff index
let header = (/^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/).exec(line);
if (header) {
index.index = header[1];
let headerMatch = (/^(?:Index:|diff(?: -r \w+)+)\s+/).exec(line);
if (headerMatch) {
index.index = line.substring(headerMatch[0].length).trim();
}

i++;
Expand Down Expand Up @@ -53,12 +53,12 @@ export function parsePatch(uniDiff, options = {}) {
// Parses the --- and +++ headers, if none are found, no lines
// are consumed.
function parseFileHeader(index) {
const fileHeader = (/^(---|\+\+\+)\s+(.*)$/).exec(diffstr[i]);
if (fileHeader) {
let keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';
const data = fileHeader[2].split('\t', 2);
const fileHeaderMatch = (/^(---|\+\+\+)\s+/).exec(diffstr[i]);
if (fileHeaderMatch) {
let keyPrefix = fileHeaderMatch[1] === '---' ? 'old' : 'new';
const data = diffstr[i].substring(3).trim().split('\t', 2);
let fileName = data[0].replace(/\\\\/g, '\\');
if (/^".*"$/.test(fileName)) {
if (fileName.startsWith('"') && fileName.endsWith('"')) {
fileName = fileName.substr(1, fileName.length - 2);
}
index[keyPrefix + 'FileName'] = fileName;
Expand Down