refactor: Decouple source snippet from repl

Author: Jan Krems

lib/internal/inspect-repl.js

@@ -96,14 +96,14 @@ function leftPad(n, prefix, maxN) {
   return prefix + ' '.repeat(nspaces) + s;
 }
 
-function markSourceColumn(sourceText, position, repl) {
+function markSourceColumn(sourceText, position, useColors) {
   if (!sourceText) return '';
 
   const head = sourceText.slice(0, position);
   let tail = sourceText.slice(position);
 
   // Colourize char if stdout supports colours
-  if (repl.useColors) {
+  if (useColors) {
     tail = tail.replace(/(.+?)([^\w]|$)/, '\u001b[32m$1\u001b[39m$2');
   }
 
@@ -256,13 +256,16 @@ function createRepl(inspector) {
   }
   resetOnStart();
 
-  const print = inspector.print.bind(inspector);
-
   const INSPECT_OPTIONS = { colors: inspector.stdout.isTTY };
   function inspect(value) {
     return util.inspect(value, INSPECT_OPTIONS);
   }
 
+  function print(value, oneline = false) {
+    const text = typeof value === 'string' ? value : inspect(value);
+    return inspector.print(text, oneline);
+  }
+
   function getCurrentLocation() {
     if (!selectedFrame) {
       throw new Error('Requires execution to be paused');
@@ -319,11 +322,7 @@ function createRepl(inspector) {
       this.delta = delta;
     }
 
-    toString() {
-      return this[util.inspect.custom]();
-    }
-
-    [util.inspect.custom]() {
+    [util.inspect.custom](depth, options) {
       const { scriptId, lineNumber, columnNumber, delta, scriptSource } = this;
       const start = Math.max(1, lineNumber - delta + 1);
       const end = lineNumber + delta + 1;
@@ -334,7 +333,7 @@ function createRepl(inspector) {
         const isCurrent = i === (lineNumber + 1);
 
         const markedLine = isCurrent
-          ? markSourceColumn(lineText, columnNumber, inspector.repl)
+          ? markSourceColumn(lineText, columnNumber, options.colors)
           : lineText;
 
         let isBreakpoint = false;
@@ -512,7 +511,7 @@ function createRepl(inspector) {
   // List source code
   function list(delta = 5) {
     return selectedFrame.list(delta)
-      .then(print, (error) => {
+      .then(null, (error) => {
         print('You can\'t list source code right now');
         throw error;
       });
@@ -700,8 +699,12 @@ function createRepl(inspector) {
 
     inspector.suspendReplWhile(() =>
       Promise.all([formatWatchers(true), selectedFrame.list(2)])
-        .then(([watcherList, context]) => (watcherList ? `${watcherList}\n${context}` : context))
-        .then(print));
+        .then(([watcherList, context]) => {
+          if (watcherList) {
+            return `${watcherList}\n${inspect(context)}`;
+          }
+          return context;
+        }).then(print));
   });
 
   function handleResumed() {