repl: prevent undefined ref in completion

evanlucas · evanlucas · commit 980f4da8c4bc · 2016-08-02T07:55:10.000-05:00
Fixes: #7716 PR-URL: #7718 Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/lib/repl.js b/lib/repl.js
@@ -730,12 +730,12 @@ REPLServer.prototype.complete = function(line, callback) {
     });
     var flat = new ArrayStream();         // make a new "input" stream
     var magic = new REPLServer('', flat); // make a nested REPL
+    replMap.set(magic, replMap.get(this));
     magic.context = magic.createContext();
     flat.run(tmp);                        // eval the flattened code
     // all this is only profitable if the nested REPL
     // does not have a bufferedCommand
     if (!magic.bufferedCommand) {
-      replMap.set(magic, replMap.get(this));
       return magic.complete(line, callback);
     }
   }
diff --git a/test/parallel/test-repl-tab-complete-crash.js b/test/parallel/test-repl-tab-complete-crash.js
@@ -4,24 +4,24 @@ const common = require('../common');
 const assert = require('assert');
 const repl = require('repl');
 
-var referenceErrorCount = 0;
-
-common.ArrayStream.prototype.write = function(msg) {
-  if (msg.startsWith('ReferenceError: ')) {
-    referenceErrorCount++;
-  }
-};
+common.ArrayStream.prototype.write = function(msg) {};
 
 const putIn = new common.ArrayStream();
 const testMe = repl.start('', putIn);
 
 // https://github.com/nodejs/node/issues/3346
-// Tab-completion for an undefined variable inside a function should report a
-// ReferenceError.
+// Tab-completion should be empty
 putIn.run(['.clear']);
 putIn.run(['function () {']);
-testMe.complete('arguments.');
+testMe.complete('arguments.', common.mustCall((err, completions) => {
+  assert.strictEqual(err, null);
+  assert.deepStrictEqual(completions, [[], 'arguments.']);
+}));
 
-process.on('exit', function() {
-  assert.strictEqual(referenceErrorCount, 1);
-});
+putIn.run(['.clear']);
+putIn.run(['function () {']);
+putIn.run(['undef;']);
+testMe.complete('undef.', common.mustCall((err, completions) => {
+  assert.strictEqual(err, null);
+  assert.deepStrictEqual(completions, [[], 'undef.']);
+}));

Original file line number	Diff line number	Diff line change
`@@ -730,12 +730,12 @@ REPLServer.prototype.complete = function(line, callback) {`
`730`	`730`	`});`
`731`	`731`	`var flat = new ArrayStream(); // make a new "input" stream`
`732`	`732`	`var magic = new REPLServer('', flat); // make a nested REPL`
	`733`	`+ replMap.set(magic, replMap.get(this));`
`733`	`734`	`magic.context = magic.createContext();`
`734`	`735`	`flat.run(tmp); // eval the flattened code`
`735`	`736`	`// all this is only profitable if the nested REPL`
`736`	`737`	`// does not have a bufferedCommand`
`737`	`738`	`if (!magic.bufferedCommand) {`
`738`		`- replMap.set(magic, replMap.get(this));`
`739`	`739`	`return magic.complete(line, callback);`
`740`	`740`	`}`
`741`	`741`	`}`