65 lines
2.6 KiB
JavaScript
65 lines
2.6 KiB
JavaScript
import Diff from './base.js';
|
|
import { generateOptions } from '../util/params.js';
|
|
class LineDiff extends Diff {
|
|
constructor() {
|
|
super(...arguments);
|
|
this.tokenize = tokenize;
|
|
}
|
|
equals(left, right, options) {
|
|
// If we're ignoring whitespace, we need to normalise lines by stripping
|
|
// whitespace before checking equality. (This has an annoying interaction
|
|
// with newlineIsToken that requires special handling: if newlines get their
|
|
// own token, then we DON'T want to trim the *newline* tokens down to empty
|
|
// strings, since this would cause us to treat whitespace-only line content
|
|
// as equal to a separator between lines, which would be weird and
|
|
// inconsistent with the documented behavior of the options.)
|
|
if (options.ignoreWhitespace) {
|
|
if (!options.newlineIsToken || !left.includes('\n')) {
|
|
left = left.trim();
|
|
}
|
|
if (!options.newlineIsToken || !right.includes('\n')) {
|
|
right = right.trim();
|
|
}
|
|
}
|
|
else if (options.ignoreNewlineAtEof && !options.newlineIsToken) {
|
|
if (left.endsWith('\n')) {
|
|
left = left.slice(0, -1);
|
|
}
|
|
if (right.endsWith('\n')) {
|
|
right = right.slice(0, -1);
|
|
}
|
|
}
|
|
return super.equals(left, right, options);
|
|
}
|
|
}
|
|
export const lineDiff = new LineDiff();
|
|
export function diffLines(oldStr, newStr, options) {
|
|
return lineDiff.diff(oldStr, newStr, options);
|
|
}
|
|
export function diffTrimmedLines(oldStr, newStr, options) {
|
|
options = generateOptions(options, { ignoreWhitespace: true });
|
|
return lineDiff.diff(oldStr, newStr, options);
|
|
}
|
|
// Exported standalone so it can be used from jsonDiff too.
|
|
export function tokenize(value, options) {
|
|
if (options.stripTrailingCr) {
|
|
// remove one \r before \n to match GNU diff's --strip-trailing-cr behavior
|
|
value = value.replace(/\r\n/g, '\n');
|
|
}
|
|
const retLines = [], linesAndNewlines = value.split(/(\n|\r\n)/);
|
|
// Ignore the final empty token that occurs if the string ends with a new line
|
|
if (!linesAndNewlines[linesAndNewlines.length - 1]) {
|
|
linesAndNewlines.pop();
|
|
}
|
|
// Merge the content and line separators into single tokens
|
|
for (let i = 0; i < linesAndNewlines.length; i++) {
|
|
const line = linesAndNewlines[i];
|
|
if (i % 2 && !options.newlineIsToken) {
|
|
retLines[retLines.length - 1] += line;
|
|
}
|
|
else {
|
|
retLines.push(line);
|
|
}
|
|
}
|
|
return retLines;
|
|
}
|