fixup! simplify implementation

Author: BridgeAR

doc/api/repl.md

@@ -605,8 +605,8 @@ The `replServer.displayPrompt()` method readies the REPL instance for input
 from the user, printing the configured `prompt` to a new line in the `output`
 and resuming the `input` to accept new input.
 
-When multi-line input is being entered, the "|" character is printed rather
-than the 'prompt'.
+When multi-line input is being entered, a pipe `'|'` is printed rather than the
+'prompt'.
 
 When `preserveCursor` is `true`, the cursor placement will not be reset to `0`.
 

lib/internal/readline/interface.js

@@ -1080,47 +1080,33 @@ class Interface extends InterfaceConstructor {
     let rows = 0;
     str = stripVTControlCharacters(str);
 
-    // Split the string into lines for better handling of multiline scenarios
-    const lines = StringPrototypeSplit(str, '\n');
-
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-
-      // Only add prefix offset for continuation lines in user input (not prompts)
-      if (i > 0 && this[kIsMultiline]) {
-        offset += kMultilinePrompt.description.length;
+    for (const char of new SafeStringIterator(str)) {
+      if (char === '\n') {
+        // Rows must be incremented by 1 even if offset = 0 or col = +Infinity.
+        rows += MathCeil(offset / col) || 1;
+        // Only add prefix offset for continuation lines in user input (not prompts)
+        offset = this[kIsMultiline] ? kMultilinePrompt.description.length : 0;
+        continue;
       }
-
-      // Process each character in the line
-      for (const char of new SafeStringIterator(line)) {
-        // Tabs must be aligned by an offset of the tab size
-        if (char === '\t') {
-          offset += this.tabSize - (offset % this.tabSize);
-          continue;
-        }
-
-        const width = getStringWidth(char, false /* stripVTControlCharacters */);
-        if (width === 0 || width === 1) {
-          offset += width;
-        } else {
-          // width === 2
-          if ((offset + 1) % col === 0) {
-            offset++;
-          }
-          offset += 2;
-        }
+      // Tabs must be aligned by an offset of the tab size.
+      if (char === '\t') {
+        offset += this.tabSize - (offset % this.tabSize);
+        continue;
       }
-
-      // Add rows for completed lines
-      if (i < lines.length - 1) {
-        // For all lines except the last one
-        rows += MathCeil(offset / col) || 1;
-        offset = 0;
+      const width = getStringWidth(char, false /* stripVTControlCharacters */);
+      if (width === 0 || width === 1) {
+        offset += width;
+      } else {
+        // width === 2
+        if ((offset + 1) % col === 0) {
+          offset++;
+        }
+        offset += 2;
       }
     }
 
     const cols = offset % col;
-    rows += MathFloor(offset / col);
+    rows += (offset - cols) / col;
 
     return { cols, rows };
   }
@@ -1498,6 +1484,7 @@ module.exports = {
   kHistoryNext,
   kHistoryPrev,
   kInsertString,
+  kIsMultiline,
   kLine,
   kLine_buffer,
   kMoveCursor,

lib/internal/repl/utils.js

@@ -28,6 +28,10 @@ const {
   ERR_INSPECTOR_NOT_AVAILABLE,
 } = require('internal/errors').codes;
 
+const {
+  kIsMultiline,
+} = require('internal/readline/interface');
+
 const {
   clearLine,
   clearScreenDown,
@@ -159,8 +163,6 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
 
   let escaped = null;
 
-  let justExecutedMultilineCommand = false;
-
   function getPreviewPos() {
     const displayPos = repl._getDisplayPos(`${repl.getPrompt()}${repl.line}`);
     const cursorPos = repl.line.length !== repl.cursor ?
@@ -183,11 +185,6 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
       clearLine(repl.output);
       moveCursor(repl.output, 0, -rows);
       inputPreview = null;
-      // If pressing enter on some history line,
-      // The next preview should not be generated
-      if ((key.name === 'return' || key.name === 'enter') && !key.meta && repl.historyIndex !== -1) {
-        justExecutedMultilineCommand = true;
-      }
     }
     if (completionPreview !== null) {
       // Prevent cursor moves if not necessary!
@@ -372,8 +369,11 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
   }
 
   const showPreview = (showCompletion = true) => {
-    // Prevent duplicated previews after a refresh.
-    if (inputPreview !== null || !repl.isCompletionEnabled || !process.features.inspector) {
+    // Prevent duplicated previews after a refresh or in a multiline command.
+    if (inputPreview !== null ||
+        repl[kIsMultiline] ||
+        !repl.isCompletionEnabled ||
+        !process.features.inspector) {
       return;
     }
 
@@ -384,11 +384,6 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
       return;
     }
 
-    if (justExecutedMultilineCommand) {
-      justExecutedMultilineCommand = false;
-      return;
-    }
-
     hasCompletions = false;
 
     // Add the autocompletion preview.