.

Author: lihaoyi

compiler/src/dotty/tools/repl/Rendering.scala

@@ -26,9 +26,6 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None):
 
   var myClassLoader: AbstractFileClassLoader = uninitialized
 
-  /** (value, maxElements, maxCharacters) => String */
-  val myReplStringOf: (Object, Int, Int) => String =
-    dotty.shaded.pprint.PPrinter.BlackWhite.apply(value).plainText
 
   /** Class loader used to load compiled code */
   private[repl] def classLoader()(using Context) =
@@ -57,17 +54,7 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None):
 
   /** Return a String representation of a value we got from `classLoader()`. */
   private[repl] def replStringOf(sym: Symbol, value: Object)(using Context): String =
-    assert(myReplStringOf != null,
-      "replStringOf should only be called on values creating using `classLoader()`, but `classLoader()` has not been called so far")
-    val maxPrintElements = ctx.settings.VreplMaxPrintElements.valueIn(ctx.settingsState)
-    val maxPrintCharacters = ctx.settings.VreplMaxPrintCharacters.valueIn(ctx.settingsState)
-    // stringOf returns null if value.toString returns null. Show some text as a fallback.
-    def fallback = s"""null // result of "${sym.name}.toString" is null"""
-    if value == null then "null" else
-      myReplStringOf(value, maxPrintElements, maxPrintCharacters) match
-        case null => fallback
-        case res  => res
-    end if
+    dotty.shaded.pprint.PPrinter.BlackWhite.apply(value).plainText
 
   /** Load the value of the symbol using reflection.
    *

compiler/test/dotty/tools/repl/ReplCompilerTests.scala

@@ -445,7 +445,6 @@ class ReplCompilerTests extends ReplTest:
     .andThen:
       val last = lines().last
       assertTrue(last, last.startsWith("val tpolecat: Object = null"))
-      assertTrue(last, last.endsWith("""// result of "tpolecat.toString" is null"""))
 
   @Test def `i17333 print toplevel object with null toString`: Unit =
     initially:
@@ -454,7 +453,6 @@ class ReplCompilerTests extends ReplTest:
       run("tpolecat")
       val last = lines().last
       assertTrue(last, last.startsWith("val res0: tpolecat.type = null"))
-      assertTrue(last, last.endsWith("""// result of "res0.toString" is null"""))
 
   @Test def `i21431 filter out best effort options`: Unit =
     initially: