Skip to content

Commit c965d3c

Browse files
committed
NIT Refactor
- add missing type annotations - update syntax - misc fixes
1 parent c5e3d09 commit c965d3c

File tree

5 files changed

+22
-23
lines changed

5 files changed

+22
-23
lines changed

modules/cli/src/main/scala/scala/cli/commands/util/SharedOptionsUtil.scala

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ import dependency.AnyDependency
88
import dependency.parser.DependencyParser
99

1010
import java.io.{File, InputStream}
11-
12-
import scala.build._
11+
import scala.build.*
1312
import scala.build.blooprifle.BloopRifleConfig
1413
import scala.build.compiler.{BloopCompilerMaker, ScalaCompilerMaker, SimpleScalaCompilerMaker}
1514
import scala.build.errors.BuildException
1615
import scala.build.interactive.Interactive
1716
import scala.build.interactive.Interactive.{InteractiveAsk, InteractiveNop}
18-
import scala.build.internal.CsLoggerUtil._
17+
import scala.build.internal.CsLoggerUtil.*
1918
import scala.build.internal.{Constants, FetchExternalBinary, OsLibc, Util}
2019
import scala.build.options.{Platform, ScalacOpt, ShadowingSeq}
21-
import scala.build.{options => bo}
20+
import scala.build.options as bo
2221
import scala.cli.commands.ScalaJsOptions
23-
import scala.cli.commands.util.CommonOps._
24-
import scala.cli.commands.util.SharedCompilationServerOptionsUtil._
22+
import scala.cli.commands.util.CommonOps.*
23+
import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
2524
import scala.cli.config.{ConfigDb, Keys}
26-
import scala.concurrent.duration._
25+
import scala.concurrent.ExecutionContextExecutorService
26+
import scala.concurrent.duration.*
2727
import scala.util.Properties
2828
import scala.util.control.NonFatal
2929

@@ -65,7 +65,7 @@ object SharedOptionsUtil extends CommandHelpers {
6565
logger.message(s"WARNING: provided resource directory path doesn't exist: $path")
6666
path
6767
}
68-
.map(Inputs.ResourceDirectory(_))
68+
.map(Inputs.ResourceDirectory)
6969
val maybeInputs = Inputs(
7070
args,
7171
Os.pwd,
@@ -94,7 +94,7 @@ object SharedOptionsUtil extends CommandHelpers {
9494
implicit class SharedOptionsOps(v: SharedOptions) {
9595
import v._
9696

97-
def logger = logging.logger
97+
def logger: Logger = logging.logger
9898

9999
private def scalaJsOptions(opts: ScalaJsOptions): options.ScalaJsOptions = {
100100
import opts._
@@ -168,11 +168,11 @@ object SharedOptionsUtil extends CommandHelpers {
168168
scalac.scalacOption
169169
.filter(_.nonEmpty)
170170
.map(ScalacOpt(_))
171-
.map(Positioned.commandLine(_))
171+
.map(Positioned.commandLine)
172172
),
173173
compilerPlugins =
174174
SharedOptionsUtil.parseDependencies(
175-
dependencies.compilerPlugin.map(Positioned.none(_)),
175+
dependencies.compilerPlugin.map(Positioned.none),
176176
ignoreErrors
177177
),
178178
platform = platformOpt.map(o => Positioned(List(Position.CommandLine()), o))
@@ -205,7 +205,7 @@ object SharedOptionsUtil extends CommandHelpers {
205205
extraRepositories = dependencies.repository.map(_.trim).filter(_.nonEmpty),
206206
extraDependencies = ShadowingSeq.from(
207207
SharedOptionsUtil.parseDependencies(
208-
dependencies.dependency.map(Positioned.none(_)),
208+
dependencies.dependency.map(Positioned.none),
209209
ignoreErrors
210210
)
211211
)
@@ -267,7 +267,7 @@ object SharedOptionsUtil extends CommandHelpers {
267267
def configDb: ConfigDb = ConfigDb.open(v).orExit(logger)
268268

269269
def downloadJvm(jvmId: String, options: bo.BuildOptions): String = {
270-
implicit val ec = options.finalCache.ec
270+
implicit val ec: ExecutionContextExecutorService = options.finalCache.ec
271271
val javaHomeManager = options.javaHomeManager
272272
.withMessage(s"Downloading JVM $jvmId")
273273
val logger = javaHomeManager.cache
@@ -352,7 +352,7 @@ object SharedOptionsUtil extends CommandHelpers {
352352
!Properties.isWin
353353
)
354354

355-
def strictBloopJsonCheckOrDefault =
355+
def strictBloopJsonCheckOrDefault: Boolean =
356356
strictBloopJsonCheck.getOrElse(bo.InternalOptions.defaultStrictBloopJsonCheck)
357357
}
358358

modules/cli/src/main/scala/scala/cli/config/ConfigDb.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scala.cli.config
22

3-
import com.github.plokhotnyuk.jsoniter_scala.core.{Key => _, _}
4-
import com.github.plokhotnyuk.jsoniter_scala.macros._
3+
import com.github.plokhotnyuk.jsoniter_scala.core.{Key as _, *}
4+
import com.github.plokhotnyuk.jsoniter_scala.macros.*
55
import coursier.parse.RawJson
66

77
import java.nio.file.attribute.PosixFilePermission

modules/cli/src/main/scala/scala/cli/config/Keys.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ object Keys {
3737
sonatypePassword
3838
)
3939

40-
lazy val map = all.map(e => e.fullName -> e).toMap
40+
lazy val map: Map[String, Key[_]] = all.map(e => e.fullName -> e).toMap
4141

4242
}

modules/options/src/main/scala/scala/build/options/BuildOptions.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ final case class BuildOptions(
170170
else None
171171
}
172172

173-
lazy val finalCache = internal.cache.getOrElse(FileCache())
173+
lazy val finalCache: FileCache[Task] = internal.cache.getOrElse(FileCache())
174174
// This might download a JVM if --jvm … is passed or no system JVM is installed
175175

176-
lazy val archiveCache = ArchiveCache().withCache(finalCache)
176+
lazy val archiveCache: ArchiveCache[Task] = ArchiveCache().withCache(finalCache)
177177

178178
private lazy val javaCommand0: Positioned[JavaHomeInfo] = javaHomeLocation().map { javaHome =>
179179
val (javaVersion, javaCmd) = OsLibc.javaHomeVersion(javaHome)
@@ -599,8 +599,7 @@ final case class BuildOptions(
599599
}
600600
}
601601

602-
val interactive: Interactive =
603-
if (internal.interactive.getOrElse(false)) InteractiveAsk else InteractiveNop
602+
lazy val interactive: Interactive = internal.interactive.getOrElse(() => InteractiveNop)()
604603
}
605604

606605
object BuildOptions {

modules/options/src/main/scala/scala/build/options/InternalOptions.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ final case class InternalOptions(
2525
keepResolution: Boolean = false,
2626
extraSourceFiles: Seq[Positioned[os.Path]] = Nil
2727
) {
28-
def verbosityOrDefault = verbosity.getOrElse(0)
29-
def strictBloopJsonCheckOrDefault =
28+
def verbosityOrDefault: Int = verbosity.getOrElse(0)
29+
def strictBloopJsonCheckOrDefault: Boolean =
3030
strictBloopJsonCheck.getOrElse(InternalOptions.defaultStrictBloopJsonCheck)
3131
}
3232

0 commit comments

Comments
 (0)