Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Update scalafmt-core to 3.0.5 #422

Merged
merged 2 commits into from
Sep 25, 2021
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
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.0.4"
version = "3.0.5"
style = defaultWithAlign
maxColumn = 120
align.openParenDefnSite = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ class FsV8AsyncTest extends AsyncFunSpec with BeforeAndAfterEach {

it("should support copyFileFuture") {
for {
_ <- Fs.appendFileFuture("x.CopyFile.txt", "yay")
_ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt")
_ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") // succeed
_ <- Fs.appendFileFuture("x.CopyFile.txt", "yay")
_ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt")
_ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") // succeed
_ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt", Fs.constants.COPYFILE_EXCL).failed
stat <- Fs.statFuture("x.CopyFile_2.txt")
_ <- Fs.unlinkFuture("x.CopyFile.txt")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@ class Buffer protected () extends Uint8Array( /* dummy to trick constructor */ -
*/
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12) def readBigInt64BE(
offset: Int
): scalajs.js.BigInt = js.native
): scalajs.js.BigInt = js.native
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12) def readBigInt64BE(): scalajs.js.BigInt = js.native

/** @see
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ trait ForkedChildProcess extends ChildProcess {
sendHandle: Handle,
options: SendOptions,
callback: js.Function1[nodejs.Error, Any]
): Boolean = js.native
): Boolean = js.native
def send(message: js.Any, sendHandle: Handle, options: SendOptions): Boolean = js.native
def send(message: js.Any, sendHandle: Handle, callback: js.Function1[nodejs.Error, Any]): Boolean = js.native
def send(message: js.Any, sendHandle: Handle): Boolean = js.native
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ trait Crypto extends js.Object {
primeEncoding: String,
generator: String,
generatorEncoding: String
): DiffieHellman = js.native
): DiffieHellman = js.native
def createDiffieHellman(prime: BufferLike, generator: String, generatorEncoding: String): DiffieHellman = js.native
def createDiffieHellman(prime: BufferLike, generator: Int): DiffieHellman = js.native
def createDiffieHellman(prime: BufferLike, generator: BufferLike): DiffieHellman = js.native
Expand Down Expand Up @@ -376,7 +376,7 @@ trait Crypto extends js.Object {
keylen: Int,
options: ScryptOptions,
callback: Callback1[Buffer]
): Unit = js.native
): Unit = js.native
def scrypt(password: String, salt: String, keylen: Int, callback: Callback1[Buffer]): Unit = js.native
def scrypt(password: String, salt: BufferLike, keylen: Int, callback: Callback1[Buffer]): Unit = js.native
def scrypt(password: BufferLike, salt: String, keylen: Int, callback: Callback1[Buffer]): Unit = js.native
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ class PromisesResolver extends js.Object {
def resolveAny(hostname: String): js.Promise[js.Array[ResolveObject]] = js.native
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
def resolveCaa(hostname: String): js.Promise[js.Array[ResolveObject]] = js.native
def resolveCname(hostname: String): js.Promise[js.Array[String]] = js.native
def resolveMx(hostname: String): js.Promise[js.Array[MX]] = js.native
def resolveNaptr(hostname: String): js.Promise[js.Array[NAPTR]] = js.native
def resolveNs(hostname: String): js.Promise[js.Array[String]] = js.native
def resolveSoa(hostname: String): js.Promise[js.Array[SOA]] = js.native
def resolveSrv(hostname: String): js.Promise[js.Array[SRV]] = js.native
def resolvePtr(hostname: String): js.Promise[js.Array[String]] = js.native
def resolveTxt(hostname: String): js.Promise[js.Array[String]] = js.native
def reverse(ipAddress: String): js.Promise[js.Array[String]] = js.native
def resolveCname(hostname: String): js.Promise[js.Array[String]] = js.native
def resolveMx(hostname: String): js.Promise[js.Array[MX]] = js.native
def resolveNaptr(hostname: String): js.Promise[js.Array[NAPTR]] = js.native
def resolveNs(hostname: String): js.Promise[js.Array[String]] = js.native
def resolveSoa(hostname: String): js.Promise[js.Array[SOA]] = js.native
def resolveSrv(hostname: String): js.Promise[js.Array[SRV]] = js.native
def resolvePtr(hostname: String): js.Promise[js.Array[String]] = js.native
def resolveTxt(hostname: String): js.Promise[js.Array[String]] = js.native
def reverse(ipAddress: String): js.Promise[js.Array[String]] = js.native
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ trait Event extends js.Object {

def stopPropagation(): Unit = js.native
@deprecated("Use stopPropagation", "legacy")
def cancelBubble: Boolean = js.native
def cancelBubble: Boolean = js.native
def stopImmediatePropagation(): Unit = js.native

def bubbles: Boolean = js.native
def cancelable: Boolean = js.native
@deprecated("Use returnValue", "legacy")
def returnValue: Boolean = js.native
def returnValue: Boolean = js.native
def preventDefault(): Unit = js.native
def defaultPrevented: Boolean = js.native
def composed: Boolean = js.native
Expand Down
6 changes: 3 additions & 3 deletions app/nodejs-v16/src/main/scala/io/scalajs/nodejs/fs/Fs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ trait Fs extends js.Object {
offset: Int | Null,
length: Int | Null,
position: Int | Null
): Unit = js.native
): Unit = js.native
def readSync(fd: FileDescriptor, buffer: BufferLike, offset: Int | Null): Unit = js.native
def readSync(fd: FileDescriptor, buffer: BufferLike): Unit = js.native

Expand Down Expand Up @@ -1237,7 +1237,7 @@ trait Fs extends js.Object {
position: Int,
encoding: String,
callback: FsCallback2[Int, String]
): Unit = js.native
): Unit = js.native
def write(fd: FileDescriptor, string: String, position: Int, callback: FsCallback2[Int, String]): Unit = js.native
def write(fd: FileDescriptor, string: String, callback: FsCallback2[Int, String]): Unit = js.native

Expand Down Expand Up @@ -1494,7 +1494,7 @@ object Fs extends Fs {
offset: Int | Null,
length: Int | Null,
position: Int | Null
): js.Promise[BufferIOResult[js.typedarray.DataView]] = js.native
): js.Promise[BufferIOResult[js.typedarray.DataView]] = js.native
def write(string: String, position: Int | Null, encoding: String): js.Promise[BufferIOResult[String]] = js.native

def writeFile(data: String, options: FileWriteOptions): js.Promise[Unit] = js.native
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ class Http2ServerResponse extends stream.Writable with Http2TimeoutOps {

@deprecated("Use response.socket", "Node.js v13.0.0")
def connection: net.Socket | tls.TLSSocket = js.native
def socket: net.Socket | tls.TLSSocket = js.native
def stream: Http2Stream = js.native
def socket: net.Socket | tls.TLSSocket = js.native
def stream: Http2Stream = js.native

@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.ltNodeJs16)
def req: Http2ServerRequest = js.native
Expand All @@ -40,7 +40,7 @@ class Http2ServerResponse extends stream.Writable with Http2TimeoutOps {
def setHeader(name: String, value: js.Array[String]): Unit = js.native

@deprecated("Use writableEnd", "Node.js v13.4.0, v12.16.0")
def finished: Boolean = js.native
def finished: Boolean = js.native
def headersSent: Boolean = js.native
def sendDate: Boolean = js.native

Expand Down