Fix resolveDependencySource

allanrenucci · allanrenucci · commit 0c471e50c006 · 2018-03-08T11:27:38.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala
@@ -255,15 +255,15 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
         val source = owners.next()
         def isLocal = !owners.exists(_.isTerm) // side-effectful: consume iterator elements
         if (source.isClass && isLocal) return source
-        else if (source.is(PackageClass)) return responsibleForImports
       }
       assert(false, "unreachable")
       NoSymbol
     }
 
     if (lastOwner != ctx.owner) {
       lastOwner = ctx.owner
-      lastDepSource = resolveDepSource
+      val source = resolveDepSource
+      lastDepSource = if (source.is(PackageClass)) responsibleForImports else source
     }
 
     lastDepSource

Original file line number	Diff line number	Diff line change
`@@ -255,15 +255,15 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT`
`255`	`255`	`val source = owners.next()`
`256`	`256`	`def isLocal = !owners.exists(_.isTerm) // side-effectful: consume iterator elements`
`257`	`257`	`if (source.isClass && isLocal) return source`
`258`		`- else if (source.is(PackageClass)) return responsibleForImports`
`259`	`258`	`}`
`260`	`259`	`assert(false, "unreachable")`
`261`	`260`	`NoSymbol`
`262`	`261`	`}`
`263`	`262`
`264`	`263`	`if (lastOwner != ctx.owner) {`
`265`	`264`	`lastOwner = ctx.owner`
`266`		`- lastDepSource = resolveDepSource`
	`265`	`+ val source = resolveDepSource`
	`266`	`+ lastDepSource = if (source.is(PackageClass)) responsibleForImports else source`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`lastDepSource`