yonote/yjs
24
0
Fork 0
Code Pull Requests 1 Releases Activity

fix gc regression issue & add another breaking condition for the integration algorithm

Browse Source
This commit is contained in:
Kevin Jahns 2020-06-18 00:31:25 +02:00
parent 6dd26d3b48
commit d7a11ccf4d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/structs/Item.js
View File

@ -355,6 +355,9 @@ export class Item extends AbstractStruct {
this.right = getItemCleanStart(transaction, this.rightOrigin) this.right = getItemCleanStart(transaction, this.rightOrigin)
this.rightOrigin = this.right.id this.rightOrigin = this.right.id
} }
if ((this.left && this.left.constructor === GC) || (this.right && this.right.constructor === GC)) {
this.parent = null
}
// only set parent if this shouldn't be garbage collected // only set parent if this shouldn't be garbage collected
if (!this.parent) { if (!this.parent) {
if (this.left && this.left.constructor === Item) { if (this.left && this.left.constructor === Item) {
@ -432,10 +435,14 @@ export class Item extends AbstractStruct {
if (o.id.client < this.id.client) { if (o.id.client < this.id.client) {
left = o left = o
conflictingItems.clear() conflictingItems.clear()
} } else if (compareIDs(this.rightOrigin, o.rightOrigin)) {
} else if (o.origin !== null && itemsBeforeOrigin.has(getItem(transaction.doc.store, o.origin))) { // this and o are conflicting and point to the same integration points. The id decides which item comes first.
// Since this is to the left of o, we can break here
break
} // else, o might be integrated before an item that this conflicts with. If so, we will find it in the next iterations
} else if (o.origin !== null && itemsBeforeOrigin.has(getItem(transaction.doc.store, o.origin))) { // use getItem instead of getItemCleanEnd because we don't want / need to split items.
// case 2 // case 2
if (o.origin === null || !conflictingItems.has(getItem(transaction.doc.store, o.origin))) { if (!conflictingItems.has(getItem(transaction.doc.store, o.origin))) {
left = o left = o
conflictingItems.clear() conflictingItems.clear()
} }