fixup! simplify code further

Author: BridgeAR

lib/internal/readline/interface.js

@@ -144,7 +144,6 @@ const kYank = Symbol('_yank');
 const kYanking = Symbol('_yanking');
 const kYankPop = Symbol('_yankPop');
 const kNormalizeHistoryLineEndings = Symbol('_normalizeHistoryLineEndings');
-const kDenormalizeHistoryLineEndings = Symbol('_denormalizeHistoryLineEndings');
 
 function InterfaceConstructor(input, output, completer, terminal) {
   this[kSawReturnAt] = 0;
@@ -461,13 +460,8 @@ class Interface extends InterfaceConstructor {
   }
 
   // Convert newlines to a consistent format for history storage
-  [kNormalizeHistoryLineEndings](line) {
-    return StringPrototypeReplaceAll(line, '\n', '\r');
-  }
-
-  // Convert newlines back to the format expected by the UI
-  [kDenormalizeHistoryLineEndings](line) {
-    return StringPrototypeReplaceAll(line, '\r', '\n');
+  [kNormalizeHistoryLineEndings](line, from, to) {
+    return StringPrototypeReplaceAll(line, from, to);
   }
 
   [kAddHistory]() {
@@ -478,7 +472,7 @@ class Interface extends InterfaceConstructor {
 
     // If the trimmed line is empty then return the line
     if (StringPrototypeTrim(this.line).length === 0) return this.line;
-    const normalizedLine = this[kNormalizeHistoryLineEndings](this.line);
+    const normalizedLine = this[kNormalizeHistoryLineEndings](this.line, '\n', '\r');
 
     if (this.history.length === 0 || this.history[0] !== normalizedLine) {
       if (this[kLastCommandErrored] && this.historyIndex === 0) {
@@ -1021,7 +1015,7 @@ class Interface extends InterfaceConstructor {
       if (index === -1) {
         this[kSetLine](search);
       } else {
-        this[kSetLine](this[kDenormalizeHistoryLineEndings](this.history[index]));
+        this[kSetLine](this[kNormalizeHistoryLineEndings](this.history[index], '\r', '\n'));
       }
       this.historyIndex = index;
       this.cursor = this.line.length; // Set cursor to end of line.
@@ -1065,7 +1059,7 @@ class Interface extends InterfaceConstructor {
       if (index === this.history.length) {
         this[kSetLine](search);
       } else {
-        this[kSetLine](this[kDenormalizeHistoryLineEndings](this.history[index]));
+        this[kSetLine](this[kNormalizeHistoryLineEndings](this.history[index], '\r', '\n'));
       }
       this.historyIndex = index;
       this.cursor = this.line.length; // Set cursor to end of line.
@@ -1511,5 +1505,4 @@ module.exports = {
   kMultilinePrompt,
   kLastCommandErrored,
   kNormalizeHistoryLineEndings,
-  kDenormalizeHistoryLineEndings,
 };

lib/repl.js

@@ -359,7 +359,6 @@ function REPLServer(prompt,
   this.editorMode = false;
   // Context id for use with the inspector protocol.
   this[kContextId] = undefined;
-  this[kLastCommandErrored] = false;
 
   if (this.breakEvalOnSigint && eval_) {
     // Allowing this would not reflect user expectations.
@@ -933,6 +932,8 @@ function REPLServer(prompt,
       debug('finish', e, ret);
       ReflectApply(_memory, self, [cmd]);
 
+      self[kLastCommandErrored] = false;
+
       if (e && !self[kBufferedCommandSymbol] &&
           StringPrototypeStartsWith(StringPrototypeTrim(cmd), 'npm ') &&
           !(e instanceof Recoverable)
@@ -977,8 +978,6 @@ function REPLServer(prompt,
       if (e) {
         self._domain.emit('error', e.err || e);
         self[kLastCommandErrored] = true;
-      } else {
-        self[kLastCommandErrored] = false;
       }
 
       // Clear buffer if no SyntaxErrors