vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-12 21:10:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add additional patch methods in jsdiff

Browse Source 
* Add `IUniDiff` struct, representing a unified diff
* Add `IHunk` struct, representing a section of modified lines and context
* Fix `createPatch` optional `options` argument
* Fix `applyPatch` to accept either a patch string, IUniDiff or IUniDiff array
* Add `createTwoFilesPatch`, `structuredPatch` and `applyPatches`
* Add test code for these new functions
This commit is contained in:
ScottSWu
2016-08-09 16:21:39 -07:00
parent 5ff2770b38
commit 2fb8651931
2 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diff/diff-tests.ts
+40 -1
View File
@@ -49,5 +49,44 @@ function printDiff(diff:jsdiff.IDiffResult[]) {
console.log(addLineHeader(" ", part.value));
}
});
}
}
function verifyPatchMethods(oldStr: string, newStr: string, uniDiff: jsdiff.IUniDiff) {
var verifyPatch = jsdiff.parsePatch(
jsdiff.createTwoFilesPatch("oldFile.ts", "newFile.ts", oldStr, newStr,
"old", "new", { context: 1 }));
if (JSON.stringify(verifyPatch) !== JSON.stringify(uniDiff)) {
console.error("Patch did not match uniDiff");
}
}
function verifyApplyMethods(oldStr: string, newStr: string, uniDiff: jsdiff.IUniDiff) {
var verifyApply = [
jsdiff.applyPatch(oldStr, uniDiff),
jsdiff.applyPatch(oldStr, [uniDiff])
];
jsdiff.applyPatches([uniDiff], {
loadFile: (index: number, callback: (err: Error, data: string) => void) => {
callback(undefined, one);
},
patched: (index: number, content: string) => {
verifyApply.push(content);
},
complete: (err?: Error) => {
if (err) {
console.error(err);
}
verifyApply.forEach(result => {
if (result !== newStr) {
console.error("Result did not match newStr");
}
});
}
});
}
verifyPatchMethods(one, other, uniDiff);
var uniDiff = jsdiff.structuredPatch("oldFile.ts", "newFile.ts", one, other,
"old", "new", { context: 1 });
verifyApplyMethods(one, other, uniDiff);