Merge pull request #2841 from gourlaysama/wip/t6507

SI-6507 do not call .toString on REPL results when :silent is on.

2 files changed, 5 insertions, 3 deletions

diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala
index e288739e77..ae318697ec 100644
--- a/src/repl/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala
@@ -830,6 +830,8 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set
     def imports    = importedSymbols
     def value      = Some(handlers.last) filter (h => h.definesValue) map (h => definedSymbols(h.definesTerm.get)) getOrElse NoSymbol
 
+    val printResults = IMain.this.printResults
+
     val lineRep = new ReadEvalPrint()
 
     private var _originalLine: String = null
diff --git a/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala b/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala
index c6f0cca481..085a7c6065 100644
--- a/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala
+++ b/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala
@@ -107,7 +107,7 @@ trait MemberHandlers {
 
     override def resultExtractionCode(req: Request): String = {
       val isInternal = isUserVarName(name) && req.lookupTypeOf(name) == "Unit"
-      if (!mods.isPublic || isInternal) ""
+      if (!mods.isPublic || isInternal || !req.printResults) ""
       else {
         // if this is a lazy val we avoid evaluating it here
         val resultString =
@@ -151,11 +151,11 @@ trait MemberHandlers {
       """val %s = %s""".format(name, lhs)
 
     /** Print out lhs instead of the generated varName */
-    override def resultExtractionCode(req: Request) = {
+    override def resultExtractionCode(req: Request) = if (req.printResults) {
       val lhsType = string2code(req lookupTypeOf name)
       val res     = string2code(req fullPath name)
       """ + "%s: %s = " + %s + "\n" """.format(string2code(lhs.toString), lhsType, res) + "\n"
-    }
+    } else ""
   }
 
   class ModuleHandler(module: ModuleDef) extends MemberDefHandler(module) {