repl: preserve preview on ESCAPE key press

Fix: nodejs#46876
meixg · Feb 28, 2023 · 21dc2b9 · 21dc2b9
1 parent 225c578
commit 21dc2b9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/lib/internal/repl/utils.js b/lib/internal/repl/utils.js
@@ -365,7 +365,7 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
     }, () => callback(new ERR_INSPECTOR_NOT_AVAILABLE()));
   }
 
-  const showPreview = () => {
+  const showPreview = (noCompletion = false) => {
     // Prevent duplicated previews after a refresh.
     if (inputPreview !== null || !repl.isCompletionEnabled) {
       return;
@@ -382,7 +382,7 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
 
     // Add the autocompletion preview.
     const insertPreview = false;
-    showCompletionPreview(repl.line, insertPreview);
+    !noCompletion && showCompletionPreview(repl.line, insertPreview);
 
     // Do not preview if the command is buffered.
     if (repl[bufferSymbol]) {

diff --git a/lib/repl.js b/lib/repl.js
@@ -993,9 +993,7 @@ function REPLServer(prompt,
       clearPreview(key);
       if (!reverseSearch(d, key)) {
         ttyWrite(d, key);
-        if (key.name !== 'escape') {
-          showPreview();
-        }
+        showPreview(key.name === 'escape');
       }
       return;
     }

diff --git a/test/parallel/test-repl-history-navigation.js b/test/parallel/test-repl-history-navigation.js
@@ -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;
 
@@ -633,9 +651,9 @@ function cleanupTmpFile() {
 function runTest() {
   const opts = tests.shift();
   if (!opts) return; // All done
-
+  
   const { expected, skip } = opts;
-
+  
   // Test unsupported on platform.
   if (skip) {
     setImmediate(runTestWrap, true);