From 909009fbd23e7399a26abc789173b9b6608e696e Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 4 Jun 2016 11:24:14 -0700 Subject: [PATCH 1/4] debugger: remove obsolete setTimeout Remove obsolete `setTimeout()` introduced in 3148f1400. The fix for the problem is in b266074347. (For the record, I mostly don't know what I'm talking about here but am summarizing from an IRC #node-dev conversation with @indutny on 04-Jun-2016.) --- lib/_debugger.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/_debugger.js b/lib/_debugger.js index 7da2f70bcaf1e9..1a85c3e810e601 100644 --- a/lib/_debugger.js +++ b/lib/_debugger.js @@ -829,13 +829,9 @@ function Interface(stdin, stdout, args) { // Run script automatically this.pause(); - // XXX Need to figure out why we need this delay - setTimeout(function() { - - self.run(function() { - self.resume(); - }); - }, 10); + self.run(function() { + self.resume(); + }); } From a0d60c40caf17c48620a56b8bd31e530cb600c03 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 4 Jun 2016 21:43:36 -0700 Subject: [PATCH 2/4] squash: try setImmediate --- lib/_debugger.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/_debugger.js b/lib/_debugger.js index 1a85c3e810e601..17740b28909f26 100644 --- a/lib/_debugger.js +++ b/lib/_debugger.js @@ -829,9 +829,7 @@ function Interface(stdin, stdout, args) { // Run script automatically this.pause(); - self.run(function() { - self.resume(); - }); + setImmediate(() => { self.run(function() { self.resume(); }); }); } From 3406e1b8641437c2144df73c8a35e1ad830834cc Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 5 Jun 2016 21:25:10 -0700 Subject: [PATCH 3/4] squash: self -> this --- lib/_debugger.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_debugger.js b/lib/_debugger.js index 17740b28909f26..6e7f2a38d5c6c3 100644 --- a/lib/_debugger.js +++ b/lib/_debugger.js @@ -829,7 +829,7 @@ function Interface(stdin, stdout, args) { // Run script automatically this.pause(); - setImmediate(() => { self.run(function() { self.resume(); }); }); + setImmediate(() => { this.run(() => { this.resume; }); }); } From 2bda6c141fb57525453cce26eff5bfa3ba6b3655 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Mon, 6 Jun 2016 15:35:20 -0700 Subject: [PATCH 4/4] squash: remove unneeded resume() --- lib/_debugger.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_debugger.js b/lib/_debugger.js index 6e7f2a38d5c6c3..738eb9871bb2b6 100644 --- a/lib/_debugger.js +++ b/lib/_debugger.js @@ -829,7 +829,7 @@ function Interface(stdin, stdout, args) { // Run script automatically this.pause(); - setImmediate(() => { this.run(() => { this.resume; }); }); + setImmediate(() => { this.run(); }); }