summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-02-10 20:46:14 +0100
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-02-10 20:46:14 +0100
commitc611f7b91414831e4de86e07c6310865b075b98d (patch)
tree8f2412d785281c144632aaf7b58eaa1d4edd71a8 /src/compiler/scala/tools/nsc/typechecker/Contexts.scala
parent90aa12ee9cca5d433459f0a825d510c8fb1c17be (diff)
parent894aee1347600201dd2decbd07bcf7820cbbee3d (diff)
downloadscala-c611f7b91414831e4de86e07c6310865b075b98d.tar.gz
scala-c611f7b91414831e4de86e07c6310865b075b98d.tar.bz2
scala-c611f7b91414831e4de86e07c6310865b075b98d.zip
Merge pull request #3502 from retronym/ticket/8258
Fix regression for using Scala IDE on scala-library
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Contexts.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index 5b7956a757..c065fb54b7 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -89,6 +89,8 @@ trait Contexts { self: Analyzer =>
if (settings.noimports) Nil
else if (unit.isJava) RootImports.javaList
else if (settings.nopredef || treeInfo.noPredefImportForUnit(unit.body)) {
+ // SI-8258 Needed for the presentation compiler using -sourcepath, otherwise cycles can occur. See the commit
+ // message for this ticket for an example.
debuglog("Omitted import of Predef._ for " + unit)
RootImports.javaAndScalaList
}