From: Chris Dickinson <christopher.s.dickinson@gmail.com>
Date: Mon, 4 May 2015 08:40:40 +0000 (-0700)
Subject: repl: fix _debugger by properly proxying repl
X-Git-Tag: v2.0.0~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=051d482b151cc15b8273d705ec57209d0fa1db2a;p=platform%2Fupstream%2Fnodejs.git

repl: fix _debugger by properly proxying repl

The _debugger module uses the internal REPL module, but expects
to receive the userland REPL module. This fixes the breakage that
occurs by proxying the userland REPL module through the internal
module.

It also fixes an unintended in-REPL bug, where require(node-module)
was not resolving correctly.

PR-URL: https://github.com/iojs/io.js/pull/1605
Reviewed-By: Roman Reiss <me@silverwind.io>
---

diff --git a/lib/internal/repl.js b/lib/internal/repl.js
index 5faecae..65c3f77 100644
--- a/lib/internal/repl.js
+++ b/lib/internal/repl.js
@@ -1,29 +1,22 @@
 'use strict';
 
-module.exports = {createRepl: createRepl};
-
 const Interface = require('readline').Interface;
 const REPL = require('repl');
 const path = require('path');
 
+module.exports = Object.create(REPL);
+module.exports.createInternalRepl = createRepl;
+
 // XXX(chrisdickinson): The 15ms debounce value is somewhat arbitrary.
 // The debounce is to guard against code pasted into the REPL.
 const kDebounceHistoryMS = 15;
 
-try {
-  // hack for require.resolve("./relative") to work properly.
-  module.filename = path.resolve('repl');
-} catch (e) {
-  // path.resolve('repl') fails when the current working directory has been
-  // deleted.  Fall back to the directory name of the (absolute) executable
-  // path.  It's not really correct but what are the alternatives?
-  const dirname = path.dirname(process.execPath);
-  module.filename = path.resolve(dirname, 'repl');
+// XXX(chrisdickinson): hack to make sure that the internal debugger
+// uses the original repl.
+function replStart() {
+  return REPL.start.apply(REPL, arguments);
 }
 
-// hack for repl require to work properly with node_modules folders
-module.paths = require('module')._nodeModulePaths(module.filename);
-
 function createRepl(env, cb) {
   const opts = {
     ignoreUndefined: false,
diff --git a/lib/repl.js b/lib/repl.js
index 95a30c0..45bc49b 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -32,6 +32,20 @@ const Console = require('console').Console;
 const domain = require('domain');
 const debug = util.debuglog('repl');
 
+try {
+  // hack for require.resolve("./relative") to work properly.
+  module.filename = path.resolve('repl');
+} catch (e) {
+  // path.resolve('repl') fails when the current working directory has been
+  // deleted.  Fall back to the directory name of the (absolute) executable
+  // path.  It's not really correct but what are the alternatives?
+  const dirname = path.dirname(process.execPath);
+  module.filename = path.resolve(dirname, 'repl');
+}
+
+// hack for repl require to work properly with node_modules folders
+module.paths = require('module')._nodeModulePaths(module.filename);
+
 // If obj.hasOwnProperty has been overridden, then calling
 // obj.hasOwnProperty(prop) will break.
 // See: https://github.com/joyent/node/issues/1707
diff --git a/src/node.js b/src/node.js
index 5cf56f6..2d6ce45 100644
--- a/src/node.js
+++ b/src/node.js
@@ -130,7 +130,7 @@
         // If -i or --interactive were passed, or stdin is a TTY.
         if (process._forceRepl || NativeModule.require('tty').isatty(0)) {
           // REPL
-          Module.requireRepl().createRepl(process.env, function(err, repl) {
+          Module.requireRepl().createInternalRepl(process.env, function(err, repl) {
             if (err) {
               throw err;
             }