Add support for using directive in java files

Author: ghostbuster91

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

@@ -1,8 +1,12 @@
 package scala.build.preprocessing
 
-import java.nio.charset.StandardCharsets
+import com.virtuslab.using_directives.custom.model.UsingDirectiveKind
 
-import scala.build.errors.BuildException
+import java.nio.charset.StandardCharsets
+import scala.build.EitherCps.{either, value}
+import scala.build.errors.{BuildException, DirectiveErrors}
+import scala.build.options.BuildRequirements
+import scala.build.preprocessing.ScalaPreprocessor._
 import scala.build.{Inputs, Logger}
 
 case object JavaPreprocessor extends Preprocessor {
@@ -11,9 +15,27 @@ case object JavaPreprocessor extends Preprocessor {
     logger: Logger
   ): Option[Either[BuildException, Seq[PreprocessedSource]]] =
     input match {
-      case j: Inputs.JavaFile =>
-        Some(Right(Seq(PreprocessedSource.OnDisk(j.path, None, None, Nil, None))))
-
+      case j: Inputs.JavaFile => Some(either {
+          val content   = value(PreprocessingUtil.maybeRead(j.path))
+          val scopePath = ScopePath.fromPath(j.path)
+          val ExtractedDirectives(_, directives0, kind) =
+            value(extractUsingDirectives(content.toCharArray, Right(j.path), logger))
+          val _ = value(assertKindIsNotCode(kind))
+          val updatedOptions = value(DirectivesProcessor.process(
+            directives0,
+            usingDirectiveHandlers,
+            Right(j.path),
+            scopePath,
+            logger
+          ))
+          Seq(PreprocessedSource.OnDisk(
+            j.path,
+            Some(updatedOptions.global),
+            Some(BuildRequirements()),
+            Nil,
+            None
+          ))
+        })
       case v: Inputs.VirtualJavaFile =>
         val content = new String(v.content, StandardCharsets.UTF_8)
         val s = PreprocessedSource.InMemory(
@@ -31,4 +53,14 @@ case object JavaPreprocessor extends Preprocessor {
 
       case _ => None
     }
+
+  private def assertKindIsNotCode(kind: UsingDirectiveKind) =
+    kind match {
+      case UsingDirectiveKind.PlainComment   => Right(())
+      case UsingDirectiveKind.SpecialComment => Right(())
+      case UsingDirectiveKind.Code => Left(new DirectiveErrors(::(
+          "Java doesn't support 'using' directives in the code",
+          Nil
+        )))
+    }
 }

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

@@ -274,10 +274,8 @@ case object ScalaPreprocessor extends Preprocessor {
     cwd: ScopePath,
     logger: Logger
   ): Either[BuildException, StrictDirectivesProcessingOutput] = either {
-
     val contentChars = content.toCharArray
-    val ExtractedDirectives(codeOffset, directives0) =
-      value(extractUsingDirectives(contentChars, path, logger))
+    val ExtractedDirectives(codeOffset, directives0, _) = value(extractUsingDirectives(contentChars, path, logger))
 
     val updatedOptions = value {
       DirectivesProcessor.process(
@@ -347,7 +345,7 @@ case object ScalaPreprocessor extends Preprocessor {
     new UnusedDirectiveError(directive.key, values.map(_._1.value), values.flatMap(_._1.positions))
   }
 
-  case class ExtractedDirectives(offset: Int, directives: Seq[StrictDirective])
+  case class ExtractedDirectives(offset: Int, directives: Seq[StrictDirective], kind: UsingDirectiveKind)
 
   val changeToSpecialCommentMsg =
     "Using directive using plain comments are deprecated. Please use a special comment syntax: '//> ...' or '/*> ... */'"
@@ -436,7 +434,7 @@ case object ScalaPreprocessor extends Preprocessor {
       val offset =
         if (usedDirectives.getKind() != UsingDirectiveKind.Code) 0
         else usedDirectives.getCodeOffset()
-      Right(ExtractedDirectives(offset, strictDirectives))
+      Right(ExtractedDirectives(offset, strictDirectives, usedDirectives.getKind()))
     }
     else {
       val errors0 = errors.map(diag => new MalformedDirectiveError(diag.message, diag.positions))

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

@@ -221,6 +221,63 @@ class SourcesTests extends munit.FunSuite {
     }
   }
 
+  test("dependencies in .java - //> using") {
+    val testInputs = TestInputs(
+      os.rel / "Something.java" ->
+        """//> using lib "org1:name1:1.1"
+          |//> using lib "org2::name2:2.2"
+          |//> using lib "org3:::name3:3.3"
+          |
+          |public class Something {
+          |  public Int a = 1;
+          |}
+          |""".stripMargin
+    )
+    val expectedDeps = Seq(
+      dep"org1:name1:1.1",
+      dep"org2::name2:2.2",
+      dep"org3:::name3:3.3"
+    )
+    testInputs.withInputs { (_, inputs) =>
+      val crossSources =
+        CrossSources.forInputs(
+          inputs,
+          Sources.defaultPreprocessors(CustomCodeWrapper),
+          TestLogger()
+        ).orThrow
+      val scopedSources = crossSources.scopedSources(BuildOptions()).orThrow
+      val sources = scopedSources.sources(Scope.Main, crossSources.sharedOptions(BuildOptions()))
+
+      expect(
+        sources.buildOptions.classPathOptions.extraDependencies.toSeq.map(_.value) == expectedDeps
+      )
+      expect(sources.paths.length == 1)
+      expect(sources.paths.map(_._2) == Seq(os.rel / "Something.java"))
+      expect(sources.inMemory.isEmpty)
+    }
+  }
+
+  test("should fail dependencies in .java - //> using") {
+    val testInputs = TestInputs(
+      os.rel / "Something.java" ->
+        """using lib "org3:::name3:3.3"
+          |
+          |public class Something {
+          |  public Int a = 1;
+          |}
+          |""".stripMargin
+    )
+    testInputs.withInputs { (_, inputs) =>
+      val crossSources = CrossSources.forInputs(
+          inputs,
+          Sources.defaultPreprocessors(CustomCodeWrapper),
+          TestLogger()
+        )
+      expect(crossSources.isLeft)
+    }
+  }
+
+
   test("dependencies in .sc - $ivy") {
     val testInputs = TestInputs(
       os.rel / "something.sc" ->