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

Update scalafmt and reformat #276

Merged
merged 2 commits into from
Jun 17, 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.5.3"
version = "2.6.0"
style = defaultWithAlign
maxColumn = 120
align.openParenDefnSite = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import org.scalatest.funspec.AsyncFunSpec

/**
* ChildProcess Test
*
*/
class ChildProcessTest extends AsyncFunSpec {
override implicit val executionContext = ExecutionContext.Implicits.global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import org.scalatest.funspec.AsyncFunSpec

/**
* File System (Fs) Tests
*
*/
class FsTest extends AsyncFunSpec {
override implicit val executionContext = ExecutionContext.Implicits.global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import scala.scalajs.js.JavaScriptException

/**
* File System (Fs) Tests
*
*/
class FsClassesTest extends AnyFunSpec {
describe("ReadStream") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -924,12 +924,11 @@ object Buffer extends js.Object {

/**
* Returns a new `Buffer` which is the result of concatenating all the `Buffer`s in the `list` together.

*
* @param list List of [[Buffer]] or [[Uint8Array]] instances to concat.
* @param totalLength Total length of the `Buffer` instances in `list` when concatenated.
*
* @see [[https://nodejs.org/api/buffer.html#buffer_class_method_buffer_concat_list_totallength]]
*
*/
def concat[B <: Uint8Array](list: js.Array[B], totalLength: Int): Buffer = js.native
def concat[B <: Uint8Array](list: js.Array[B]): Buffer = js.native
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ trait ExecFileSyncOptions extends js.Object {
var stdio: js.UndefOr[StdIo] = js.undefined

/** Environment key-value pairs
*
*/
*/
var env: js.UndefOr[js.Object] = js.undefined

/** (Default: 'utf8')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ trait ForkOptions extends js.Object {
*/
var detached: js.UndefOr[Boolean] = js.undefined

/** Environment key-value pairs */
/** Environment key-value pairs */
var env: js.UndefOr[js.Object] = js.undefined

/** Executable used to create the child process */
var execPath: js.UndefOr[String] = js.undefined

/** List of string arguments passed to the executable (Default: process.execArgv) */
/** List of string arguments passed to the executable (Default: process.execArgv) */
var execArgv: js.UndefOr[Array[String]] = js.undefined

/** From Node.js v13.2.0, v12.16.0.
Expand All @@ -42,7 +42,7 @@ trait ForkOptions extends js.Object {
*/
var stdio: js.UndefOr[String | Array[String]] = js.undefined

/** Sets the user identity of the process. (See setuid(2).) */
/** Sets the user identity of the process. (See setuid(2).) */
var uid: js.UndefOr[UID] = js.undefined

/** Sets the group identity of the process. (See setgid(2).) */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ trait SpawnOptions extends js.Object {
/** Sets the user identity of the process. (See setuid(2).) */
var uid: js.UndefOr[Int] = js.undefined

/** Sets the group identity of the process. (See setgid(2).) */
/** Sets the group identity of the process. (See setgid(2).) */
var gid: js.UndefOr[Int] = js.undefined

/** If true, runs command inside of a shell.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ object EventEmitter extends js.Object {

/** Change the default captureRejections option on all new EventEmitter objects.
*
* experimental!
* experimental!
*/
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
var captureRejections: Boolean = js.native
Expand Down
3 changes: 1 addition & 2 deletions app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/Fs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ trait Fs extends js.Object with FSConstants {
* @param fd the file descriptor
* @param uid the user ID
* @param gid the group ID
*
*/
def fchownSync(fd: FileDescriptor, uid: UID, gid: GID): Unit = js.native

Expand Down Expand Up @@ -1047,7 +1046,7 @@ trait Fs extends js.Object with FSConstants {
* @param callback will be given three arguments (err, written, buffer) where written specifies how many
* bytes were written from buffer.
* @example {{{ fs.write(fd, buffer[, offset[, length[, position]]], callback) }}}
**/
*/
def write(fd: FileDescriptor,
buffer: js.typedarray.Uint8Array,
offset: Int | Null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import io.scalajs.nodejs.stream.{IReadable, IWritable}
import scala.scalajs.js
import scala.scalajs.js.annotation.JSImport

/**reading
/**
* Readline allows of a stream (such as process.stdin) on a line-by-line basis.
* To use this module, do require('readline').
* Note that once you've invoked this module, your Node.js program will not terminate until you've closed the interface.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@ trait TLSSocketOptions extends js.Object {
*/
var requestCert: js.UndefOr[Boolean] = js.undefined

/** Optional, see tls.createServer() */
/** Optional, see tls.createServer() */
var rejectUnauthorized: js.UndefOr[Boolean] = js.undefined

/** Optional, see tls.createServer() */
/** Optional, see tls.createServer() */
var NPNProtocols: js.UndefOr[Boolean] = js.undefined

/** Optional, see tls.createServer() */
/** Optional, see tls.createServer() */
var ALPNProtocols: js.UndefOr[ALPNProtocols] = js.undefined

/** Optional, see tls.createServer() */
/** Optional, see tls.createServer() */
var SNICallback: js.UndefOr[js.Function2[String, js.Function, Any]] = js.undefined

/** An optional Buffer instance containing a TLS session. */
Expand Down