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

Changeset: Refactor `appendATextToAssembler()` for readability

pull/5268/head
Richard Hansen 2021-03-21 19:48:30 -04:00
parent ca5bdddc59
commit 42d4d8269c
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1771,33 +1771,26 @@ exports.copyAText = (atext1, atext2) => {
exports.appendATextToAssembler = (atext, assem) => { exports.appendATextToAssembler = (atext, assem) => {
// intentionally skips last newline char of atext // intentionally skips last newline char of atext
const iter = exports.opIterator(atext.attribs); const iter = exports.opIterator(atext.attribs);
let lastOp = null;
while (iter.hasNext()) { while (iter.hasNext()) {
const op = iter.next(); if (lastOp != null) assem.append(lastOp);
if (!iter.hasNext()) { lastOp = iter.next();
// last op, exclude final newline
if (op.lines <= 1) {
op.lines = 0;
op.chars--;
if (op.chars) {
assem.append(op);
}
} else {
const nextToLastNewlineEnd =
atext.text.lastIndexOf('\n', atext.text.length - 2) + 1;
const lastLineLength = atext.text.length - nextToLastNewlineEnd - 1;
op.lines--;
op.chars -= (lastLineLength + 1);
assem.append(op);
op.lines = 0;
op.chars = lastLineLength;
if (op.chars) {
assem.append(op);
}
}
} else {
assem.append(op);
}
} }
if (lastOp == null) return;
// exclude final newline
if (lastOp.lines <= 1) {
lastOp.lines = 0;
lastOp.chars--;
} else {
const nextToLastNewlineEnd = atext.text.lastIndexOf('\n', atext.text.length - 2) + 1;
const lastLineLength = atext.text.length - nextToLastNewlineEnd - 1;
lastOp.lines--;
lastOp.chars -= (lastLineLength + 1);
assem.append(lastOp);
lastOp.lines = 0;
lastOp.chars = lastLineLength;
}
if (lastOp.chars) assem.append(lastOp);
}; };
/** /**