Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package scala.build.preprocessing
import com.virtuslab.using_directives.custom.model.UsingDirectiveKind

import java.nio.charset.StandardCharsets

import scala.build.EitherCps.{either, value}
import scala.build.errors.BuildException
import scala.build.options.BuildRequirements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import dependency.AnyDependency
import dependency.parser.DependencyParser

import java.nio.charset.StandardCharsets

import scala.build.EitherCps.{either, value}
import scala.build.Ops._
import scala.build.errors._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ class ScalaPreprocessorTests extends munit.FunSuite {
private def testWarnings(lines: String*)(expectedWarnings: Check*): Unit = {
val persistentLogger = new PersistentDiagnosticLogger(Logger.nop)
val code = lines.mkString("\n").toCharArray()
val res = ExtractedDirectives.from(code, Right(path), persistentLogger, UsingDirectiveKind.values(), ScopePath.fromPath(path))
val res = ExtractedDirectives.from(
code,
Right(path),
persistentLogger,
UsingDirectiveKind.values(),
ScopePath.fromPath(path)
)
expect(res.isRight)

val diags = persistentLogger.diagnostics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,15 +269,14 @@ class SourcesTests extends munit.FunSuite {
)
testInputs.withInputs { (_, inputs) =>
val crossSources = CrossSources.forInputs(
inputs,
Sources.defaultPreprocessors(CustomCodeWrapper),
TestLogger()
)
inputs,
Sources.defaultPreprocessors(CustomCodeWrapper),
TestLogger()
)
expect(crossSources.isLeft)
}
}


test("dependencies in .sc - $ivy") {
val testInputs = TestInputs(
os.rel / "something.sc" ->
Expand Down