mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Changeset: Replace appendATextToAssembler() with a generator

Browse source
This commit is contained in:
Richard Hansen 2021-10-25 01:16:46 -04:00
parent 9cd59a84af
commit d74dd235a4
5 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/static/js/Changeset.js
View file

@ -1718,17 +1718,18 @@ exports.copyAText = (atext1, atext2) => {
};
/**
* Append the set of operations from atext to an assembler.
* Convert AText to a series of operations.
*
* @param {AText} atext -
* @param assem - Assembler like SmartOpAssembler TODO add desc
* @param {AText} atext - The AText to convert.
* @yields {Op}
* @returns {Generator<Op>}
*/
exports.appendATextToAssembler = (atext, assem) => {
exports.opsFromAText = function* (atext) {
// intentionally skips last newline char of atext
const iter = exports.opIterator(atext.attribs);
let lastOp = null;
while (iter.hasNext()) {
if (lastOp != null) assem.append(lastOp);
if (lastOp != null) yield lastOp;
lastOp = iter.next();
}
if (lastOp == null) return;
@ -1741,11 +1742,24 @@ exports.appendATextToAssembler = (atext, assem) => {
const lastLineLength = atext.text.length - nextToLastNewlineEnd - 1;
lastOp.lines--;
lastOp.chars -= (lastLineLength + 1);
assem.append(lastOp);
yield copyOp(lastOp);
lastOp.lines = 0;
lastOp.chars = lastLineLength;
}
if (lastOp.chars) assem.append(lastOp);
if (lastOp.chars) yield lastOp;
};
/**
* Append the set of operations from atext to an assembler.
*
* @deprecated Use `opsFromAText` instead.
* @param {AText} atext -
* @param assem - Assembler like SmartOpAssembler TODO add desc
*/
exports.appendATextToAssembler = (atext, assem) => {
padutils.warnWithStack(
'Changeset.appendATextToAssembler() is deprecated; use Changeset.opsFromAText() instead');
for (const op of exports.opsFromAText(atext)) assem.append(op);
};
/**

2
src/static/js/ace2_inner.js
View file

@ -530,7 +530,7 @@ function Ace2Inner(editorInfo, cssManagers) {
o.chars = lastLineLength;
o.lines = 0;
assem.append(o);
Changeset.appendATextToAssembler(atext, assem);
for (const op of Changeset.opsFromAText(atext)) assem.append(op);
const newLen = oldLen + assem.getLengthChange();
const changeset = Changeset.checkRep(
Changeset.pack(oldLen, newLen, assem.toString(), atext.text.slice(0, -1)));