refactor the _done method of Watching

timse · timse · commit 2a1bcff9e699 · 2017-04-06T21:46:07.000+10:00
- we can safely ignore the "else" cases of not having an error as _done() is only called without arguments if "this.invalid is true"
- if we get passed the point of `this.invalid` either `err` or `compilation` are !!always!! set. therefore later checks can again be ignored
- early return in error case
- ignore `this.error` if we make it passed the error as it will be unset at this point.
- remove the setting of `this.error` or `this.stats` as the only use is inside this method and only allow weird behaviour if someone set them from outside
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -13,7 +13,6 @@ var ContextModuleFactory = require("./ContextModuleFactory");
 function Watching(compiler, watchOptions, handler) {
 	this.startTime = null;
 	this.invalid = false;
-	this.error = null;
 	this.handler = handler;
 	this.closed = false;
 	if(typeof watchOptions === "number") {
@@ -81,19 +80,21 @@ Watching.prototype._go = function() {
 Watching.prototype._done = function(err, compilation) {
 	this.running = false;
 	if(this.invalid) return this._go();
-	this.error = err || null;
-	this.stats = compilation ? new Stats(compilation) : null;
-	if(this.stats) {
-		this.stats.startTime = this.startTime;
-		this.stats.endTime = new Date().getTime();
+
+	if(err) {
+		this.compiler.applyPlugins("failed", err);
+		this.handler(err);
+		return;
 	}
-	if(this.stats)
-		this.compiler.applyPlugins("done", this.stats);
-	else
-		this.compiler.applyPlugins("failed", this.error);
-	this.handler(this.error, this.stats);
-	if(!this.error && !this.closed)
+
+	var stats = new Stats(compilation);
+	stats.startTime = this.startTime;
+	stats.endTime = new Date().getTime();
+	this.compiler.applyPlugins("done", stats);
+	this.handler(null, stats);
+	if(!this.closed) {
 		this.watch(compilation.fileDependencies, compilation.contextDependencies, compilation.missingDependencies);
+	}
 };
 
 Watching.prototype.watch = function(files, dirs, missing) {
