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

Update scalafmt #211

Merged
merged 1 commit into from
May 5, 2020
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 = "2.4.2"
version = "2.5.1"
style = defaultWithAlign
maxColumn = 120
align.openParenDefnSite = true
Expand Down
9 changes: 6 additions & 3 deletions app/current/src/main/scala/io/scalajs/nodejs/Assert.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ trait Assert extends js.Object {

def doesNotReject(asyncFn: js.Function | js.Promise[_],
error: js.RegExp | js.Function = js.native,
message: String = js.native): Unit = js.native
message: String = js.native
): Unit = js.native

/**
* Asserts that the function block does not throw an error. See assert.throws() for more details.
Expand Down Expand Up @@ -94,11 +95,13 @@ trait Assert extends js.Object {
*/
def throws(block: js.Function,
error: js.RegExp | js.Function | js.Object | Error,
message: String = js.native): Unit = js.native
message: String = js.native
): Unit = js.native

def rejects(asyncFn: js.Function | js.Promise[_],
error: js.RegExp | js.Function | js.Object | Error = js.native,
message: String = js.native): Unit = js.native
message: String = js.native
): Unit = js.native
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ class Buffer private[this] () extends Uint8Array( /* dummy to trick constructor
targetStart: Int = js.native,
targetEnd: Int = js.native,
sourceStart: Int = js.native,
sourceEnd: Int = js.native): Int = js.native
sourceEnd: Int = js.native
): Int = js.native

/**
* Copies data from a region of `buf` to a region in `target` even if the `target` memory region overlaps with `buf`.
Expand All @@ -79,7 +80,8 @@ class Buffer private[this] () extends Uint8Array( /* dummy to trick constructor
def copy(target: Buffer,
targetStart: Int = js.native,
sourceStart: Int = js.native,
sourceEnd: Int = js.native): Int = js.native
sourceEnd: Int = js.native
): Int = js.native

/**
* Creates and returns an [[Iterator]] of `[index, byte]` pairs from the contents of `buf`.
Expand Down Expand Up @@ -111,7 +113,8 @@ class Buffer private[this] () extends Uint8Array( /* dummy to trick constructor
def fill(value: Uint8Array | Int | String,
offset: Int = js.native,
end: Int = js.native,
encoding: String = js.native): this.type = js.native
encoding: String = js.native
): this.type = js.native

/**
* Returns the index of the first occurrence of value in buf or -1 if buf does not contain value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ trait ForkedChildProcess extends ChildProcess {
def send(message: js.Any,
sendHandle: Handle = js.native,
options: SendOptions = js.native,
callback: js.Function1[nodejs.Error, Any] = js.native): Boolean = js.native
callback: js.Function1[nodejs.Error, Any] = js.native
): Boolean = js.native
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ class ExecFileSyncOptions(var cwd: js.UndefOr[String] = js.undefined,
var killSignal: js.UndefOr[KillSignal] = js.undefined,
var uid: js.UndefOr[UID] = js.undefined,
var gid: js.UndefOr[GID] = js.undefined,
var windowsHide: js.UndefOr[Boolean] = js.undefined)
extends js.Object
var windowsHide: js.UndefOr[Boolean] = js.undefined
) extends js.Object
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ class ExecOptions(var cwd: js.UndefOr[String] = js.undefined,
var uid: js.UndefOr[UID] = js.undefined,
var gid: js.UndefOr[GID] = js.undefined,
var windowsHide: js.UndefOr[Boolean] = js.undefined,
var windowsVerbatimArguments: js.UndefOr[Boolean] = js.undefined)
extends js.Object
var windowsVerbatimArguments: js.UndefOr[Boolean] = js.undefined
) extends js.Object
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ class ForkOptions(var cwd: js.UndefOr[String] = js.undefined,
var silent: js.UndefOr[Boolean] = js.undefined,
var stdio: js.UndefOr[String | Array[String]] = js.undefined,
var uid: js.UndefOr[UID] = js.undefined,
var gid: js.UndefOr[GID] = js.undefined)
extends js.Object
var gid: js.UndefOr[GID] = js.undefined
) extends js.Object
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ class SpawnSyncOptions(var cwd: js.UndefOr[String] = js.undefined,
var uid: js.UndefOr[UID] = js.undefined,
var gid: js.UndefOr[GID] = js.undefined,
var windowsHide: js.UndefOr[Boolean] = js.undefined,
var windowsVerbatimArguments: js.UndefOr[Boolean] = js.undefined)
extends js.Object
var windowsVerbatimArguments: js.UndefOr[Boolean] = js.undefined
) extends js.Object
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ object ClusterSettings {
stdio: js.Array[js.Any] = null,
inspectPort: Int | js.Function = null,
cwd: String = null,
windowsHide: Boolean = false): ClusterSettings = {
windowsHide: Boolean = false
): ClusterSettings = {
val settings = js.Dynamic.literal()
settings.updateDynamic("execArgv")(execArgv)
settings.updateDynamic("exec")(exec)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ import scala.scalajs.js
*/
class ConsoleDirOptions(var showHidden: js.UndefOr[Boolean] = js.undefined,
var depth: js.UndefOr[Int] = js.undefined,
var colors: js.UndefOr[Boolean] = js.undefined)
extends js.Object
var colors: js.UndefOr[Boolean] = js.undefined
) extends js.Object
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@ sealed trait Cipher extends Transform {

class SetAADOptions(transform: js.UndefOr[js.Function] = js.undefined,
flush: js.UndefOr[js.Function] = js.undefined,
var plaintextLength: js.UndefOr[Int] = js.undefined)
extends TransformOptions(transform, flush) {}
var plaintextLength: js.UndefOr[Int] = js.undefined
) extends TransformOptions(transform, flush) {}
42 changes: 28 additions & 14 deletions app/current/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ trait Crypto extends js.Object {
def createCipheriv(algorithm: String,
key: String | BufferLike,
iv: String | BufferLike,
options: TransformOptions = js.native): Cipher = js.native
options: TransformOptions = js.native
): Cipher = js.native
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createCipheriv(algorithm: String, key: KeyObject, iv: String | BufferLike, options: TransformOptions): Cipher =
js.native
Expand All @@ -79,18 +80,21 @@ trait Crypto extends js.Object {
def createDecipheriv(algorithm: String,
key: String | BufferLike,
iv: String | BufferLike,
options: TransformOptions = js.native): Decipher = js.native
options: TransformOptions = js.native
): Decipher = js.native
def createDecipheriv(algorithm: String,
key: KeyObject,
iv: String | BufferLike,
options: TransformOptions): Decipher = js.native
options: TransformOptions
): Decipher = js.native
def createDecipheriv(algorithm: String, key: KeyObject, iv: String | BufferLike): Decipher = js.native

def createDiffieHellman(prime: String, primeEncoding: String, generator: Int | BufferLike): DiffieHellman = js.native
def createDiffieHellman(prime: String,
primeEncoding: String,
generator: String,
generatorEncoding: String): DiffieHellman = js.native
generatorEncoding: String
): DiffieHellman = js.native
def createDiffieHellman(prime: BufferLike, generator: String, generatorEncoding: String): DiffieHellman = js.native
def createDiffieHellman(prime: BufferLike, generator: Int | BufferLike): DiffieHellman = js.native
def createDiffieHellman(primeLength: Int, generator: Int | String | BufferLike): DiffieHellman = js.native
Expand Down Expand Up @@ -175,7 +179,8 @@ trait Crypto extends js.Object {
iterations: Int,
keylen: Int,
digest: String,
callback: Callback1[Buffer]): Buffer = js.native
callback: Callback1[Buffer]
): Buffer = js.native

/**
* Provides a synchronous Password-Based Key Derivation Function 2 (PBKDF2) implementation. A selected HMAC digest
Expand All @@ -196,7 +201,8 @@ trait Crypto extends js.Object {
salt: String | BufferLike,
iterations: Int,
keylen: Int,
digest: String): Buffer = js.native
digest: String
): Buffer = js.native

def privateDecrypt(privateKey: String | Buffer, buffer: BufferLike): Buffer = js.native
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
Expand All @@ -223,13 +229,15 @@ trait Crypto extends js.Object {

def randomFillSync(buffer: scala.scalajs.js.typedarray.DataView,
offset: Int,
size: Int): scala.scalajs.js.typedarray.DataView = js.native
size: Int
): scala.scalajs.js.typedarray.DataView = js.native
def randomFillSync(buffer: scala.scalajs.js.typedarray.DataView, offset: Int): scala.scalajs.js.typedarray.DataView =
js.native
def randomFillSync(buffer: scala.scalajs.js.typedarray.DataView): scala.scalajs.js.typedarray.DataView = js.native
def randomFillSync[T <: scala.scalajs.js.typedarray.TypedArray[_, T]](buffer: T,
offset: Int = js.native,
size: Int = js.native): T = js.native
size: Int = js.native
): T = js.native

def randomFill(buffer: Buffer, offset: Int, size: Int, callback: Callback1[Buffer]): Buffer = js.native
def randomFill(buffer: Buffer, offset: Int, callback: Callback1[Buffer]): Buffer = js.native
Expand All @@ -238,30 +246,36 @@ trait Crypto extends js.Object {
def randomFill(buffer: scala.scalajs.js.typedarray.DataView,
offset: Int,
size: Int,
callback: Callback1[scala.scalajs.js.typedarray.DataView]): scala.scalajs.js.typedarray.DataView =
callback: Callback1[scala.scalajs.js.typedarray.DataView]
): scala.scalajs.js.typedarray.DataView =
js.native
def randomFill(buffer: scala.scalajs.js.typedarray.DataView,
offset: Int,
callback: Callback1[scala.scalajs.js.typedarray.DataView]): scala.scalajs.js.typedarray.DataView =
callback: Callback1[scala.scalajs.js.typedarray.DataView]
): scala.scalajs.js.typedarray.DataView =
js.native
def randomFill(buffer: scala.scalajs.js.typedarray.DataView,
callback: Callback1[scala.scalajs.js.typedarray.DataView]): scala.scalajs.js.typedarray.DataView =
callback: Callback1[scala.scalajs.js.typedarray.DataView]
): scala.scalajs.js.typedarray.DataView =
js.native
def randomFill[T <: scala.scalajs.js.typedarray.TypedArray[_, T]](buffer: T,
offset: Int = js.native,
size: Int = js.native,
callback: Callback1[T]): T = js.native
callback: Callback1[T]
): T = js.native

def scrypt(password: String | BufferLike,
salt: String | BufferLike,
keylen: Int,
options: ScryptOptions = js.native,
callback: Callback1[Buffer]): Unit = js.native
callback: Callback1[Buffer]
): Unit = js.native

def scryptSync(password: String | BufferLike,
salt: String | BufferLike,
keylen: Int,
options: ScryptOptions = js.native): Buffer = js.native
options: ScryptOptions = js.native
): Buffer = js.native

def setEngine(engine: String, fips: Int = js.native): Unit = js.native

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ sealed trait Hash extends Transform {

class CreateHashOptions(transform: js.UndefOr[js.Function] = js.undefined,
flush: js.UndefOr[js.Function] = js.undefined,
var outputLength: js.UndefOr[Int] = js.undefined)
extends TransformOptions(transform, flush)
var outputLength: js.UndefOr[Int] = js.undefined
) extends TransformOptions(transform, flush)
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import scala.scalajs.js
class DnsOptions(var family: js.UndefOr[Int] = js.undefined,
var hints: js.UndefOr[Int] = js.undefined,
var all: js.UndefOr[Boolean] = js.undefined,
var verbatim: js.UndefOr[Boolean] = js.undefined)
extends js.Object
var verbatim: js.UndefOr[Boolean] = js.undefined
) extends js.Object
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ trait FSWatcher extends IEventEmitter {
*/
class FSWatcherOptions(var encoding: js.UndefOr[String] = js.undefined,
var persistent: js.UndefOr[Boolean] = js.undefined,
var recursive: js.UndefOr[Boolean] = js.undefined)
extends js.Object
var recursive: js.UndefOr[Boolean] = js.undefined
) extends js.Object
Loading