use replaceChunk and replaceParent in "integrate" method

timse · timse · commit 9f27e92d425b · 2017-02-14T21:16:09.000+11:00
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -198,27 +198,12 @@ class Chunk {
 		otherModules.forEach(m => other.moveModule(m, this));
 		other.modules.length = 0;
 
-		const moveChunks = (chunks, kind, onChunk) => {
-			chunks.forEach(c => {
-				const idx = c[kind].indexOf(other);
-				if(idx >= 0) {
-					c[kind].splice(idx, 1);
-				}
-				onChunk(c);
-			});
-		};
-		moveChunks(other.parents, "chunks", c => {
-			if(c !== this && this.addParent(c)) {
-				c.addChunk(this);
-			}
-		});
+		other.parents.forEach(parent => parent.replaceChunk(other, this));
 		other.parents.length = 0;
-		moveChunks(other.chunks, "parents", c => {
-			if(c !== this && this.addChunk(c)) {
-				c.addParent(this);
-			}
-		});
+
+		other.chunks.forEach(chunk => chunk.replaceParent(other, this));
 		other.chunks.length = 0;
+
 		other.blocks.forEach(b => {
 			b.chunks = (b.chunks || [this]).map(c => {
 				return c === other ? this : c;
