syndicate-lang
/
syndicate-2017
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve patch pretty-printing

This commit is contained in:
Tony Garnock-Jones 2016-02-06 21:56:47 -05:00
parent 6d028f00c5
commit e02755c701
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/patch.js
View File

@ -229,9 +229,9 @@ Patch.prototype.projectObjects = function (compiledProjection) {
};
Patch.prototype.pretty = function () {
return ("<<<<<<<< Removed:\n" + Route.prettyTrie(this.removed) +
"======== Added:\n" + Route.prettyTrie(this.added) +
">>>>>>>>\n");
return ("<<<<<<<< Removed:\n" + Route.prettyTrie(this.removed) + "\n" +
"======== Added:\n" + Route.prettyTrie(this.added) + "\n" +
">>>>>>>>");
}
///////////////////////////////////////////////////////////////////////////

6
js/test/test-mux.js
View File

@ -16,9 +16,9 @@ function checkPrettyTrie(m, expected) {
function checkPrettyPatch(p, expectedAdded, expectedRemoved) {
expect(p.pretty()).to.equal(
('<<<<<<<< Removed:\n' + expectedRemoved.join('\n') +
'======== Added:\n' + expectedAdded.join('\n') +
'>>>>>>>>\n'));
('<<<<<<<< Removed:\n' + expectedRemoved.join('\n') + '\n' +
'======== Added:\n' + expectedAdded.join('\n') + '\n' +
'>>>>>>>>'));
}
function getM() {

6
js/test/test-patch.js
View File

@ -11,9 +11,9 @@ var _$ = Route._$;
function checkPrettyPatch(p, expectedAdded, expectedRemoved) {
expect(p.pretty()).to.equal(
('<<<<<<<< Removed:\n' + expectedRemoved.join('\n') +
'======== Added:\n' + expectedAdded.join('\n') +
'>>>>>>>>\n'));
('<<<<<<<< Removed:\n' + expectedRemoved.join('\n') + '\n' +
'======== Added:\n' + expectedAdded.join('\n') + '\n' +
'>>>>>>>>'));
}
describe('basic patch compilation', function () {