diff options
| author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-04-19 12:46:23 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-04-19 12:46:23 +0000 |
| commit | 41c280194dd92025c3291b977549dd174b108ec9 (patch) | |
| tree | 26597d94ee17cc559ccf182bc67b2384a77145fb /src/compiler | |
| parent | 0acdb6a68c756be28fca0de4ec6f8b84aaa4a5ba (diff) | |
| download | scala-41c280194dd92025c3291b977549dd174b108ec9.tar.gz scala-41c280194dd92025c3291b977549dd174b108ec9.tar.bz2 scala-41c280194dd92025c3291b977549dd174b108ec9.zip | |
Better fix for #2757. Review by milessabin.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/MutableSettings.scala | 3 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala index b32796e829..00a384663d 100644 --- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala @@ -291,7 +291,8 @@ class MutableSettings(val errorFn: String => Unit) extends AbsSettings with Scal classFile.path.startsWith(outDir.path) singleOutDir match { - case Some(d) => Nil + case Some(d) => + List(d.lookupPathUnchecked(srcPath, false)) case None => (outputs filter (isBelow _).tupled) match { case Nil => Nil diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index c78664bc19..fc635874a6 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -876,6 +876,7 @@ abstract class ClassfileParser { val srcfileLeaf = pool.getName(in.nextChar).toString.trim val srcpath = sym.enclosingPackage match { case NoSymbol => srcfileLeaf + case definitions.EmptyPackage => srcfileLeaf case pkg => pkg.fullName(File.separatorChar)+File.separator+srcfileLeaf } srcfile0 = settings.outputDirs.srcFilesFor(in.file, srcpath).find(_.exists) |