Merge pull request #43 from retronym/topic/scalap-privates

Print privates in Scalap renderers
lightbend-labs · Jul 31, 2019 · 554715e · 554715e
2 parents ca44800 + 37d3bfa
commit 554715e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/core/src/main/scala/scala/tools/jardiff/JarDiff.scala b/core/src/main/scala/scala/tools/jardiff/JarDiff.scala
@@ -120,8 +120,8 @@ object JarDiff {
   }
   def apply(files: List[List[Path]], config: JarDiff.Config): JarDiff = {
     val renderers = Map(
-      "class" -> List(new AsmTextifyRenderer(config.code, config.raw, config.privates), new ScalapRenderer()),
-      "sig" -> List(new ScalapSigRenderer())
+      "class" -> List(new AsmTextifyRenderer(config.code, config.raw, config.privates), new ScalapRenderer(config.privates)),
+      "sig" -> List(new ScalapSigRenderer(config.privates))
     ).withDefault(_ => List(IdentityRenderer))
     new JarDiff(files, config, renderers)
   }

diff --git a/core/src/main/scala/scala/tools/jardiff/ScalapRenderer.scala b/core/src/main/scala/scala/tools/jardiff/ScalapRenderer.scala
@@ -8,12 +8,14 @@ import java.nio.file.{Files, Path}
 
 import scala.tools.scalap.scalax.rules.ScalaSigParserError
 
-class ScalapRenderer() extends FileRenderer {
+class ScalapRenderer(privates: Boolean) extends FileRenderer {
   def outFileExtension: String = ".scalap"
   override def render(in: Path, out: Path): Unit = {
     val classBytes = Files.readAllBytes(in)
     try {
-      val decompiled = scala.tools.scalap.Main.decompileScala(classBytes, in.getFileName.toString == "package.class")
+      val main = new scala.tools.scalap.Main
+      main.printPrivates = privates
+      val decompiled = main.decompileScala(classBytes, in.getFileName.toString == "package.class")
       if (decompiled != "") {
         Files.createDirectories(out.getParent)
         Files.write(out, decompiled.getBytes("UTF-8"))

diff --git a/core/src/main/scala/scala/tools/jardiff/ScalapSigRenderer.scala b/core/src/main/scala/scala/tools/jardiff/ScalapSigRenderer.scala
@@ -5,13 +5,15 @@ import java.nio.file.{Files, Path}
 import scala.tools.scalap.scalax.rules.ScalaSigParserError
 import scala.tools.scalap.scalax.rules.scalasig.{ByteCode, ScalaSigAttributeParsers}
 
-class ScalapSigRenderer() extends FileRenderer {
+class ScalapSigRenderer(privates: Boolean) extends FileRenderer {
   def outFileExtension: String = ".scalap"
   override def render(in: Path, out: Path): Unit = {
     val classBytes = Files.readAllBytes(in)
     try {
       val scalaSig = ScalaSigAttributeParsers.parse(ByteCode(classBytes))
-      val decompiled = scala.tools.scalap.Main.parseScalaSignature(scalaSig, in.getFileName.toString == "package.sig")
+      val main = new scala.tools.scalap.Main
+      main.printPrivates = privates
+      val decompiled = main.parseScalaSignature(scalaSig, in.getFileName.toString == "package.sig")
       if (decompiled != "") {
         Files.createDirectories(out.getParent)
         Files.write(out, decompiled.getBytes("UTF-8"))