Remove the -p/--relfProxies option of scalajsp.

Since there are no reflective proxies in sjsir files anymore,
this option is obsolete.

Author: sjrd

cli/src/main/scala/org/scalajs/cli/Scalajsp.scala

@@ -31,7 +31,6 @@ object Scalajsp {
 
   private case class Options(
     infos: Boolean = false,
-    showReflProxy: Boolean = false,
     jar: Option[File] = None,
     fileNames: Seq[String] = Seq.empty)
 
@@ -49,9 +48,6 @@ object Scalajsp {
       opt[Unit]('i', "infos")
         .action { (_, c) => c.copy(infos = true) }
         .text("Show DCE infos instead of trees")
-      opt[Unit]('p', "reflProxies")
-        .action { (_, c) => c.copy(showReflProxy = true) }
-        .text("Show reflective call proxies")
       opt[Unit]('s', "supported")
         .action { (_,_) => printSupported(); sys.exit() }
         .text("Show supported Scala.js IR versions")
@@ -90,15 +86,8 @@ object Scalajsp {
       opts: Options): Unit = {
     if (opts.infos)
       new InfoPrinter(stdout).print(vfile.info)
-    else {
-      val (info, tree) = vfile.infoAndTree
-      val outTree = {
-        if (opts.showReflProxy) tree
-        else filterOutReflProxies(tree)
-      }
-
-      new IRTreePrinter(stdout).printTopLevelTree(outTree)
-    }
+    else
+      new IRTreePrinter(stdout).printTopLevelTree(vfile.tree)
 
     stdout.flush()
   }
@@ -141,15 +130,4 @@ object Scalajsp {
   private val stdout =
     new BufferedWriter(new OutputStreamWriter(Console.out, "UTF-8"))
 
-  // !!! CODE DUPLICATION with ScalaJSPluginInternal.filterOutReflProxies
-  private def filterOutReflProxies(tree: ClassDef): ClassDef = {
-    import ir.Trees._
-    import ir.Definitions.isReflProxyName
-    val newDefs = tree.defs.filter {
-      case MethodDef(_, Ident(name, _), _, _, _) => !isReflProxyName(name)
-      case _ => true
-    }
-    tree.copy(defs = newDefs)(tree.optimizerHints)(tree.pos)
-  }
-
 }

project/BinaryIncompatibilities.scala

@@ -12,12 +12,44 @@ object BinaryIncompatibilities {
   )
 
   val SbtPlugin = Seq(
+      // private, not an issue
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.sbtplugin.ScalaJSPluginInternal.org$scalajs$sbtplugin$ScalaJSPluginInternal$$filterOutReflProxies")
   )
 
   val TestAdapter = Seq(
   )
 
   val CLI = Seq(
+      // private, not an issue
+      ProblemFilters.exclude[MissingTypesProblem](
+          "org.scalajs.cli.Scalajsp$Options$"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.cli.Scalajsp#Options.this"),
+      ProblemFilters.exclude[IncompatibleResultTypeProblem](
+          "org.scalajs.cli.Scalajsp#Options.<init>$default$2"),
+      ProblemFilters.exclude[IncompatibleResultTypeProblem](
+          "org.scalajs.cli.Scalajsp#Options.<init>$default$3"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.cli.Scalajsp#Options.<init>$default$4"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.cli.Scalajsp#Options.apply"),
+      ProblemFilters.exclude[IncompatibleResultTypeProblem](
+          "org.scalajs.cli.Scalajsp#Options.apply$default$2"),
+      ProblemFilters.exclude[IncompatibleResultTypeProblem](
+          "org.scalajs.cli.Scalajsp#Options.apply$default$3"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.cli.Scalajsp#Options.apply$default$4"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.cli.Scalajsp#Options.copy"),
+      ProblemFilters.exclude[IncompatibleResultTypeProblem](
+          "org.scalajs.cli.Scalajsp#Options.copy$default$2"),
+      ProblemFilters.exclude[IncompatibleResultTypeProblem](
+          "org.scalajs.cli.Scalajsp#Options.copy$default$3"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.cli.Scalajsp#Options.copy$default$4"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.cli.Scalajsp#Options.showReflProxy")
   )
 
   val Library = Seq(

sbt-plugin/src/main/scala/scala/scalajs/sbtplugin/ScalaJSPluginInternal.scala

@@ -143,14 +143,12 @@ object ScalaJSPluginInternal {
 
   private def scalajspSettings: Seq[Setting[_]] = {
     case class Options(
-        infos: Boolean = false,
-        showReflProxy: Boolean = false
+        infos: Boolean = false
     )
 
     val optionsParser: Parser[Options] = {
       token(OptSpace ~> (
           (literal("-i") | "--infos") ^^^ ((_: Options).copy(infos = true))
-        | (literal("-p") | "--reflProxies") ^^^ ((_: Options).copy(showReflProxy = true))
       )).* map {
         fns => Function.chain(fns)(Options())
       }
@@ -182,32 +180,15 @@ object ScalaJSPluginInternal {
           val vfile = ScalajspUtils.loadIRFile(cp, relPath)
 
           val stdout = new java.io.PrintWriter(System.out)
-          if (options.infos) {
+          if (options.infos)
             new InfoPrinter(stdout).print(vfile.info)
-          } else {
-            val (info, tree) = vfile.infoAndTree
-            val outTree = {
-              if (options.showReflProxy) tree
-              else filterOutReflProxies(tree)
-            }
-            new IRTreePrinter(stdout).printTopLevelTree(outTree)
-          }
+          else
+            new IRTreePrinter(stdout).printTopLevelTree(vfile.tree)
           stdout.flush()
         }
     )
   }
 
-  // !!! CODE DUPLICATION with Scalajsp.filterOutReflProxies
-  private def filterOutReflProxies(tree: ir.Trees.ClassDef): ir.Trees.ClassDef = {
-    import ir.Trees._
-    import ir.Definitions.isReflProxyName
-    val newDefs = tree.defs.filter {
-      case MethodDef(_, Ident(name, _), _, _, _) => !isReflProxyName(name)
-      case _ => true
-    }
-    tree.copy(defs = newDefs)(tree.optimizerHints)(tree.pos)
-  }
-
   val scalaJSConfigSettings: Seq[Setting[_]] = Seq(
       incOptions ~= scalaJSPatchIncOptions
   ) ++ (