nodejs
diff --git a/‎lib/internal/repl/utils.js‎
Lines changed: 5 additions & 3 deletions b/‎lib/internal/repl/utils.js‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎lib/repl.js‎
Lines changed: 2 additions & 3 deletions b/‎lib/repl.js‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎test/parallel/test-repl-history-navigation.js‎
Lines changed: 18 additions & 0 deletions b/‎test/parallel/test-repl-history-navigation.js‎
Lines changed: 18 additions & 0 deletions
@@ -363,7 +363,7 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
     }, () => callback(new ERR_INSPECTOR_NOT_AVAILABLE()));
   }
 
-  const showPreview = () => {
+  const showPreview = (showCompletion = true) => {
     // Prevent duplicated previews after a refresh.
     if (inputPreview !== null || !repl.isCompletionEnabled) {
       return;
@@ -379,8 +379,10 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
     hasCompletions = false;
 
     // Add the autocompletion preview.
-    const insertPreview = false;
-    showCompletionPreview(repl.line, insertPreview);
+    if (showCompletion) {
+      const insertPreview = false;
+      showCompletionPreview(repl.line, insertPreview);
+    }
 
     // Do not preview if the command is buffered.
     if (repl[bufferSymbol]) {
 
@@ -993,9 +993,8 @@ function REPLServer(prompt,
       clearPreview(key);
       if (!reverseSearch(d, key)) {
         ttyWrite(d, key);
-        if (key.name !== 'escape') {
-          showPreview();
-        }
+        const showCompletionPreview = key.name !== 'escape';
+        showPreview(showCompletionPreview);
       }
       return;
     }
 
@@ -614,6 +614,24 @@ const tests = [
     ],
     clean: false
   },
+  {
+    // Test that preview should not be removed when pressing ESCAPE key
+    env: { NODE_REPL_HISTORY: defaultHistoryPath },
+    skip: !process.features.inspector,
+    test: [
+      '1+1',
+      ESCAPE,
+      ENTER,
+    ],
+    expected: [
+      prompt, ...'1+1',
+      '\n// 2',
+      '\n// 2',
+      '2\n',
+      prompt,
+    ],
+    clean: false
+  },
 ];
 const numtests = tests.length;
Original file line number	Diff line number	Diff line change
@@ -993,9 +993,8 @@ function REPLServer(prompt,
993	993	clearPreview(key);
994	994	if (!reverseSearch(d, key)) {
995	995	ttyWrite(d, key);
996		- if (key.name !== 'escape') {
997		- showPreview();
998		- }
	996	+ const showCompletionPreview = key.name !== 'escape';
	997	+ showPreview(showCompletionPreview);
999	998	}
1000	999	return;
1001	1000	}