From 41c280194dd92025c3291b977549dd174b108ec9 Mon Sep 17 00:00:00 2001 From: Hubert Plociniczak Date: Mon, 19 Apr 2010 12:46:23 +0000 Subject: Better fix for #2757. Review by milessabin. --- src/compiler/scala/tools/nsc/settings/MutableSettings.scala | 3 ++- src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/compiler') 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) -- cgit v1.2.3