From 39a5e1aed93f7b1483802a0248295229d711e072 Mon Sep 17 00:00:00 2001
From: Prashant Sharma <scrapcodes@gmail.com>
Date: Wed, 10 Jun 2015 10:38:54 +0530
Subject: SI-7747 More tests and logic according to our conclusions on #4522.

---
 src/repl/scala/tools/nsc/interpreter/Imports.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/repl/scala/tools/nsc/interpreter/Imports.scala b/src/repl/scala/tools/nsc/interpreter/Imports.scala
index c52869e208..3ec77e46f1 100644
--- a/src/repl/scala/tools/nsc/interpreter/Imports.scala
+++ b/src/repl/scala/tools/nsc/interpreter/Imports.scala
@@ -166,15 +166,15 @@ trait Imports {
             for (imv <- x.definedNames) {
               if (!currentImps.contains(imv)) {
                 x match {
-                  case _: ValHandler | _: ModuleHandler =>
+                  case _: ClassHandler =>
+                    code.append("import " + objName + req.accessPath + ".`" + imv + "`\n")
+                  case _ =>
                     val valName = req.lineRep.packageName + req.lineRep.readName
                     if (!tempValLines.contains(req.lineRep.lineId)) {
                       code.append(s"val $valName = $objName\n")
                       tempValLines += req.lineRep.lineId
                     }
-                    code.append(s"import $valName ${req.accessPath}.`$imv`;\n")
-                  case _ =>
-                    code.append("import " + objName + req.accessPath + ".`" + imv + "`\n")
+                    code.append(s"import $valName${req.accessPath}.`$imv`;\n")
                 }
                 currentImps += imv
               }
-- 
cgit v1.2.3