Commit 83f095a
Revert "repl: disable Ctrl+C support on win32 for now"
This reverts commit f59b888
now that the libuv update containing the proper fix has
landed in 63243bc.
Ref: libuv/libuv#1054
Ref: #7837
PR-URL: #8645
Reviewed-By: Nikolai Vavilov <vvnicholas@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent d7d605e commit 83f095a
1 file changed
Lines changed: 2 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -322,13 +322,7 @@ function REPLServer(prompt, | |||
| 322 | 322 | if (!err) { | |
| 323 | 323 | // Unset raw mode during evaluation so that Ctrl+C raises a signal. | |
| 324 | 324 | let previouslyInRawMode; | |
| 325 | - | ||
| 326 | - // Temporarily disabled on Windows due to output problems that likely | ||
| 327 | - // result from the raw mode switches here, see | ||
| 328 | - // https://github.com/nodejs/node/issues/7837 | ||
| 329 | - // Setting NODE_REPL_CTRLC is meant as a temporary opt-in for debugging. | ||
| 330 | - if (self.breakEvalOnSigint && | ||
| 331 | - (process.platform !== 'win32' || process.env.NODE_REPL_CTRLC)) { | ||
| 325 | + if (self.breakEvalOnSigint) { | ||
| 332 | 326 | // Start the SIGINT watchdog before entering raw mode so that a very | |
| 333 | 327 | // quick Ctrl+C doesn’t lead to aborting the process completely. | |
| 334 | 328 | utilBinding.startSigintWatchdog(); | |
@@ -348,8 +342,7 @@ function REPLServer(prompt, | |||
| 348 | 342 | result = script.runInContext(context, scriptOptions); | |
| 349 | 343 | } | |
| 350 | 344 | } finally { | |
| 351 | - if (self.breakEvalOnSigint && | ||
| 352 | - (process.platform !== 'win32' || process.env.NODE_REPL_CTRLC)) { | ||
| 345 | + if (self.breakEvalOnSigint) { | ||
| 353 | 346 | // Reset terminal mode to its previous value. | |
| 354 | 347 | self._setRawMode(previouslyInRawMode); | |
| 355 | 348 | ||
0 commit comments