nodejs
diff --git a/‎lib/internal/assert/assertion_error.js‎
Lines changed: 138 additions & 242 deletions b/‎lib/internal/assert/assertion_error.js‎
Lines changed: 138 additions & 242 deletions
diff --git a/‎lib/internal/assert/myers_diff.js‎
Lines changed: 167 additions & 0 deletions b/‎lib/internal/assert/myers_diff.js‎
Lines changed: 167 additions & 0 deletions
diff --git a/‎test/parallel/test-assert-checktag.js‎
Lines changed: 8 additions & 2 deletions b/‎test/parallel/test-assert-checktag.js‎
Lines changed: 8 additions & 2 deletions
@@ -0,0 +1,167 @@
+'use strict';
+
+const {
+  Array,
+  ArrayPrototypeFill,
+  ArrayPrototypePush,
+  ArrayPrototypeSlice,
+  StringPrototypeEndsWith,
+} = primordials;
+
+const colors = require('internal/util/colors');
+
+const kNopLinesToCollapse = 5;
+
+function areLinesEqual(actual, expected, checkCommaDisparity) {
+  if (actual === expected) {
+    return true;
+  }
+  if (checkCommaDisparity) {
+    return `${actual},` === expected || actual === `${expected},`;
+  }
+  return false;
+}
+
+function myersDiff(actual, expected, checkCommaDisparity = false) {
+  const actualLength = actual.length;
+  const expectedLength = expected.length;
+  const max = actualLength + expectedLength;
+  const v = ArrayPrototypeFill(Array(2 * max + 1), 0);
+
+  const trace = [];
+
+  for (let diffLevel = 0; diffLevel <= max; diffLevel++) {
+    const newTrace = ArrayPrototypeSlice(v);
+    ArrayPrototypePush(trace, newTrace);
+
+    for (let diagonalIndex = -diffLevel; diagonalIndex <= diffLevel; diagonalIndex += 2) {
+      let x;
+      if (diagonalIndex === -diffLevel ||
+        (diagonalIndex !== diffLevel && v[diagonalIndex - 1 + max] < v[diagonalIndex + 1 + max])) {
+        x = v[diagonalIndex + 1 + max];
+      } else {
+        x = v[diagonalIndex - 1 + max] + 1;
+      }
+
+      let y = x - diagonalIndex;
+
+      while (x < actualLength && y < expectedLength && areLinesEqual(actual[x], expected[y], checkCommaDisparity)) {
+        x++;
+        y++;
+      }
+
+      v[diagonalIndex + max] = x;
+
+      if (x >= actualLength && y >= expectedLength) {
+        return backtrack(trace, actual, expected, checkCommaDisparity);
+      }
+    }
+  }
+}
+
+function backtrack(trace, actual, expected, checkCommaDisparity) {
+  const actualLength = actual.length;
+  const expectedLength = expected.length;
+  const max = actualLength + expectedLength;
+
+  let x = actualLength;
+  let y = expectedLength;
+  const result = [];
+
+  for (let diffLevel = trace.length - 1; diffLevel >= 0; diffLevel--) {
+    const v = trace[diffLevel];
+    const diagonalIndex = x - y;
+    let prevDiagonalIndex;
+
+    if (diagonalIndex === -diffLevel ||
+      (diagonalIndex !== diffLevel && v[diagonalIndex - 1 + max] < v[diagonalIndex + 1 + max])) {
+      prevDiagonalIndex = diagonalIndex + 1;
+    } else {
+      prevDiagonalIndex = diagonalIndex - 1;
+    }
+
+    const prevX = v[prevDiagonalIndex + max];
+    const prevY = prevX - prevDiagonalIndex;
+
+    while (x > prevX && y > prevY) {
+      const value = !checkCommaDisparity ||
+        StringPrototypeEndsWith(actual[x - 1], ',') ? actual[x - 1] : expected[y - 1];
+      ArrayPrototypePush(result, { __proto__: null, type: 'nop', value });
+      x--;
+      y--;
+    }
+
+    if (diffLevel > 0) {
+      if (x > prevX) {
+        ArrayPrototypePush(result, { __proto__: null, type: 'insert', value: actual[x - 1] });
+        x--;
+      } else {
+        ArrayPrototypePush(result, { __proto__: null, type: 'delete', value: expected[y - 1] });
+        y--;
+      }
+    }
+  }
+
+  return result;
+}
+
+function printSimpleMyersDiff(diff) {
+  let message = '';
+
+  for (let diffIdx = diff.length - 1; diffIdx >= 0; diffIdx--) {
+    const { type, value } = diff[diffIdx];
+    if (type === 'insert') {
+      message += `${colors.green}${value}${colors.white}`;
+    } else if (type === 'delete') {
+      message += `${colors.red}${value}${colors.white}`;
+    } else {
+      message += `${colors.white}${value}${colors.white}`;
+    }
+  }
+
+  return `\n${message}`;
+}
+
+function printMyersDiff(diff, simple = false) {
+  let message = '';
+  let skipped = false;
+  let nopCount = 0;
+
+  for (let diffIdx = diff.length - 1; diffIdx >= 0; diffIdx--) {
+    const { type, value } = diff[diffIdx];
+    const previousType = (diffIdx < (diff.length - 1)) ? diff[diffIdx + 1].type : null;
+    const typeChanged = previousType && (type !== previousType);
+
+    if (typeChanged && previousType === 'nop') {
+      // Avoid grouping if only one line would have been grouped otherwise
+      if (nopCount === kNopLinesToCollapse + 1) {
+        message += `${colors.white}  ${diff[diffIdx + 1].value}\n`;
+      } else if (nopCount === kNopLinesToCollapse + 2) {
+        message += `${colors.white}  ${diff[diffIdx + 2].value}\n`;
+        message += `${colors.white}  ${diff[diffIdx + 1].value}\n`;
+      } if (nopCount >= (kNopLinesToCollapse + 3)) {
+        message += `${colors.blue}...${colors.white}\n`;
+        message += `${colors.white}  ${diff[diffIdx + 1].value}\n`;
+        skipped = true;
+      }
+      nopCount = 0;
+    }
+
+    if (type === 'insert') {
+      message += `${colors.green}+${colors.white} ${value}\n`;
+    } else if (type === 'delete') {
+      message += `${colors.red}-${colors.white} ${value}\n`;
+    } else if (type === 'nop') {
+      if (nopCount < kNopLinesToCollapse) {
+        message += `${colors.white}  ${value}\n`;
+      }
+      nopCount++;
+    }
+  }
+
+  message = message.trimEnd();
+
+  return { message: `\n${message}`, skipped };
+}
+
+module.exports = { myersDiff, printMyersDiff, printSimpleMyersDiff };
@@ -29,14 +29,20 @@ test('', { skip: !hasCrypto }, () => {
       () => assert.deepStrictEqual(date, fake),
       {
         message: 'Expected values to be strictly deep-equal:\n' +
-                '+ actual - expected\n\n+ 2016-01-01T00:00:00.000Z\n- Date {}'
+        '+ actual - expected\n' +
+        '\n' +
+        '+ 2016-01-01T00:00:00.000Z\n' +
+        '- Date {}\n'
       }
     );
     assert.throws(
       () => assert.deepStrictEqual(fake, date),
       {
         message: 'Expected values to be strictly deep-equal:\n' +
-                '+ actual - expected\n\n+ Date {}\n- 2016-01-01T00:00:00.000Z'
+        '+ actual - expected\n' +
+        '\n' +
+        '+ Date {}\n' +
+        '- 2016-01-01T00:00:00.000Z\n'
       }
     );
   }
Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,20 @@ test('', { skip: !hasCrypto }, () => {`
`29`	`29`	`() => assert.deepStrictEqual(date, fake),`
`30`	`30`	`{`
`31`	`31`	`message: 'Expected values to be strictly deep-equal:\n' +`
`32`		`- '+ actual - expected\n\n+ 2016-01-01T00:00:00.000Z\n- Date {}'`
	`32`	`+ '+ actual - expected\n' +`
	`33`	`+ '\n' +`
	`34`	`+ '+ 2016-01-01T00:00:00.000Z\n' +`
	`35`	`+ '- Date {}\n'`
`33`	`36`	`}`
`34`	`37`	`);`
`35`	`38`	`assert.throws(`
`36`	`39`	`() => assert.deepStrictEqual(fake, date),`
`37`	`40`	`{`
`38`	`41`	`message: 'Expected values to be strictly deep-equal:\n' +`
`39`		`- '+ actual - expected\n\n+ Date {}\n- 2016-01-01T00:00:00.000Z'`
	`42`	`+ '+ actual - expected\n' +`
	`43`	`+ '\n' +`
	`44`	`+ '+ Date {}\n' +`
	`45`	`+ '- 2016-01-01T00:00:00.000Z\n'`
`40`	`46`	`}`
`41`	`47`	`);`
`42`	`48`	`}`