Skip to content

Commit af74415

Browse files
committed
Fix format and style after hastly merge
1 parent 8752a0b commit af74415

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

modules/build/src/main/scala/scala/build/preprocessing/JavaPreprocessor.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package scala.build.preprocessing
33
import com.virtuslab.using_directives.custom.model.UsingDirectiveKind
44

55
import java.nio.charset.StandardCharsets
6+
67
import scala.build.EitherCps.{either, value}
78
import scala.build.errors.BuildException
89
import scala.build.options.BuildRequirements

modules/build/src/main/scala/scala/build/preprocessing/ScalaPreprocessor.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import dependency.AnyDependency
55
import dependency.parser.DependencyParser
66

77
import java.nio.charset.StandardCharsets
8+
89
import scala.build.EitherCps.{either, value}
910
import scala.build.Ops._
1011
import scala.build.errors._

modules/build/src/test/scala/scala/build/tests/ScalaPreprocessorTests.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@ class ScalaPreprocessorTests extends munit.FunSuite {
4040
private def testWarnings(lines: String*)(expectedWarnings: Check*): Unit = {
4141
val persistentLogger = new PersistentDiagnosticLogger(Logger.nop)
4242
val code = lines.mkString("\n").toCharArray()
43-
val res = ExtractedDirectives.from(code, Right(path), persistentLogger, UsingDirectiveKind.values(), ScopePath.fromPath(path))
43+
val res = ExtractedDirectives.from(
44+
code,
45+
Right(path),
46+
persistentLogger,
47+
UsingDirectiveKind.values(),
48+
ScopePath.fromPath(path)
49+
)
4450
expect(res.isRight)
4551

4652
val diags = persistentLogger.diagnostics

modules/build/src/test/scala/scala/build/tests/SourcesTests.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,14 @@ class SourcesTests extends munit.FunSuite {
269269
)
270270
testInputs.withInputs { (_, inputs) =>
271271
val crossSources = CrossSources.forInputs(
272-
inputs,
273-
Sources.defaultPreprocessors(CustomCodeWrapper),
274-
TestLogger()
275-
)
272+
inputs,
273+
Sources.defaultPreprocessors(CustomCodeWrapper),
274+
TestLogger()
275+
)
276276
expect(crossSources.isLeft)
277277
}
278278
}
279279

280-
281280
test("dependencies in .sc - $ivy") {
282281
val testInputs = TestInputs(
283282
os.rel / "something.sc" ->

0 commit comments

Comments
 (0)