diff --git a/.scalafmt.conf b/.scalafmt.conf index 29b699b08..b98f1a4ea 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "2.6.4" +version = "2.7.0" style = defaultWithAlign maxColumn = 120 align.openParenDefnSite = true diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala index 1313520cf..c3a25838c 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala @@ -38,10 +38,9 @@ class ChildProcessTest extends AsyncFunSpec { } } ) - promise.future.map { - case (stdout, stderr) => - assert(stdout.toString.trim.toInt === 19) - assert(stderr.toString.trim === "") + promise.future.map { case (stdout, stderr) => + assert(stdout.toString.trim.toInt === 19) + assert(stderr.toString.trim === "") } } @@ -58,10 +57,9 @@ class ChildProcessTest extends AsyncFunSpec { } } ) - promise.future.map { - case (stdout, stderr) => - assert(stdout.toString.trim.linesIterator.length > 1) - assert(stderr.toString.trim === "") + promise.future.map { case (stdout, stderr) => + assert(stdout.toString.trim.linesIterator.length > 1) + assert(stderr.toString.trim === "") } } diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala index 89b2a39f2..5c421dd85 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala @@ -39,10 +39,9 @@ class DNSAsyncTest extends AsyncFunSpec { promise.success((hostname, service)) } ) - promise.future.map { - case (host, service) => - assert(host === "localhost") - assert(service === "ssh") + promise.future.map { case (host, service) => + assert(host === "localhost") + assert(service === "ssh") } } @@ -64,16 +63,14 @@ class DNSAsyncTest extends AsyncFunSpec { describe("DNS future extension") { it("supports lookupFuture") { - DNS.lookupFuture(domain) map { - case (ipAddress, ttl) => - assert(ttl > 0 && ipAddress.nonEmpty) + DNS.lookupFuture(domain) map { case (ipAddress, ttl) => + assert(ttl > 0 && ipAddress.nonEmpty) } } it("supports lookupServiceFuture:SSH") { - DNS.lookupServiceFuture("127.0.0.1", 22) map { - case (hostname, service) => - assert(hostname.nonEmpty && service.nonEmpty) + DNS.lookupServiceFuture("127.0.0.1", 22) map { case (hostname, service) => + assert(hostname.nonEmpty && service.nonEmpty) } } diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala index 5cce05c7c..6ae7e2d81 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala @@ -39,10 +39,9 @@ class FsTest extends AsyncFunSpec { ) ) - promise.future.map { - case (eventType, file) => - assert(eventType === "change") - assert(file === "1.txt") + promise.future.map { case (eventType, file) => + assert(eventType === "change") + assert(file === "1.txt") } } @@ -96,9 +95,8 @@ class FsTest extends AsyncFunSpec { promise.success((Fs.statSync(file1), Fs.statSync(file2))) } - promise.future.map { - case (stat1, stat2) => - assert(stat1.size === stat2.size) + promise.future.map { case (stat1, stat2) => + assert(stat1.size === stat2.size) } } diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/os/OSTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/os/OSTest.scala index a29b0140f..a33dcd93e 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/os/OSTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/os/OSTest.scala @@ -52,10 +52,9 @@ class OSTest extends AnyFunSpec { it("supports networkInterfaces()") { val networkInterfaces = OS.networkInterfaces() assert(isDefined(networkInterfaces)) - networkInterfaces foreach { - case (name, iface) => - assert(name.nonEmpty) - assert(iface.nonEmpty) + networkInterfaces foreach { case (name, iface) => + assert(name.nonEmpty) + assert(iface.nonEmpty) } } diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/vm/VMTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/vm/VMTest.scala index b4f39b613..180a188f2 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/vm/VMTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/vm/VMTest.scala @@ -27,10 +27,9 @@ class VMTest extends AnyFunSpec { val script = new Script("""count += 1; name = "kitty" + count""") val context = VM.createContext(sandbox) - expectedSet foreach { - case ExpectedData(animal, count, name) => - script.runInContext(context) - assert(sandbox.animal === animal && sandbox.count === count && sandbox.name === name) + expectedSet foreach { case ExpectedData(animal, count, name) => + script.runInContext(context) + assert(sandbox.animal === animal && sandbox.count === count && sandbox.name === name) } }