diff options
| author | Prashant Sharma <scrapcodes@gmail.com> | 2015-06-10 10:38:54 +0530 |
|---|---|---|
| committer | Prashant Sharma <scrapcodes@gmail.com> | 2015-06-10 11:51:45 +0530 |
| commit | 39a5e1aed93f7b1483802a0248295229d711e072 (patch) | |
| tree | dc036c74edb9b096060a2696d9fab2239a7f3fb4 /src | |
| parent | db114aa44efe63763a883dcf07d667fe7d744ff6 (diff) | |
| download | scala-39a5e1aed93f7b1483802a0248295229d711e072.tar.gz scala-39a5e1aed93f7b1483802a0248295229d711e072.tar.bz2 scala-39a5e1aed93f7b1483802a0248295229d711e072.zip | |
SI-7747 More tests and logic according to our conclusions on #4522.
Diffstat (limited to 'src')
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/Imports.scala | 8 |
1 files changed, 4 insertions, 4 deletions
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 } |