Pass positions around when handling @using directives

using_directives still needs to provide use positions though.

Author: alexarchambault

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

@@ -3,6 +3,7 @@ package scala.build.preprocessing
 import com.virtuslab.using_directives.custom.model.{Path, Value}
 
 import scala.build.Ops._
+import scala.build.Position
 import scala.build.errors.{BuildException, CompositeBuildException}
 import scala.build.options.{BuildOptions, ScalaOptions}
 import scala.build.preprocessing.directives.DirectiveHandler
@@ -64,7 +65,9 @@ object DirectivesProcessor {
       .iterator
       .flatMap {
         case (k, v) =>
-          handlersMap.get(k).iterator.map(_(v, cwd))
+          // FIXME using_directives needs to give us positions here
+          val positionOpt = Option.empty[Position]
+          handlersMap.get(k).iterator.map(_(v, cwd, positionOpt))
       }
       .toVector
       .sequence

modules/build/src/main/scala/scala/build/preprocessing/directives/DirectiveHandler.scala

@@ -1,5 +1,6 @@
 package scala.build.preprocessing.directives
 
+import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.BuildOptions
 import scala.build.preprocessing.ScopePath
@@ -14,7 +15,11 @@ trait DirectiveHandler {
 
   // Strict / using_directives-based directives
   def keys: Seq[String] = Nil
-  def handleValues(values: Seq[Any], cwd: ScopePath): Either[BuildException, BuildOptions] =
+  def handleValues(
+    values: Seq[Any],
+    cwd: ScopePath,
+    positionOpt: Option[Position]
+  ): Either[BuildException, BuildOptions] =
     if (keys.isEmpty)
       sys.error("Cannot happen")
     else

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingCustomJarDirectiveHandler.scala

@@ -1,6 +1,8 @@
 package scala.build.preprocessing.directives
 
+import scala.build.EitherCps.{either, value}
 import scala.build.Os
+import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, ClassPathOptions}
 import scala.build.preprocessing.ScopePath
@@ -32,7 +34,8 @@ case object UsingCustomJarDirectiveHandler extends UsingDirectiveHandler {
   override def keys = Seq("jar", "jars")
   override def handleValues(
     values: Seq[Any],
-    cwd: ScopePath
+    cwd: ScopePath,
+    positionOpt: Option[Position]
   ): Either[BuildException, BuildOptions] = {
 
     val extraJars = DirectiveUtil.stringValues(values).map { p =>

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingDependencyDirectiveHandler.scala

@@ -5,10 +5,10 @@ import dependency.parser.DependencyParser
 
 import scala.build.EitherCps.{either, value}
 import scala.build.Ops._
-import scala.build.Positioned
 import scala.build.errors.{BuildException, DependencyFormatError}
 import scala.build.options.{BuildOptions, ClassPathOptions}
 import scala.build.preprocessing.ScopePath
+import scala.build.{Position, Positioned}
 
 case object UsingDependencyDirectiveHandler extends UsingDirectiveHandler {
   def name             = "Dependency"
@@ -42,7 +42,8 @@ case object UsingDependencyDirectiveHandler extends UsingDirectiveHandler {
   override def keys = Seq("lib")
   override def handleValues(
     values: Seq[Any],
-    cwd: ScopePath
+    cwd: ScopePath,
+    positionOpt: Option[Position]
   ): Either[BuildException, BuildOptions] = either {
 
     val extraDependencies = value {

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingJavaHomeDirectiveHandler.scala

@@ -2,6 +2,7 @@ package scala.build.preprocessing.directives
 
 import scala.build.EitherCps.{either, value}
 import scala.build.Os
+import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, JavaOptions}
 import scala.build.preprocessing.ScopePath
@@ -31,7 +32,8 @@ case object UsingJavaHomeDirectiveHandler extends UsingDirectiveHandler {
   override def keys = Seq("java-home", "javaHome")
   override def handleValues(
     values: Seq[Any],
-    cwd: ScopePath
+    cwd: ScopePath,
+    positionOpt: Option[Position]
   ): Either[BuildException, BuildOptions] = either {
     val rawHome = value {
       DirectiveUtil.stringValues(values)

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingJavaOptionsDirectiveHandler.scala

@@ -1,5 +1,6 @@
 package scala.build.preprocessing.directives
 
+import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, JavaOptions}
 import scala.build.preprocessing.ScopePath
@@ -30,7 +31,8 @@ case object UsingJavaOptionsDirectiveHandler extends UsingDirectiveHandler {
   override def keys = Seq("javaOpt", "javaOptions", "java-opt", "java-options")
   override def handleValues(
     values: Seq[Any],
-    cwd: ScopePath
+    cwd: ScopePath,
+    positionOpt: Option[Position]
   ): Either[BuildException, BuildOptions] = {
     val javaOpts = DirectiveUtil.stringValues(values)
     val options = BuildOptions(

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingOptionDirectiveHandler.scala

@@ -1,5 +1,6 @@
 package scala.build.preprocessing.directives
 
+import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, ScalaOptions}
 import scala.build.preprocessing.ScopePath
@@ -32,7 +33,8 @@ case object UsingOptionDirectiveHandler extends UsingDirectiveHandler {
   override def keys = Seq("options", "options")
   override def handleValues(
     values: Seq[Any],
-    cwd: ScopePath
+    cwd: ScopePath,
+    positionOpt: Option[Position]
   ): Either[BuildException, BuildOptions] = {
     val scalacOptions = DirectiveUtil.stringValues(values)
     val options = BuildOptions(

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingPlatformDirectiveHandler.scala

@@ -2,6 +2,7 @@ package scala.build.preprocessing.directives
 
 import scala.build.EitherCps.{either, value}
 import scala.build.Ops._
+import scala.build.Position
 import scala.build.errors.{
   BuildException,
   CompositeBuildException,
@@ -103,7 +104,8 @@ case object UsingPlatformDirectiveHandler extends UsingDirectiveHandler {
   override def keys = Seq("platform", "platforms")
   override def handleValues(
     values: Seq[Any],
-    cwd: ScopePath
+    cwd: ScopePath,
+    positionOpt: Option[Position]
   ): Either[BuildException, BuildOptions] =
     handle(DirectiveUtil.stringValues(values))
 }

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingRepositoryDirectiveHandler.scala

@@ -1,5 +1,6 @@
 package scala.build.preprocessing.directives
 
+import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, ClassPathOptions}
 import scala.build.preprocessing.ScopePath
@@ -31,7 +32,8 @@ case object UsingRepositoryDirectiveHandler extends UsingDirectiveHandler {
   override def keys = Seq("repository", "repositories")
   override def handleValues(
     values: Seq[Any],
-    cwd: ScopePath
+    cwd: ScopePath,
+    positionOpt: Option[Position]
   ): Either[BuildException, BuildOptions] = {
     val repositories = DirectiveUtil.stringValues(values)
     val options = BuildOptions(

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingResourcesDirectiveHandler.scala

@@ -1,6 +1,7 @@
 package scala.build.preprocessing.directives
 
 import scala.build.Os
+import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, ClassPathOptions}
 import scala.build.preprocessing.ScopePath
@@ -32,7 +33,8 @@ case object UsingResourcesDirectiveHandler extends UsingDirectiveHandler {
   override def keys = Seq("resource", "resources")
   override def handleValues(
     values: Seq[Any],
-    cwd: ScopePath
+    cwd: ScopePath,
+    positionOpt: Option[Position]
   ): Either[BuildException, BuildOptions] = {
     val paths  = DirectiveUtil.stringValues(values)
     val paths0 = paths.map(os.Path(_, Os.pwd)) // FIXME Wrong cwd, might throw too