Skip to content

Upgrade to Scala.js 1.3.1. #10423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2020
Merged

Upgrade to Scala.js 1.3.1. #10423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,9 +1048,6 @@ class JSCodeGen()(using genCtx: Context) {
"Malformed parameter list: " + vparamss)
val params = if (vparamss.isEmpty) Nil else vparamss.head.map(_.symbol)

val isJSClassConstructor =
sym.isClassConstructor && currentClassSym.isNonNativeJSClass

val methodName = encodeMethodSym(sym)
val originalName = originalNameOfMethod(sym)

Expand Down Expand Up @@ -1089,18 +1086,17 @@ class JSCodeGen()(using genCtx: Context) {
}

val methodDef = {
if (isJSClassConstructor) {
if (sym.isClassConstructor) {
val body0 = genStat(rhs)
val body1 =
if (!sym.isPrimaryConstructor) body0
else moveAllStatementsAfterSuperConstructorCall(body0)
js.MethodDef(js.MemberFlags.empty, methodName, originalName,
jsParams, jstpe.NoType, Some(body1))(optimizerHints, None)
} else if (sym.isClassConstructor) {
val body1 = {
val needsMove = currentClassSym.isNonNativeJSClass && sym.isPrimaryConstructor
if (needsMove) moveAllStatementsAfterSuperConstructorCall(body0)
else body0
}
val namespace = js.MemberNamespace.Constructor
js.MethodDef(js.MemberFlags.empty.withNamespace(namespace),
methodName, originalName, jsParams, jstpe.NoType,
Some(genStat(rhs)))(optimizerHints, None)
methodName, originalName, jsParams, jstpe.NoType, Some(body1))(
optimizerHints, None)
} else {
val namespace = if (isMethodStaticInIR(sym)) {
if (sym.isPrivate) js.MemberNamespace.PrivateStatic
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// e.g. addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.1")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6")

Expand Down