Refactor: apply tell don't ask principle

Author: ghostbuster91

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

@@ -1,11 +1,7 @@
 package scala.build.preprocessing
 
 import com.virtuslab.using_directives.config.Settings
-import com.virtuslab.using_directives.custom.model.{
-  UsingDirectiveKind,
-  UsingDirectiveSyntax,
-  UsingDirectives
-}
+import com.virtuslab.using_directives.custom.model.{UsingDirectiveKind, UsingDirectiveSyntax, UsingDirectives}
 import com.virtuslab.using_directives.custom.utils.ast.{UsingDef, UsingDefs}
 import com.virtuslab.using_directives.{Context, UsingDirectivesProcessor}
 
@@ -17,8 +13,7 @@ import scala.jdk.CollectionConverters._
 
 case class ExtractedDirectives(
   offset: Int,
-  directives: Seq[StrictDirective],
-  kind: UsingDirectiveKind
+  directives: Seq[StrictDirective]
 )
 
 object ExtractedDirectives {
@@ -29,7 +24,8 @@ object ExtractedDirectives {
   def from(
     contentChars: Array[Char],
     path: Either[String, os.Path],
-    logger: Logger
+    logger: Logger,
+    supportedDirectives: Array[UsingDirectiveKind]
   ): Either[BuildException, ExtractedDirectives] = {
     val errors = new mutable.ListBuffer[Diagnostic]
     val reporter = CustomDirectivesReporter.create(path) { diag =>
@@ -110,7 +106,10 @@ object ExtractedDirectives {
       val offset =
         if (usedDirectives.getKind() != UsingDirectiveKind.Code) 0
         else usedDirectives.getCodeOffset()
-      Right(ExtractedDirectives(offset, strictDirectives, usedDirectives.getKind()))
+      if (supportedDirectives.contains(usedDirectives.getKind()))
+      Right(ExtractedDirectives(offset, strictDirectives))
+    else
+      Left(new DirectiveErrors(::("Unsupported directive", Nil)))
     }
     else {
       val errors0 = errors.map(diag => new MalformedDirectiveError(diag.message, diag.positions))

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

@@ -4,7 +4,7 @@ import com.virtuslab.using_directives.custom.model.UsingDirectiveKind
 
 import java.nio.charset.StandardCharsets
 import scala.build.EitherCps.{either, value}
-import scala.build.errors.{BuildException, DirectiveErrors}
+import scala.build.errors.BuildException
 import scala.build.options.BuildRequirements
 import scala.build.preprocessing.ExtractedDirectives.from
 import scala.build.preprocessing.ScalaPreprocessor._
@@ -19,9 +19,13 @@ case object JavaPreprocessor extends Preprocessor {
       case j: Inputs.JavaFile => Some(either {
           val content   = value(PreprocessingUtil.maybeRead(j.path))
           val scopePath = ScopePath.fromPath(j.path)
-          val ExtractedDirectives(_, directives0, kind) =
-            value(from(content.toCharArray, Right(j.path), logger))
-          val _ = value(assertKindIsNotCode(kind))
+          val ExtractedDirectives(_, directives0) =
+            value(from(
+              content.toCharArray,
+              Right(j.path),
+              logger,
+              Array(UsingDirectiveKind.PlainComment, UsingDirectiveKind.SpecialComment)
+            ))
           val updatedOptions = value(DirectivesProcessor.process(
             directives0,
             usingDirectiveHandlers,
@@ -54,14 +58,4 @@ 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

@@ -1,5 +1,6 @@
 package scala.build.preprocessing
 
+import com.virtuslab.using_directives.custom.model.UsingDirectiveKind
 import dependency.AnyDependency
 import dependency.parser.DependencyParser
 
@@ -9,11 +10,8 @@ import scala.build.Ops._
 import scala.build.errors._
 import scala.build.internal.{AmmUtil, Util}
 import scala.build.options.{BuildOptions, BuildRequirements, ClassPathOptions, ShadowingSeq}
-import scala.build.preprocessing.ExtractedDirectives.from
 import scala.build.preprocessing.directives._
 import scala.build.{Inputs, Logger, Position, Positioned}
-import scala.collection.mutable
-import scala.jdk.CollectionConverters._
 
 case object ScalaPreprocessor extends Preprocessor {
 
@@ -268,7 +266,7 @@ case object ScalaPreprocessor extends Preprocessor {
     logger: Logger
   ): Either[BuildException, StrictDirectivesProcessingOutput] = either {
     val contentChars = content.toCharArray
-    val ExtractedDirectives(codeOffset, directives0, _) = value(ExtractedDirectives.from(contentChars, path, logger))
+    val ExtractedDirectives(codeOffset, directives0) = value(ExtractedDirectives.from(contentChars, path, logger, UsingDirectiveKind.values()))
 
     val updatedOptions = value {
       DirectivesProcessor.process(

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

@@ -2,6 +2,7 @@ package scala.build
 package tests
 
 import com.eed3si9n.expecty.Expecty.{assert => expect}
+import com.virtuslab.using_directives.custom.model.UsingDirectiveKind
 
 import scala.build.errors.Diagnostic
 import scala.build.preprocessing.ExtractedDirectives
@@ -39,7 +40,7 @@ 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)
+    val res = ExtractedDirectives.from(code, Right(path), persistentLogger, UsingDirectiveKind.values())
     expect(res.isRight)
 
     val diags = persistentLogger.diagnostics