Merge pull request #10115 from dotty-staging/sjs-private-inner-js-class

Scala.js: Handle private inner JS classes.

Author: nicolasstucki

compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

@@ -3384,8 +3384,15 @@ class JSCodeGen()(using genCtx: Context) {
         } else {
           val captureValues = {
             if (code == CREATE_INNER_JS_CLASS) {
+              /* Private inner classes that do not actually access their outer
+               * pointer do not receive an outer argument. We therefore count
+               * the number of constructors that have non-empty param list to
+               * know how many times we need to pass `this`.
+               */
+              val requiredThisParams =
+                classSym.info.decls.lookupAll(nme.CONSTRUCTOR).count(_.info.paramInfoss.head.nonEmpty)
               val outer = genThis()
-              List.fill(classSym.info.decls.lookupAll(nme.CONSTRUCTOR).size)(outer)
+              List.fill(requiredThisParams)(outer)
             } else {
               val fakeNewInstances = args(2).asInstanceOf[JavaSeqLiteral].elems
               fakeNewInstances.flatMap(genCaptureValuesFromFakeNewInstance(_))

project/Build.scala

@@ -1109,7 +1109,6 @@ object Build {
           ++ (dir / "shared/src/test/require-jdk7" ** "*.scala").get
 
           ++ (dir / "js/src/test/scala" ** (("*.scala": FileFilter)
-            -- "ExportsTest.scala" // JS exports + IR checking error
             -- "ObjectTest.scala" // compile errors caused by #9588
             -- "StackTraceTest.scala" // would require `npm install source-map-support`
             -- "UnionTypeTest.scala" // requires the Scala 2 macro defined in Typechecking*.scala
@@ -1126,6 +1125,7 @@ object Build {
       Test / testOptions += Tests.Filter { name =>
         !Set[String](
           "org.scalajs.testsuite.jsinterop.AsyncTest", // needs JS exports in PromiseMock.scala
+          "org.scalajs.testsuite.jsinterop.ExportsTest", // JS exports
           "org.scalajs.testsuite.jsinterop.JSExportStaticTest", // JS exports
 
           // Not investigated so far