Merge pull request webpack#7012 from webpack/refactor/remove_this

sokra · web-flow · commit 15ac4e850fe7 · 2018-04-11T08:26:36.000+02:00
Remove unnecessary _this binding
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -464,9 +464,8 @@ class Compilation extends Tapable {
 		recursive,
 		callback
 	) {
-		let _this = this;
-		const start = _this.profile && Date.now();
-		const currentProfile = _this.profile && {};
+		const start = this.profile && Date.now();
+		const currentProfile = this.profile && {};
 
 		asyncLib.forEach(
 			dependencies,
@@ -475,7 +474,7 @@ class Compilation extends Tapable {
 
 				const errorAndCallback = err => {
 					err.origin = module;
-					_this.errors.push(err);
+					this.errors.push(err);
 					if (bail) {
 						callback(err);
 					} else {
@@ -484,28 +483,24 @@ class Compilation extends Tapable {
 				};
 				const warningAndCallback = err => {
 					err.origin = module;
-					_this.warnings.push(err);
+					this.warnings.push(err);
 					callback();
 				};
 
-				const semaphore = _this.semaphore;
+				const semaphore = this.semaphore;
 				semaphore.acquire(() => {
-					if (_this === null) return semaphore.release();
-
 					const factory = item.factory;
 					factory.create(
 						{
 							contextInfo: {
 								issuer: module.nameForCondition && module.nameForCondition(),
-								compiler: _this.compiler.name
+								compiler: this.compiler.name
 							},
 							resolveOptions: module.resolveOptions,
 							context: module.context,
 							dependencies: dependencies
 						},
 						(err, dependentModule) => {
-							if (_this === null) return semaphore.release();
-
 							let afterFactory;
 
 							const isOptional = () => {
@@ -543,7 +538,7 @@ class Compilation extends Tapable {
 								}
 							};
 
-							const addModuleResult = _this.addModule(
+							const addModuleResult = this.addModule(
 								dependentModule,
 								cacheGroup
 							);
@@ -557,7 +552,7 @@ class Compilation extends Tapable {
 								}
 
 								if (recursive && addModuleResult.dependencies) {
-									_this.processModuleDependencies(dependentModule, callback);
+									this.processModuleDependencies(dependentModule, callback);
 								} else {
 									return callback();
 								}
@@ -570,7 +565,7 @@ class Compilation extends Tapable {
 
 								dependentModule.issuer = module;
 							} else {
-								if (_this.profile) {
+								if (this.profile) {
 									if (module.profile) {
 										const time = Date.now() - start;
 										if (
@@ -584,14 +579,12 @@ class Compilation extends Tapable {
 							}
 
 							if (addModuleResult.build) {
-								_this.buildModule(
+								this.buildModule(
 									dependentModule,
 									isOptional(),
 									module,
 									dependencies,
 									err => {
-										if (_this === null) return semaphore.release();
-
 										if (err) {
 											semaphore.release();
 											return errorOrWarningAndCallback(err);
@@ -608,7 +601,7 @@ class Compilation extends Tapable {
 								);
 							} else {
 								semaphore.release();
-								_this.waitForBuildingFinished(dependentModule, afterBuild);
+								this.waitForBuildingFinished(dependentModule, afterBuild);
 							}
 						}
 					);
@@ -1051,15 +1044,13 @@ class Compilation extends Tapable {
 	}
 
 	assignIndex(module) {
-		const _this = this;
-
 		const assignIndexToModule = module => {
 			// enter module
 			if (typeof module.index !== "number") {
-				module.index = _this.nextFreeModuleIndex++;
+				module.index = this.nextFreeModuleIndex++;
 
 				// leave module
-				queue.push(() => (module.index2 = _this.nextFreeModuleIndex2++));
+				queue.push(() => (module.index2 = this.nextFreeModuleIndex2++));
 
 				// enter it as block
 				assignIndexToDependencyBlock(module);
