From 2551eb2a63100b7b250e782f746c74313228a54f Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Thu, 21 Nov 2013 01:45:42 +0100 Subject: [PATCH] Do not add source dependencies on itself. Adding source dependency on itself doesn't really bring any value so there's no reason to do it. We avoided recording that kind of dependencies by performing a check in `AnalysisCallback` implementation. However, if we have another implementation like `TestCallback` used for testing we do not benefit from that check. Therefore, the check has been moved to dependency phase were dependencies are collected. --- compile/inc/src/main/scala/sbt/inc/Compile.scala | 2 +- compile/interface/src/main/scala/xsbt/Dependency.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compile/inc/src/main/scala/sbt/inc/Compile.scala b/compile/inc/src/main/scala/sbt/inc/Compile.scala index 76ca59b8b..d9ad4cf51 100644 --- a/compile/inc/src/main/scala/sbt/inc/Compile.scala +++ b/compile/inc/src/main/scala/sbt/inc/Compile.scala @@ -97,7 +97,7 @@ private final class AnalysisCallback(internalMap: File => Option[File], external } def sourceDependency(dependsOn: File, source: File, inherited: Boolean) = - if(source != dependsOn) { + { add(sourceDeps, source, dependsOn) if(inherited) add(inheritedSourceDeps, source, dependsOn) } diff --git a/compile/interface/src/main/scala/xsbt/Dependency.scala b/compile/interface/src/main/scala/xsbt/Dependency.scala index 907f62419..535a6b822 100644 --- a/compile/interface/src/main/scala/xsbt/Dependency.scala +++ b/compile/interface/src/main/scala/xsbt/Dependency.scala @@ -79,7 +79,7 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile case None => () } } - else + else if (onSource.file != sourceFile) callback.sourceDependency(onSource.file, sourceFile, inherited) } }