Wrap callback in watcher's close method

acupofspirt · acupofspirt · commit 44e02f46d68d · 2018-03-07T12:15:46.000+03:00
diff --git a/lib/Watching.js b/lib/Watching.js
@@ -166,9 +166,12 @@ class Watching {
 	}
 
 	close(callback) {
-		if (callback === undefined) callback = () => {};
+		const finalCallback = () => {
+			this.compiler.hooks.watchClose.call();
+			this.compiler.running = false;
+			if (callback !== undefined) callback();
+		};
 
-		this.compiler.running = false;
 		this.closed = true;
 		if (this.watcher) {
 			this.watcher.close();
@@ -180,13 +183,9 @@ class Watching {
 		}
 		if (this.running) {
 			this.invalid = true;
-			this._done = () => {
-				this.compiler.hooks.watchClose.call();
-				callback();
-			};
+			this._done = finalCallback;
 		} else {
-			this.compiler.hooks.watchClose.call();
-			callback();
+			finalCallback();
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,12 @@ class Watching {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`close(callback) {`
`169`		`- if (callback === undefined) callback = () => {};`
	`169`	`+ const finalCallback = () => {`
	`170`	`+ this.compiler.hooks.watchClose.call();`
	`171`	`+ this.compiler.running = false;`
	`172`	`+ if (callback !== undefined) callback();`
	`173`	`+ };`
`170`	`174`
`171`		`- this.compiler.running = false;`
`172`	`175`	`this.closed = true;`
`173`	`176`	`if (this.watcher) {`
`174`	`177`	`this.watcher.close();`
`@@ -180,13 +183,9 @@ class Watching {`
`180`	`183`	`}`
`181`	`184`	`if (this.running) {`
`182`	`185`	`this.invalid = true;`
`183`		`- this._done = () => {`
`184`		`- this.compiler.hooks.watchClose.call();`
`185`		`- callback();`
`186`		`- };`
	`186`	`+ this._done = finalCallback;`
`187`	`187`	`} else {`
`188`		`- this.compiler.hooks.watchClose.call();`
`189`		`- callback();`
	`188`	`+ finalCallback();`
`190`	`189`	`}`
`191`	`190`	`}`
`192`	`191`	`}`