Skip to content

Commit eb19e6e

Browse files
committed
Apply scalafmt
1 parent ea70a8a commit eb19e6e

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

modules/build/src/main/scala/scala/build/Build.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,8 @@ object Build {
996996
} ++ {
997997
if (scope == Scope.Test) inputs.moduleDependencies.map { depProjectName =>
998998
classesDir(inputs.workspace, depProjectName, Scope.Test)
999-
} else Nil
999+
}
1000+
else Nil
10001001
}
10011002

10021003
value(validate(logger, options))

modules/cli/src/main/scala/scala/cli/commands/setupide/SetupIde.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
77
import com.google.gson.GsonBuilder
88

99
import java.nio.charset.{Charset, StandardCharsets}
10+
1011
import scala.build.EitherCps.{either, value}
1112
import scala.build.*
1213
import scala.build.bsp.IdeInputs
@@ -127,11 +128,13 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
127128
for (module <- moduleInputs) do value(downloadDeps(module, buildOptions, logger))
128129

129130
val workspace = moduleInputs.head.workspace
130-
131+
131132
val (bspName, bspJsonDestination) = bspDetails(workspace, options.bspFile)
132133
val scalaCliBspJsonDestination = workspace / Constants.workspaceDirName / "ide-options-v2.json"
133-
val scalaCliBspLauncherOptsJsonDestination = workspace / Constants.workspaceDirName / "ide-launcher-options.json"
134-
val scalaCliBspInputsJsonDestination = workspace / Constants.workspaceDirName / "ide-inputs.json"
134+
val scalaCliBspLauncherOptsJsonDestination =
135+
workspace / Constants.workspaceDirName / "ide-launcher-options.json"
136+
val scalaCliBspInputsJsonDestination =
137+
workspace / Constants.workspaceDirName / "ide-inputs.json"
135138
val scalaCliBspEnvsJsonDestination = workspace / Constants.workspaceDirName / "ide-envs.json"
136139

137140
// FIXME single modules can also be defined with module config toml file

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import dependency.parser.DependencyParser
1616
import java.io.{File, InputStream}
1717
import java.nio.file.Paths
1818
import java.util.concurrent.atomic.AtomicBoolean
19+
1920
import scala.build.EitherCps.{either, value}
2021
import scala.build.Ops.EitherOptOps
2122
import scala.build.*

modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import com.google.gson.{Gson, JsonElement}
77

88
import java.net.URI
99
import java.nio.file.Paths
10+
import java.util.concurrent.{ExecutorService, ScheduledExecutorService}
11+
12+
import scala.annotation.tailrec
1013
import scala.async.Async.{async, await}
1114
import scala.cli.integration.compose.ComposeBspTestDefinitions
1215
import scala.concurrent.ExecutionContext.Implicits.global

modules/integration/src/test/scala/scala/cli/integration/compose/ComposeBspTestDefinitions.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package scala.cli.integration.compose
22

3-
import ch.epfl.scala.bsp4j as b
43
import ch.epfl.scala.bsp4j.BuildTargetIdentifier
4+
import ch.epfl.scala.bsp4j as b
55
import com.eed3si9n.expecty.Expecty.expect
66

77
import java.net.URI
88
import java.nio.file.Paths
9+
910
import scala.async.Async.{async, await}
1011
import scala.cli.integration.*
1112
import scala.concurrent.ExecutionContext.Implicits.global
@@ -71,8 +72,8 @@ trait ComposeBspTestDefinitions extends ScalaCliSuite { _: BspTestDefinitions =>
7172
| println(Utils2.util)
7273
|}
7374
|""".stripMargin,
74-
os.rel / "Utils.scala" -> "object Utils { def util: String = \"util\"}",
75-
os.rel / "Utils2.scala" -> "object Utils2 { def util: String = \"util2\"}"
75+
os.rel / "Utils.scala" -> "object Utils { def util: String = \"util\"}",
76+
os.rel / "Utils2.scala" -> "object Utils2 { def util: String = \"util2\"}"
7677
)
7778

7879
withBsp(testInputs, Seq("--power", ".")) { (root, _, remoteServer) =>
@@ -177,7 +178,7 @@ trait ComposeBspTestDefinitions extends ScalaCliSuite { _: BspTestDefinitions =>
177178
expect(resp.getStatusCode == b.StatusCode.OK)
178179
}
179180

180-
val compileProducts = os.walk(classDir).filter(os.isFile(_)).map(_.relativeTo(classDir))
181+
os.walk(classDir).filter(os.isFile(_)).map(_.relativeTo(classDir))
181182

182183
// if (actualScalaVersion.startsWith("3."))
183184
// expect(compileProducts.contains(os.rel / "simple$_.class"))

0 commit comments

Comments
 (0)