Skip to content

fix: error throwing when apply patch to empty string #78

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
merged 1 commit into from
Sep 30, 2015
Merged

fix: error throwing when apply patch to empty string #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/patch/apply.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function applyPatch(source, uniDiff, options = {}) {
lines.splice(toPos, 0, content);
toPos++;
} else if (operation === '\\') {
let previousOperation = hunk.lines[j - 1][0];
let previousOperation = hunk.lines[j - 1] ? hunk.lines[j - 1][0] : null;
if (previousOperation === '+') {
removeEOFNL = true;
} else if (previousOperation === '-') {
Expand Down
17 changes: 17 additions & 0 deletions test/patch/apply.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,23 @@ describe('patch/apply', function() {
const diffed = createPatch('test', oldtext, newtext);
expect(applyPatch(oldtext, diffed)).to.equal(newtext);
});

it('handle empty text', function() {
const oldtext = '';
const newtext = 'asdasd\n';

const diffed = createPatch('test', oldtext, newtext);
expect(applyPatch(oldtext, diffed)).to.equal(newtext);
});

it('handle two common text', function() {
const oldtext = 's';
const newtext = 'sdfsdf\n';
const diffed = createPatch('test', oldtext, newtext);
expect(applyPatch(oldtext, diffed)).to.equal(newtext);
});


});

describe('#applyPatches', function() {
Expand Down