From 01031d27c3ec4554680156f47601ffc0a4a26a6c Mon Sep 17 00:00:00 2001
From: Kevin Jahns <kevin.jahns@rwth-aachen.de>
Date: Mon, 18 Apr 2016 10:48:48 +0100
Subject: [PATCH] some gc fixes
---
src/Transaction.js | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/Transaction.js b/src/Transaction.js
index c7e27b73..2de6a8b1 100644
--- a/src/Transaction.js
+++ b/src/Transaction.js
@@ -198,15 +198,17 @@ module.exports = function (Y/* :any */) {
length = 0
} else {
// does exist, check if it is too long
- if (target.id[1] < targetId[1]) {
- // starts to the left of the deletion range
- target = yield* this.getInsertionCleanStart(targetId)
- targetLength = target.content.length // must have content property!
- }
- if (target.id[1] + targetLength > targetId[1] + length) {
- // ends to the right of the deletion range
- target = yield* this.getInsertionCleanEnd([targetId[0], targetId[1] + length - 1])
- targetLength = target.content.length
+ if (!target.deleted) {
+ if (target.id[1] < targetId[1]) {
+ // starts to the left of the deletion range
+ target = yield* this.getInsertionCleanStart(targetId)
+ targetLength = target.content.length // must have content property!
+ }
+ if (target.id[1] + targetLength > targetId[1] + length) {
+ // ends to the right of the deletion range
+ target = yield* this.getInsertionCleanEnd([targetId[0], targetId[1] + length - 1])
+ targetLength = target.content.length
+ }
}
length = target.id[1] - targetId[1]
}
@@ -489,7 +491,7 @@ module.exports = function (Y/* :any */) {
*/
* garbageCollectOperation (id) {
this.store.addToDebug('yield* this.garbageCollectOperation(', id, ')')
- var o = yield* this.getInsertion(id) // TODO! like this? or rather cleanstartend
+ var o = yield* this.getOperation(id) // TODO! like this? or rather cleanstartend
yield* this.markGarbageCollected(id, (o != null && o.content != null) ? o.content.lengh : 1) // always mark gc'd
// if op exists, then clean that mess up..
if (o != null) {
--
GitLab