Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion build.mill.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ object Versions {
}

trait ScalaJsCliModule extends ScalaModule with ScalafixModule {
override def scalacOptions: T[Seq[String]] = super.scalacOptions() ++ Seq("-Wunused")
override def scalacOptions: T[Seq[String]] =
super.scalacOptions() ++ Seq("-Wunused", "-deprecation")

def scalaVersion: T[String] = Versions.scala213
}
Expand Down
7 changes: 6 additions & 1 deletion cli/src/org/scalajs/cli/Scalajsld.scala
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,12 @@ object Scalajsld {
val allValidations = Seq(outputCheck, importMapCheck)
allValidations.forall(_.isRight) match {
case true => success
case false => failure(allValidations.filter(_.isLeft).map(_.left.get).mkString("\n\n"))
case false => failure {
allValidations.flatMap {
case Left(v) => Some(v)
case _ => None
}.mkString("\n\n")
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions cli/src/org/scalajs/cli/Scalajsp.scala
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ object Scalajsp {
readFromFile(fileName)
}

displayFileContent(Await.result(vfile, Duration.Inf), options)
displayFileContent(Await.result(vfile, Duration.Inf))
}
}

Expand All @@ -77,7 +77,7 @@ object Scalajsp {
println(s"Supports Scala.js IR versions up to $binaryEmitted")
}

private def displayFileContent(vfile: IRFile, opts: Options): Unit = {
private def displayFileContent(vfile: IRFile): Unit = {
val tree = Await.result(IRFileImpl.fromIRFile(vfile).tree, Duration.Inf)
new IRTreePrinter(stdout).print(tree)
stdout.write('\n')
Expand Down
10 changes: 5 additions & 5 deletions tests/test/src/org/scalajs/cli/tests/Tests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class Tests extends munit.FunSuite {
"foo.scala"
).call(cwd = dir, stdin = os.Inherit, stdout = os.Inherit)

val res = os
os
.proc(
launcher,
"--stdlib",
Expand Down Expand Up @@ -307,7 +307,7 @@ class Tests extends munit.FunSuite {
"foo.scala"
).call(cwd = dir, stdin = os.Inherit, stdout = os.Inherit)

val res = os
os
.proc(
launcher,
"--stdlib",
Expand Down Expand Up @@ -476,9 +476,9 @@ class Tests extends munit.FunSuite {
val substTo = "https://cdn.jsdelivr.net/gh/stdlib-js/array-base-linspace@esm/index.mjs"
os.write(importmap, s"""{ "imports": {"@stdlib/linspace":"$substTo"}}""")

val out = os.makeDir.all(dir / "out")
os.makeDir.all(dir / "out")

val worky = os.proc(
os.proc(
launcher,
"--stdlib",
scalaJsLibraryCp,
Expand Down Expand Up @@ -537,7 +537,7 @@ class Tests extends munit.FunSuite {
).call(cwd = dir, stdin = os.Inherit, stdout = os.Inherit)

os.makeDir.all(dir / "out")
val res = os
os
.proc(
launcher,
"--stdlib",
Expand Down