File tree 2 files changed +6
-7
lines changed
compiler/src/dotty/tools/dotc/sbt
sbt-test/source-dependencies/binary 2 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -142,13 +142,12 @@ class ExtractDependencies extends Phase {
142
142
if (depFile != null ) {
143
143
// Cannot ignore inheritance relationship coming from the same source (see sbt/zinc#417)
144
144
def allowLocal = dep.context == DependencyByInheritance || dep.context == LocalDependencyByInheritance
145
- if (depFile.isClass) {
145
+ val depClassFile =
146
+ if depFile.isClass then depFile
147
+ else depFile.resolveSibling(dep.to.binaryClassName + " .class" )
148
+ if (depClassFile != null ) {
146
149
// Dependency is external -- source is undefined
147
- processExternalDependency(depFile, dep.to.binaryClassName)
148
- // } else if (depFile.isTasty) {
149
- // val depClassFile = depFile.resolveSibling(dep.to.binaryClassName + ".class")
150
- // if depClassFile != null then
151
- // processExternalDependency(depClassFile, dep.to.binaryClassName)
150
+ processExternalDependency(depClassFile, dep.to.binaryClassName)
152
151
} else if (allowLocal || depFile.file != sourceFile) {
153
152
// We cannot ignore dependencies coming from the same source file because
154
153
// the dependency info needs to propagate. See source-dependencies/trait-trait-211.
Original file line number Diff line number Diff line change 3
3
$ sleep 2000
4
4
5
5
$ copy-file changes/Break.scala dep/A.scala
6
- # FIXME -> use/compile
6
+ -> use/compile
You can’t perform that action at this time.
0 commit comments