Upgrade to Scala.js 1.10.1. #15713
Merged
Upgrade to Scala.js 1.10.1. #15713
+19
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Both at call site (for native and non-native JS types) and at definition sites (for non-native JS types). Forward port of scala-js/scala-js@1de54d7
This cherry-picks recent commits from play-json's main, to support Scala.js 1.10.1.
It is fine to do this in a patch version, because * The IR version was not changed in 1.10.x. * There was no change in the scalajs-library API.
|
@mbovel Would you be available to review this PR, perhaps? |
|
Would that make sense to add a test for this? diff --git a/sjs-compiler-tests/test/scala/dotty/tools/dotc/ScalaJSCompilationTests.scala b/sjs-compiler-tests/test/scala/dotty/tools/dotc/ScalaJSCompilationTests.scala
index ca4f292568..9cac009eb0 100644
--- a/sjs-compiler-tests/test/scala/dotty/tools/dotc/ScalaJSCompilationTests.scala
+++ b/sjs-compiler-tests/test/scala/dotty/tools/dotc/ScalaJSCompilationTests.scala
@@ -33,6 +33,15 @@ class ScalaJSCompilationTests extends ParallelTesting {
).checkExpectedErrors()
}
+ // Positive tests ------------------------------------------------------------
+
+ @Test def posScalaJS: Unit = {
+ implicit val testGroup: TestGroup = TestGroup("posScalaJS")
+ aggregateTests(
+ compileFilesInDir("tests/pos-scalajs", scalaJSOptions),
+ ).checkCompile()
+ }
+
// Run tests -----------------------------------------------------------------
override protected def shouldSkipTestSource(testSource: TestSource): Boolean =
diff --git a/tests/pos-scalajs/i15419.scala b/tests/pos-scalajs/i15419.scala
new file mode 100644
index 0000000000..0631af5f54
--- /dev/null
+++ b/tests/pos-scalajs/i15419.scala
@@ -0,0 +1,9 @@
+import scala.scalajs.js
+
+@js.native
+trait Bar extends js.Object:
+ def baz(dummy: Unit = js.native): Unit = js.native
+
+def bar: Bar = ???
+
+@main def main = bar.baz() |
mbovel
reviewed
Jul 21, 2022
| @@ -1829,7 +1829,15 @@ class JSCodeGen()(using genCtx: Context) { | |||
| } | |||
|
|
|||
| case Block(stats, expr) => | |||
| js.Block(stats.map(genStat) :+ genStatOrExpr(expr, isStat)) | |||
| // #15419 Collapse { <undefined-param>; BoxedUnit } to <undefined-param> | |||
| val genStatsAndExpr0 = stats.map(genStat(_)) :+ genStatOrExpr(expr, isStat) | |||
There was a problem hiding this comment.
Minor, style: did you add the underscore on purpose?
Suggested change
| val genStatsAndExpr0 = stats.map(genStat(_)) :+ genStatOrExpr(expr, isStat) | |
| val genStatsAndExpr0 = stats.map(genStat) :+ genStatOrExpr(expr, isStat) |
There was a problem hiding this comment.
Yes, I always add the underscore on purpose. For some reason I don't trust eta expansion 😅
We get the test for free in the upgrade to Scala.js 1.10.1. ;) Since it's part of the test suite of Scala.js 1.10.1. |
Oh, I see. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It is fine to do this in a patch version, because
I'm not sure who's available for reviews, these days. Anyone up for it?