public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changeset: Simplify `slicerZipperFunc()`

pull/5268/head
Richard Hansen 2021-03-22 20:18:09 -04:00
parent 42d4d8269c
commit efeb69b4ea
1 changed files with 31 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/static/js/Changeset.js
View File

@ -1172,92 +1172,42 @@ exports.composeAttributes = (att1, att2, resultIsMutation, pool) => {
*/ */
const slicerZipperFunc = (attOp, csOp, pool) => { const slicerZipperFunc = (attOp, csOp, pool) => {
const opOut = exports.newOp(); const opOut = exports.newOp();
if (attOp.opcode === '-') { if (!attOp.opcode) {
copyOp(csOp, opOut);
csOp.opcode = '';
} else if (!csOp.opcode) {
copyOp(attOp, opOut); copyOp(attOp, opOut);
attOp.opcode = ''; attOp.opcode = '';
} else if (!attOp.opcode) { } else if (attOp.opcode === '-') {
copyOp(attOp, opOut);
attOp.opcode = '';
} else if (csOp.opcode === '+') {
copyOp(csOp, opOut); copyOp(csOp, opOut);
csOp.opcode = ''; csOp.opcode = '';
} else { } else {
switch (csOp.opcode) { opOut.opcode = {
case '-': '+': {
{ '-': '', // The '-' cancels out (some of) the '+', leaving any remainder for the next call.
if (csOp.chars <= attOp.chars) { '=': '+',
// delete or delete part },
if (attOp.opcode === '=') { '=': {
opOut.opcode = '-'; '-': '-',
opOut.chars = csOp.chars; '=': '=',
opOut.lines = csOp.lines; },
// csOp is a remove op and remove ops normally never have any attributes, so this should }[attOp.opcode][csOp.opcode];
// normally be the empty string. However, padDiff.js adds attributes to remove ops and const [fullyConsumedOp, partiallyConsumedOp] = [attOp, csOp].sort((a, b) => a.chars - b.chars);
// needs them preserved so they are copied here. opOut.chars = fullyConsumedOp.chars;
opOut.attribs = csOp.attribs; opOut.lines = fullyConsumedOp.lines;
} opOut.attribs = csOp.opcode === '-'
attOp.chars -= csOp.chars; // csOp is a remove op and remove ops normally never have any attributes, so this should
attOp.lines -= csOp.lines; // normally be the empty string. However, padDiff.js adds attributes to remove ops and needs
csOp.opcode = ''; // them preserved so they are copied here.
if (!attOp.chars) { ? csOp.attribs
attOp.opcode = ''; : exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
} partiallyConsumedOp.chars -= fullyConsumedOp.chars;
} else { partiallyConsumedOp.lines -= fullyConsumedOp.lines;
// delete and keep going if (!partiallyConsumedOp.chars) partiallyConsumedOp.opcode = '';
if (attOp.opcode === '=') { fullyConsumedOp.opcode = '';
opOut.opcode = '-';
opOut.chars = attOp.chars;
opOut.lines = attOp.lines;
// csOp is a remove op and remove ops normally never have any attributes, so this should
// normally be the empty string. However, padDiff.js adds attributes to remove ops and
// needs them preserved so they are copied here.
opOut.attribs = csOp.attribs;
}
csOp.chars -= attOp.chars;
csOp.lines -= attOp.lines;
attOp.opcode = '';
}
break;
}
case '+':
{
// insert
copyOp(csOp, opOut);
csOp.opcode = '';
break;
}
case '=':
{
if (csOp.chars <= attOp.chars) {
// keep or keep part
opOut.opcode = attOp.opcode;
opOut.chars = csOp.chars;
opOut.lines = csOp.lines;
opOut.attribs = exports.composeAttributes(
attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
csOp.opcode = '';
attOp.chars -= csOp.chars;
attOp.lines -= csOp.lines;
if (!attOp.chars) {
attOp.opcode = '';
}
} else {
// keep and keep going
opOut.opcode = attOp.opcode;
opOut.chars = attOp.chars;
opOut.lines = attOp.lines;
opOut.attribs = exports.composeAttributes(
attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
attOp.opcode = '';
csOp.chars -= attOp.chars;
csOp.lines -= attOp.lines;
}
break;
}
case '':
{
copyOp(attOp, opOut);
attOp.opcode = '';
break;
}
}
} }
return opOut; return opOut;
}; };