Merge pull request #5415 from dotty-staging/fix-#5414

smarter · web-flow · commit 1f6325642a2c · 2018-11-09T09:38:19.000+01:00
Fix #5414: Always emit / for path in decompilation comment
diff --git a/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala b/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala
@@ -39,7 +39,8 @@ class DecompilationPrinter extends Phase {
     if (ctx.settings.printTasty.value) {
       new TastyPrinter(unit.pickled.head._2).printContents()
     } else {
-      out.println(s"/** Decompiled from $unit */")
+      val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
+      out.println(s"/** Decompiled from $unitFile */")
       out.println(new TastyImpl(ctx).showSourceCode.showTree(unit.tpdTree)(ctx))
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ class DecompilationPrinter extends Phase {`
`39`	`39`	`if (ctx.settings.printTasty.value) {`
`40`	`40`	`new TastyPrinter(unit.pickled.head._2).printContents()`
`41`	`41`	`} else {`
`42`		`- out.println(s"/** Decompiled from $unit */")`
	`42`	`+ val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")`
	`43`	`+ out.println(s"/** Decompiled from $unitFile */")`
`43`	`44`	`out.println(new TastyImpl(ctx).showSourceCode.showTree(unit.tpdTree)(ctx))`
`44`	`45`	`}`
`45`	`46`	`}`