Fix #2859: Remove @JSExportNamed

Author: gzm0

compiler/src/main/scala/org/scalajs/core/compiler/GenJSCode.scala

@@ -392,10 +392,7 @@ abstract class GenJSCode extends plugins.PluginComponent
             () // fields are added via genClassFields()
 
           case dd: DefDef =>
-            if (isNamedExporterDef(dd))
-              generatedMethods ++= genNamedExporterDef(dd)
-            else
-              generatedMethods ++= genMethod(dd)
+            generatedMethods ++= genMethod(dd)
 
           case _ => abort("Illegal tree in gen of genClass(): " + tree)
         }
@@ -798,10 +795,7 @@ abstract class GenJSCode extends plugins.PluginComponent
           case Template(_, _, body) => body.flatMap(gen)
 
           case dd: DefDef =>
-            if (isNamedExporterDef(dd))
-              genNamedExporterDef(dd).toList
-            else
-              genMethod(dd).toList
+            genMethod(dd).toList
 
           case _ =>
             abort("Illegal tree in gen of genInterface(): " + tree)

compiler/src/main/scala/org/scalajs/core/compiler/GenJSExports.scala

@@ -74,19 +74,7 @@ trait GenJSExports extends SubComponent { self: GenJSCode =>
         val exports = for {
           (jsName, specs) <- ctorExports.groupBy(_._1.jsName) // group by exported name
         } yield {
-          val (namedExports, normalExports) = specs.partition(_._1.isNamed)
-
-          val normalCtors = normalExports.map(s => ExportedSymbol(s._2))
-          val namedCtors = for {
-            (exp, ctor) <- namedExports
-          } yield {
-            implicit val pos = exp.pos
-            ExportedBody(List(JSAnyTpe),
-              genNamedExporterBody(ctor, genFormalArg(1).ref),
-              nme.CONSTRUCTOR.toString, pos)
-          }
-
-          val ctors = normalCtors ++ namedCtors
+          val ctors = specs.map(s => ExportedSymbol(s._2))
 
           implicit val pos = ctors.head.pos
 
@@ -106,7 +94,6 @@ trait GenJSExports extends SubComponent { self: GenJSCode =>
         exp <- jsInterop.registeredExportsOf(classSym)
       } yield {
         implicit val pos = exp.pos
-        assert(!exp.isNamed, "Class cannot be exported named")
 
         exp.destination match {
           case ExportDestination.Normal | ExportDestination.TopLevel =>
@@ -123,7 +110,6 @@ trait GenJSExports extends SubComponent { self: GenJSCode =>
         exp <- jsInterop.registeredExportsOf(classSym)
       } yield {
         implicit val pos = exp.pos
-        assert(!exp.isNamed, "Module cannot be exported named")
 
         exp.destination match {
           case ExportDestination.Normal =>
@@ -237,66 +223,6 @@ trait GenJSExports extends SubComponent { self: GenJSCode =>
       }
     }
 
-    /** Tests whether the given def a named exporter def that needs to be
-     *  generated with `genNamedExporterDef`.
-     */
-    def isNamedExporterDef(dd: DefDef): Boolean = {
-      jsInterop.isExport(dd.symbol) &&
-      dd.symbol.annotations.exists(_.symbol == JSExportNamedAnnotation)
-    }
-
-    /** Generate the exporter proxy for a named export */
-    def genNamedExporterDef(dd: DefDef): Option[js.MethodDef] = {
-      implicit val pos = dd.pos
-
-      if (isAbstractMethod(dd)) {
-        None
-      } else {
-        val sym = dd.symbol
-
-        val Block(Apply(fun, _) :: Nil, _) = dd.rhs
-        val trgSym = fun.symbol
-
-        val inArg =
-          js.ParamDef(js.Ident("namedParams"), jstpe.AnyType,
-              mutable = false, rest = false)
-        val inArgRef = inArg.ref
-
-        val methodIdent = encodeMethodSym(sym)
-
-        Some(js.MethodDef(static = false, methodIdent,
-            List(inArg), toIRType(sym.tpe.resultType),
-            Some(genNamedExporterBody(trgSym, inArg.ref)))(
-            OptimizerHints.empty, None))
-      }
-    }
-
-    private def genNamedExporterBody(trgSym: Symbol, inArg: js.Tree)(
-        implicit pos: Position) = {
-
-      if (hasRepeatedParam(trgSym)) {
-        reporter.error(pos,
-            "You may not name-export a method with a *-parameter")
-      }
-
-      val jsArgs = for {
-        (pSym, index) <- trgSym.info.params.zipWithIndex
-      } yield {
-        val rhs = js.JSBracketSelect(inArg,
-            js.StringLiteral(pSym.name.decoded))
-        js.VarDef(js.Ident("namedArg$" + index), jstpe.AnyType,
-            mutable = false, rhs = rhs)
-      }
-
-      val jsArgRefs = jsArgs.map(_.ref)
-
-      // Generate JS code to prepare arguments (default getters and unboxes)
-      val jsArgPrep = genPrepareArgs(jsArgRefs, trgSym)
-      val jsResult = genResult(trgSym, jsArgPrep.map(_.ref), static = false)
-
-      js.Block(jsArgs ++ jsArgPrep :+ jsResult)
-    }
-
     private def genMemberExport(classSym: Symbol, name: TermName): js.Tree = {
       val alts = classSym.info.member(name).alternatives
 

compiler/src/main/scala/org/scalajs/core/compiler/JSDefinitions.scala

@@ -59,7 +59,6 @@ trait JSDefinitions { self: JSGlobalAddons =>
     lazy val JSBracketCallAnnotation   = getRequiredClass("scala.scalajs.js.annotation.JSBracketCall")
     lazy val JSExportAnnotation        = getRequiredClass("scala.scalajs.js.annotation.JSExport")
     lazy val JSExportAllAnnotation     = getRequiredClass("scala.scalajs.js.annotation.JSExportAll")
-    lazy val JSExportNamedAnnotation   = getRequiredClass("scala.scalajs.js.annotation.JSExportNamed")
     lazy val JSExportStaticAnnotation  = getRequiredClass("scala.scalajs.js.annotation.JSExportStatic")
     lazy val JSExportTopLevelAnnotation = getRequiredClass("scala.scalajs.js.annotation.JSExportTopLevel")
     lazy val JSImportAnnotation        = getRequiredClass("scala.scalajs.js.annotation.JSImport")

compiler/src/main/scala/org/scalajs/core/compiler/JSGlobalAddons.scala

@@ -65,7 +65,6 @@ trait JSGlobalAddons extends JSDefinitions
     trait ExportInfo {
       val jsName: String
       val pos: Position
-      val isNamed: Boolean
       val destination: ExportDestination
     }
 

compiler/src/main/scala/org/scalajs/core/compiler/PrepJSExports.scala

@@ -21,11 +21,9 @@ trait PrepJSExports { this: PrepJSInterop =>
 
   import scala.reflect.internal.Flags
 
-  case class ExportInfo(jsName: String, isNamed: Boolean,
+  case class ExportInfo(jsName: String,
       destination: ExportDestination)(val pos: Position)
-      extends jsInterop.ExportInfo {
-    assert(!isNamed || destination == ExportDestination.Normal)
-  }
+      extends jsInterop.ExportInfo
 
   private final val SuppressExportDeprecationsMsg = {
     "\n  (you can suppress this warning in 0.6.x by passing the option " +
@@ -98,12 +96,7 @@ trait PrepJSExports { this: PrepJSInterop =>
       jsInterop.registerForExport(baseSym, topLevelAndStaticExports)
 
       // Actually generate exporter methods
-      normalExports.flatMap { exp =>
-        if (exp.isNamed)
-          genNamedExport(baseSym, exp.jsName, exp.pos) :: Nil
-        else
-          genExportDefs(baseSym, exp.jsName, exp.pos)
-      }
+      normalExports.flatMap(exp => genExportDefs(baseSym, exp.jsName, exp.pos))
     }
   }
 
@@ -147,16 +140,7 @@ trait PrepJSExports { this: PrepJSInterop =>
       } else if (!isMod && !hasAnyNonPrivateCtor) {
         err("You may not export a class that has only private constructors")
       } else {
-        val (named, normal) = exports.partition(_.isNamed)
-
-        for {
-          exp <- named
-        } {
-          reporter.error(exp.pos, "You may not use @JSNamedExport on " +
-              (if (isMod) "an object" else "a Scala.js-defined JS class"))
-        }
-
-        jsInterop.registerForExport(sym, normal)
+        jsInterop.registerForExport(sym, exports)
       }
     }
   }
@@ -204,7 +188,6 @@ trait PrepJSExports { this: PrepJSInterop =>
     val allExportInfos = for {
       annot <- directAnnots ++ unitAnnots
     } yield {
-      val isNamedExport = annot.symbol == JSExportNamedAnnotation
       val isExportAll = annot.symbol == JSExportAllAnnotation
       val isTopLevelExport = annot.symbol == JSExportTopLevelAnnotation
       val isStaticExport = annot.symbol == JSExportStaticAnnotation
@@ -288,20 +271,14 @@ trait PrepJSExports { this: PrepJSInterop =>
         case ExportDestination.Normal =>
           // Make sure we do not override the default export of toString
           def isIllegalToString = {
-            isMember && !isNamedExport &&
-            name == "toString" && sym.name != nme.toString_ &&
+            isMember && name == "toString" && sym.name != nme.toString_ &&
             sym.tpe.params.isEmpty && !jsInterop.isJSGetter(sym)
           }
           if (isIllegalToString) {
             reporter.error(annot.pos, "You may not export a zero-argument " +
                 "method named other than 'toString' under the name 'toString'")
           }
 
-          if (isNamedExport && jsInterop.isJSProperty(sym)) {
-            reporter.error(annot.pos,
-                "You may not export a getter or a setter as a named export")
-          }
-
           // Don't allow nested class / module exports without explicit name.
           def isStaticNested = {
             /* For Scala.js defined JS classes, sym is the class itself. For
@@ -388,7 +365,7 @@ trait PrepJSExports { this: PrepJSInterop =>
           }
       }
 
-      ExportInfo(name, isNamedExport, destination)(annot.pos)
+      ExportInfo(name, destination)(annot.pos)
     }
 
     /* Filter out static exports of accessors (as they are not actually
@@ -483,7 +460,6 @@ trait PrepJSExports { this: PrepJSInterop =>
 
     // Remove export annotations
     expSym.removeAnnotation(JSExportAnnotation)
-    expSym.removeAnnotation(JSExportNamedAnnotation)
 
     // Add symbol to class
     clsSym.info.decls.enter(expSym)
@@ -500,43 +476,6 @@ trait PrepJSExports { this: PrepJSInterop =>
     exporter :: defaultGetters
   }
 
-  /** Generate a dummy DefDef tree for a named export. This tree is captured
-   *  by GenJSCode again to generate the required JavaScript logic.
-   */
-  private def genNamedExport(defSym: Symbol, jsName: String, pos: Position) = {
-    val clsSym = defSym.owner
-    val scalaName = jsInterop.scalaExportName(jsName, false)
-
-    // Create symbol for the new exporter method
-    val expSym = clsSym.newMethodSymbol(scalaName, pos,
-        Flags.SYNTHETIC | Flags.FINAL)
-
-    // Mark the symbol to be a named export
-    expSym.addAnnotation(JSExportNamedAnnotation)
-
-    // Create a single parameter of type Any
-    val param = expSym.newValueParameter(newTermName("namedArgs"), pos)
-    param.setInfo(AnyTpe)
-
-    // Set method type
-    expSym.setInfo(MethodType(param :: Nil, AnyClass.tpe))
-
-    // Register method to parent
-    clsSym.info.decls.enter(expSym)
-
-    // Placeholder tree
-    def ph = Ident(Predef_???)
-
-    // Create a call to the forwarded method with ??? as args
-    val sel: Tree = Select(This(clsSym), defSym)
-    val call = (sel /: defSym.paramss) {
-      (fun, params) => Apply(fun, List.fill(params.size)(ph))
-    }
-
-    // rhs is a block to prevent boxing of result
-    typer.typedDefDef(DefDef(expSym, Block(call, ph)))
-  }
-
   private def genExportDefaultGetter(clsSym: Symbol, trgMethod: Symbol,
       exporter: Symbol, paramPos: Int, pos: Position) = {
 
@@ -613,7 +552,6 @@ trait PrepJSExports { this: PrepJSInterop =>
   /** Whether a symbol is an annotation that goes directly on a member */
   private lazy val isDirectMemberAnnot = Set[Symbol](
       JSExportAnnotation,
-      JSExportNamedAnnotation,
       JSExportTopLevelAnnotation,
       JSExportStaticAnnotation
   )