luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Additional parens

This commit is contained in:
Eugene Yokota 2026-05-17 00:27:08 -04:00
parent 3c64021190
commit c92ac232c0
18 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildfile/src/main/scala/sbt/internal/parser/SbtParser.scala
View File

@ -258,7 +258,7 @@ private[sbt] case class SbtParser(
|$code
|}""".stripMargin
val fileName = path.id
val reporterId = s"$fileName-${Random.nextInt}"
val reporterId = s"$fileName-${Random.nextInt()}"
val sourceFile = SourceFile(
VirtualFile(reporterId, wrapCode.getBytes(StandardCharsets.UTF_8)),
scala.io.Codec.UTF8

2
buildfile/src/test/scala/sbt/internal/parser/SbtParserErrorSpec.scala
View File

@ -29,7 +29,7 @@ object SbtParserErrorSpec extends AbstractSpec {
print(s"Processing ${file.getFileName}: ")
val vf = converter.toVirtualFile(file)
val buildSbt = Source.fromFile(file.toUri).getLines.toSeq
val buildSbt = Source.fromFile(file.toUri).getLines().toSeq
val message = interceptMessageException(SbtParser(vf, buildSbt))
println(message)
assert(message.contains(file.getFileName.toString))

4
launcher-package/integration-test/src/test/scala/ShellScriptUtil.scala
View File

@ -172,9 +172,9 @@ trait ShellScriptUtil extends BasicTestSuite {
BasicIO.processFully(processLine)
)
)
if p.exitValue != 0 then
if p.exitValue() != 0 then
lines.foreach(l => Console.err.println(l))
sys.error(s"process exit with ${p.exitValue}")
sys.error(s"process exit with ${p.exitValue()}")
f(lines.toList)
()
finally

2
main-actions/src/main/scala/sbt/ForkTests.scala
View File

@ -197,7 +197,7 @@ private class React(
case NonFatal(_) => ()
override def notifyExit(p: Process): Unit =
if !process.isAlive && !promise.isCompleted then
if !process.isAlive() && !promise.isCompleted then
val exitCode = process.exitValue()
if exitCode != 0 then
promise.failure(new RuntimeException(s"Forked test process exited with code $exitCode"))

2
main-actions/src/main/scala/sbt/internal/WorkerExchange.scala
View File

@ -110,7 +110,7 @@ class WorkerProxy(
input.close()
serverSocket.foreach(_.close())
def blockForExitCode(): Int =
if !process.isAlive then process.exitValue()
if !process.isAlive() then process.exitValue()
else Fork.blockForExitCode(process)
/** print a line into stdin of the worker process. */

2
main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala
View File

@ -68,7 +68,7 @@ private[sbt] abstract class AbstractTaskExecuteProgress(
timings.forEach { (task, timing) =>
if (timing.isActive) result += task -> (now - timing.startNanos).nanos
}
result.result
result.result()
}
override def afterRegistered(

2
main/src/main/scala/sbt/internal/CommandExchange.scala
View File

@ -100,7 +100,7 @@ private[sbt] final class CommandExchange {
Option(deadline match {
case Some(d: Deadline) =>
commandQueue.poll(d.timeLeft.toMillis + 1, TimeUnit.MILLISECONDS) match {
case null if idleDeadline.fold(false)(_.isOverdue) =>
case null if idleDeadline.fold(false)(_.isOverdue()) =>
state.foreach { s =>
s.get(BasicKeys.serverIdleTimeout) match {
case Some(Some(d)) => s.log.info(s"sbt idle timeout of $d expired")

2
main/src/main/scala/sbt/internal/Continuous.scala
View File

@ -501,7 +501,7 @@ private[sbt] object Continuous {
* increase in latency.
*/
@tailrec def aggregate(res: Seq[Event]): Seq[Event] =
if (limit.isOverdue) res
if (limit.isOverdue()) res
else {
monitor.poll(antiEntropyPollPeriod) match {
case s if s.nonEmpty => aggregate(res ++ s)

2
main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala
View File

@ -194,7 +194,7 @@ private[sbt] abstract class AbstractBackgroundJobService extends BackgroundJobSe
override final def close(): Unit = shutdown()
override def shutdown(): Unit = {
val deadline = 10.seconds.fromNow
while (jobSet.nonEmpty && !deadline.isOverdue) {
while (jobSet.nonEmpty && !deadline.isOverdue()) {
jobSet.headOption.foreach { case handle: ThreadJobHandle @unchecked =>
if (handle.job.isRunning()) {
handle.job.shutdown()

2
main/src/main/scala/sbt/internal/TaskProgress.scala
View File

@ -86,7 +86,7 @@ private[sbt] class TaskProgress(
private def doReport(): Unit = {
val runnable: Runnable = () => {
if (nextReport.get.isOverdue) {
if (nextReport.get.isOverdue()) {
report()
}
}

2
main/src/main/scala/sbt/internal/server/Definition.scala
View File

@ -219,7 +219,7 @@ private[sbt] object Definition {
}
private[sbt] def getAnalyses: Future[Seq[Analysis]] = {
val result = Promise[Seq[Analysis]]
val result = Promise[Seq[Analysis]]()
new Thread("sbt-get-analysis-thread") {
setDaemon(true)

2
main/src/main/scala/sbt/internal/server/NetworkChannel.scala
View File

@ -765,7 +765,7 @@ final class NetworkChannel(
private def empty = TerminalPropertiesResponse(0, 0, false, false, false, false)
def getProperties(block: Boolean): Unit = {
if (alive.get) {
if (!pending.get && Option(lastUpdate.get).fold(true)(d => (d + 1.second).isOverdue)) {
if (!pending.get && Option(lastUpdate.get).fold(true)(d => (d + 1.second).isOverdue())) {
pending.set(true)
val queue = VirtualTerminal.sendTerminalPropertiesQuery(term.name, jsonRpcRequest)
val update: Runnable = () => {

2
main/src/main/scala/sbt/nio/Settings.scala
View File

@ -245,7 +245,7 @@ private[sbt] object Settings {
val created = createdBuilder.result()
val modified = modifiedBuilder.result()
if (created.isEmpty && deleted.isEmpty && modified.isEmpty) {
FileChanges.unmodified(unmodifiedBuilder.result)
FileChanges.unmodified(unmodifiedBuilder.result())
} else {
FileChanges(created, deleted, modified, unmodified)
}

2
scripted-sbt/src/main/scala/sbt/scriptedtest/SbtHandler.scala
View File

@ -67,7 +67,7 @@ final class SbtHandler(remoteSbtCreator: RemoteSbtCreator) extends StatementHand
} catch {
case _: IOException => process.destroy()
} finally {
if (process.isAlive) process.destroy()
if (process.isAlive()) process.destroy()
RunningProcesses.remove(process)
}
}

2
server-test/src/test/scala/testpkg/ChannelCursorTest.scala
View File

@ -78,7 +78,7 @@ class ChannelCursorTest extends AbstractServerTest {
@tailrec def impl(): Boolean =
lines.poll(deadline.timeLeft.toMillis, TimeUnit.MILLISECONDS) match {
case null => false
case s => if (!f(s) && !deadline.isOverdue) impl() else !deadline.isOverdue()
case s => if (!f(s) && !deadline.isOverdue()) impl() else !deadline.isOverdue()
}
impl()
}

24
server-test/src/test/scala/testpkg/TestServer.scala
View File

@ -192,15 +192,15 @@ case class TestServer(
hostLog(s"wait $duration until the server is ready to respond")
val deadline = duration.fromNow
var nextLog = 10.seconds.fromNow
while (portfileIsEmpty() && !deadline.isOverdue && process.isAlive) {
if (nextLog.isOverdue) {
while (portfileIsEmpty() && !deadline.isOverdue() && process.isAlive()) {
if (nextLog.isOverdue()) {
hostLog("waiting for the server...")
nextLog = 10.seconds.fromNow
}
Thread.sleep(10) // Don't spam the portfile
}
if (deadline.isOverdue) sys.error(s"Timeout. $portfile is not found.")
if (!process.isAlive) sys.error(s"Server unexpectedly terminated.")
if (deadline.isOverdue()) sys.error(s"Timeout. $portfile is not found.")
if (!process.isAlive()) sys.error(s"Server unexpectedly terminated.")
}
waitForPortfile(1.minute)
@ -254,18 +254,18 @@ case class TestServer(
"""{ "jsonrpc": "2.0", "id": 9, "method": "sbt/exec", "params": { "commandLine": "shutdown" } }"""
)
val deadline = 5.seconds.fromNow
while (!deadline.isOverdue && process.isAlive) {
while (!deadline.isOverdue() && process.isAlive()) {
Thread.sleep(10)
}
// We gave the server a chance to exit but it didn't within a reasonable time frame.
if (deadline.isOverdue && process.isAlive) {
if (deadline.isOverdue() && process.isAlive()) {
process.destroy()
val newDeadline = 10.seconds.fromNow
while (!newDeadline.isOverdue && process.isAlive) {
while (!newDeadline.isOverdue() && process.isAlive()) {
Thread.sleep(10)
}
}
if (process.isAlive) throw new IllegalStateException(s"process $process failed to exit")
if (process.isAlive()) throw new IllegalStateException(s"process $process failed to exit")
} finally {
readThread.interrupt()
/*
@ -309,7 +309,7 @@ case class TestServer(
@tailrec def impl(): Boolean =
lines.poll(deadline.timeLeft.toMillis, TimeUnit.MILLISECONDS) match {
case null => false
case s => if (!f(s) && !deadline.isOverdue) impl() else !deadline.isOverdue()
case s => if (!f(s) && !deadline.isOverdue()) impl() else !deadline.isOverdue()
}
impl()
}
@ -336,7 +336,7 @@ case class TestServer(
case Success(value) =>
value
case Failure(exception) =>
if (deadline.isOverdue) {
if (deadline.isOverdue()) {
val ex = new TimeoutException()
ex.initCause(exception)
throw ex
@ -357,8 +357,8 @@ case class TestServer(
case s =>
val s1 = s
val correctId = s1.contains("\"id\":\"" + id + "\"")
if (!correctId && !deadline.isOverdue) impl()
else if (deadline.isOverdue)
if (!correctId && !deadline.isOverdue()) impl()
else if (deadline.isOverdue())
throw new TimeoutException()
else s
}

4
tasks-standard/src/test/scala/Test.scala
View File

@ -45,7 +45,9 @@ object Test extends std.TaskExtra:
lazy val d3 = t3(a, b, c).flatMapR(f3)
def d4(i: Int): Task[Int] = nop flatMap { _ =>
val x = math.random; if (x < 0.01) task(i); else d4(i + 1)
val x = math.random()
if (x < 0.01) task(i)
else d4(i + 1)
}
def go(): Unit = {

14
util-collection/src/main/scala/sbt/internal/util/Settings.scala
View File

@ -66,17 +66,19 @@ trait Init:
def values: Iterable[Any] = data.values
def get[A](key: ScopedKey[A]): Option[A] =
delegates(key).flatMap(data.get).nextOption.asInstanceOf[Option[A]]
delegates(key).flatMap(data.get).nextOption().asInstanceOf[Option[A]]
def definingKey[A](key: ScopedKey[A]): Option[ScopedKey[A]] =
delegates(key).find(data.contains)
def getKeyValue[A](key: ScopedKey[A]): Option[(ScopedKey[A], A)] =
delegates(key).flatMap { k =>
data.get(k) match
case None => None
case Some(v) => Some(k -> v.asInstanceOf[A])
}.nextOption
delegates(key)
.flatMap { k =>
data.get(k) match
case None => None
case Some(v) => Some(k -> v.asInstanceOf[A])
}
.nextOption()
def getDirect[A](key: ScopedKey[A]): Option[A] = data.get(key).asInstanceOf[Option[A]]