Skip to content

Commit 60a1dbd

Browse files
rlidwkabnoordhuis
authored andcommitted
debugger: repeat last command
Regression introduced by commit 9ef9a9d.
1 parent 2e13d0c commit 60a1dbd

3 files changed

Lines changed: 67 additions & 3 deletions

File tree

‎lib/_debugger.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,8 +961,8 @@ Interface.prototype.controlEval = function(code, context, filename, callback) {
961961
try {
962962
// Repeat last command if empty line are going to be evaluated
963963
if (this.repl.rli.history && this.repl.rli.history.length > 0) {
964-
if (code === '(\n)') {
965-
code = '(' + this.repl.rli.history[0] + '\n)';
964+
if (code === '\n') {
965+
code = this.repl.rli.history[0] + '\n';
966966
}
967967
}
968968

‎test/simple/helper-debugger-repl.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var port = common.PORT + 1337;
2929
var child;
3030
var buffer = '';
3131
var expected = [];
32+
var quit;
3233

3334
function startDebugger(scriptToDebug) {
3435
scriptToDebug = process.env.NODE_DEBUGGER_TEST_SCRIPT ||
@@ -70,7 +71,7 @@ function startDebugger(scriptToDebug) {
7071
});
7172

7273
var quitCalled = false;
73-
function quit() {
74+
quit = function() {
7475
if (quitCalled || childClosed) return;
7576
quitCalled = true;
7677
child.stdin.write('quit');
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
process.env.NODE_FORCE_READLINE = 1;
23+
24+
var repl = require('./helper-debugger-repl.js');
25+
26+
repl.startDebugger('breakpoints.js');
27+
28+
var addTest = repl.addTest;
29+
30+
// next
31+
addTest('n', [
32+
/debug>.*n/,
33+
/break in .*:11/,
34+
/9/, /10/, /11/, /12/, /13/
35+
]);
36+
37+
// should repeat next
38+
addTest('', [
39+
/debug>/,
40+
/break in .*:5/,
41+
/3/, /4/, /5/, /6/, /7/,
42+
]);
43+
44+
// continue
45+
addTest('c', [
46+
/debug>.*c/,
47+
/break in .*:12/,
48+
/10/, /11/, /12/, /13/, /14/
49+
]);
50+
51+
// should repeat continue
52+
addTest('', [
53+
/debug>/,
54+
/break in .*:5/,
55+
/3/, /4/, /5/, /6/, /7/,
56+
]);
57+
58+
// should repeat continue
59+
addTest('', [
60+
/debug>/,
61+
/break in .*:23/,
62+
/21/, /22/, /23/, /24/, /25/,
63+
]);

0 commit comments

Comments
 (0)