rename other to otherChunk

timse · timse · commit 730559398785 · 2017-02-14T21:16:10.000+11:00
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -261,12 +261,12 @@ class Chunk {
 		this.modules.forEach(m => m.updateHash(hash));
 	}
 
-	canBeIntegrated(other) {
-		if(other.isInitial()) {
+	canBeIntegrated(otherChunk) {
+		if(otherChunk.isInitial()) {
 			return false;
 		}
 		if(this.isInitial()) {
-			if(other.parents.length !== 1 || other.parents[0] !== this) {
+			if(otherChunk.parents.length !== 1 || otherChunk.parents[0] !== this) {
 				return false;
 			}
 		}
@@ -292,13 +292,13 @@ class Chunk {
 		return this.addMultiplierAndOverhead(this.modulesSize(), options);
 	}
 
-	integratedSize(other, options) {
+	integratedSize(otherChunk, options) {
 		// Chunk if it's possible to integrate this chunk
-		if(!this.canBeIntegrated(other)) {
+		if(!this.canBeIntegrated(otherChunk)) {
 			return false;
 		}
 
-		const modulesSize = this.modulesSize() + other.modulesSize();
+		const modulesSize = this.modulesSize() + otherChunk.modulesSize();
 		return this.addMultiplierAndOverhead(modulesSize, options);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -261,12 +261,12 @@ class Chunk {`
`261`	`261`	`this.modules.forEach(m => m.updateHash(hash));`
`262`	`262`	`}`
`263`	`263`
`264`		`- canBeIntegrated(other) {`
`265`		`- if(other.isInitial()) {`
	`264`	`+ canBeIntegrated(otherChunk) {`
	`265`	`+ if(otherChunk.isInitial()) {`
`266`	`266`	`return false;`
`267`	`267`	`}`
`268`	`268`	`if(this.isInitial()) {`
`269`		`- if(other.parents.length !== 1 \|\| other.parents[0] !== this) {`
	`269`	`+ if(otherChunk.parents.length !== 1 \|\| otherChunk.parents[0] !== this) {`
`270`	`270`	`return false;`
`271`	`271`	`}`
`272`	`272`	`}`
`@@ -292,13 +292,13 @@ class Chunk {`
`292`	`292`	`return this.addMultiplierAndOverhead(this.modulesSize(), options);`
`293`	`293`	`}`
`294`	`294`
`295`		`- integratedSize(other, options) {`
	`295`	`+ integratedSize(otherChunk, options) {`
`296`	`296`	`// Chunk if it's possible to integrate this chunk`
`297`		`- if(!this.canBeIntegrated(other)) {`
	`297`	`+ if(!this.canBeIntegrated(otherChunk)) {`
`298`	`298`	`return false;`
`299`	`299`	`}`
`300`	`300`
`301`		`- const modulesSize = this.modulesSize() + other.modulesSize();`
	`301`	`+ const modulesSize = this.modulesSize() + otherChunk.modulesSize();`
`302`	`302`	`return this.addMultiplierAndOverhead(modulesSize, options);`
`303`	`303`	`}`
`304`	`304`