Skip to content

Commit fd5aa53

Browse files
committed
Fix binary class name for Java Symbol
1 parent 88fb4ea commit fd5aa53

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ class ExtractDependencies extends Phase {
141141
def processExternalDependency(depFile: AbstractFile) = {
142142

143143
val binaryClassName = ctx.atPhase(ctx.flattenPhase) { implicit ctx =>
144-
dep.to.fullName.toString
144+
if (dep.to.is(JavaDefined)) dep.to.fullName.stripModuleClassSuffix.toString
145+
else dep.to.fullName.toString
145146
}
146147

147148
depFile match {
@@ -151,13 +152,7 @@ class ExtractDependencies extends Phase {
151152
}
152153

153154
case pf: PlainFile => // The dependency comes from a class file
154-
val classFile =
155-
if (dep.to.is(ModuleClass, butNot = Scala2x))
156-
new File(pf.path.stripSuffix(".class") + "$.class")
157-
// Module Class loaded from TASTY are loaded from their companion class file.
158-
// We recover the name of the module class file.
159-
else pf.file
160-
binaryDependency(classFile, binaryClassName)
155+
binaryDependency(pf.file, binaryClassName)
161156

162157
case _ =>
163158
ctx.warning(s"sbt-deps: Ignoring dependency $depFile of class ${depFile.getClass}}")

0 commit comments

Comments
 (0)