nodejs
diff --git a/Collapse file
‎lib/repl.js‎
Copy file name to clipboardExpand all lines: lib/repl.js
+14-4Lines changed: 14 additions & 4 deletions b/Collapse file
‎lib/repl.js‎
Copy file name to clipboardExpand all lines: lib/repl.js
+14-4Lines changed: 14 additions & 4 deletions
diff --git a/Collapse file
‎test/parallel/test-repl.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-repl.js
+24Lines changed: 24 additions & 0 deletions b/Collapse file
‎test/parallel/test-repl.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-repl.js
+24Lines changed: 24 additions & 0 deletions
@@ -215,9 +215,15 @@ function REPLServer(prompt,
 
   function defaultEval(code, context, file, cb) {
     var err, result, script, wrappedErr;
+    var isExitCommand = false;
     var wrappedCmd = false;
     var awaitPromise = false;
     var input = code;
+    var trimmedCommand = code.trim();
+
+    if (trimmedCommand === 'exit' || trimmedCommand === 'quit') {
+      isExitCommand = true;
+    }
 
     if (/^\s*\{/.test(code) && /\}\s*$/.test(code)) {
       // It's confusing for `{ a : 1 }` to be interpreted as a block
@@ -313,10 +319,16 @@ function REPLServer(prompt,
             breakOnSigint: self.breakEvalOnSigint
           };
 
+          const localContext = self.useGlobal ? global : self.context;
+          if (isExitCommand && !localContext.hasOwnProperty(trimmedCommand)) {
+            self.outputStream.write('(To exit, press ^D or type .exit)\n');
+            return self.displayPrompt();
+          }
+
           if (self.useGlobal) {
             result = script.runInThisContext(scriptOptions);
           } else {
-            result = script.runInContext(context, scriptOptions);
+            result = script.runInContext(localContext, scriptOptions);
           }
         } finally {
           if (self.breakEvalOnSigint) {
@@ -332,12 +344,10 @@ function REPLServer(prompt,
         }
       } catch (e) {
         err = e;
-
         if (err && err.code === 'ERR_SCRIPT_EXECUTION_INTERRUPTED') {
-          // The stack trace for this case is not very useful anyway.
+        // The stack trace for this case is not very useful anyway.
           Object.defineProperty(err, 'stack', { value: '' });
         }
-
         if (process.domain) {
           debug('not recoverable, send to domain');
           process.domain.emit('error', err);
 
@@ -132,6 +132,29 @@ const strictModeTests = [
   }
 ];
 
+const friendlyExitTests = [
+  {
+    send: 'exit',
+    expect: '(To exit, press ^D or type .exit)'
+  },
+  {
+    send: 'quit',
+    expect: '(To exit, press ^D or type .exit)'
+  },
+  {
+    send: 'quit = 1',
+    expect: '1'
+  },
+  {
+    send: 'quit',
+    expect: '1'
+  },
+  {
+    send: 'exit',
+    expect: '(To exit, press ^D or type .exit)'
+  },
+];
+
 const errorTests = [
   // Uncaught error throws and prints out
   {
@@ -742,6 +765,7 @@ const tcpTests = [
     const [ socket, replServer ] = await startUnixRepl();
 
     await runReplTests(socket, prompt_unix, unixTests);
+    await runReplTests(socket, prompt_unix, friendlyExitTests);
     await runReplTests(socket, prompt_unix, errorTests);
     replServer.replMode = repl.REPL_MODE_STRICT;
     await runReplTests(socket, prompt_unix, strictModeTests);