Add more descriptive messages for using experimental & restricted directives without the power mode enabled; tag publishing directives as experimental

Author: Gedochao

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

@@ -33,10 +33,11 @@ object DirectivesProcessor {
       scopedDirective: ScopedDirective,
       logger: Logger
     ) =
-      if (!allowRestrictedFeatures && handler.isRestricted)
+      if (!allowRestrictedFeatures && (handler.isRestricted || handler.isExperimental))
+        val powerDirectiveType = if handler.isExperimental then "experimental" else "restricted"
         val msg =
-          """This directive is not supported.
-            |Please run it with the `--power` flag or turn this flag on globally by running `config power true`.""".stripMargin
+          s"""This directive is $powerDirectiveType.
+             |Please run it with the '--power' flag or turn this flag on globally by running 'config power true'""".stripMargin
         Left(DirectiveErrors(
           ::(msg, Nil),
           DirectiveUtil.positions(scopedDirective.directive.values, path)

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

@@ -34,7 +34,8 @@ trait DirectiveHandler[+T] { self =>
   def scalaSpecificationLevel: SpecificationLevel
   protected def SpecificationLevel = scala.cli.commands.SpecificationLevel
 
-  final def isRestricted: Boolean = scalaSpecificationLevel == SpecificationLevel.RESTRICTED
+  final def isRestricted: Boolean   = scalaSpecificationLevel == SpecificationLevel.RESTRICTED
+  final def isExperimental: Boolean = scalaSpecificationLevel == SpecificationLevel.EXPERIMENTAL
 
   def keys: Seq[String]
 

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

@@ -22,7 +22,7 @@ import scala.cli.commands.SpecificationLevel
     |""".stripMargin
 )
 @DirectiveDescription("Set parameters for publishing")
-@DirectiveLevel(SpecificationLevel.RESTRICTED)
+@DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
 // format: off
 final case class Publish(
   organization: Option[Positioned[String]] = None,

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

@@ -99,7 +99,7 @@ object PublishContextual {
       |""".stripMargin
   )
   @DirectiveDescription("Set contextual parameters for publishing")
-  @DirectiveLevel(SpecificationLevel.RESTRICTED)
+  @DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
   // format: off
   final case class Local(
     computeVersion: Option[Positioned[String]] = None,

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

@@ -17,7 +17,7 @@ import scala.cli.commands.SpecificationLevel
   "//> using target.platform _platform_",
   "`//> using target.platform `_platform_"
 )
-@DirectiveLevel(SpecificationLevel.RESTRICTED)
+@DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
 // format: off
 final case class RequirePlatform(
   @DirectiveName("platform")

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

@@ -13,7 +13,7 @@ import scala.cli.commands.SpecificationLevel
   "//> using target.scala _version_",
   "`//> using target.scala `_version_"
 )
-@DirectiveLevel(SpecificationLevel.RESTRICTED)
+@DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
 final case class RequireScalaVersion(
   scala: Option[DirectiveValueParser.MaybeNumericalString] = None
 ) extends HasBuildRequirements {

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

@@ -14,7 +14,7 @@ import scala.cli.commands.SpecificationLevel
   "//> using target.scala.>= _version_",
   "`//> using target.scala.>= `_version_"
 )
-@DirectiveLevel(SpecificationLevel.RESTRICTED)
+@DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
 final case class RequireScalaVersionBounds(
   `==`: Option[DirectiveValueParser.MaybeNumericalString] = None,
   `>=`: Option[DirectiveValueParser.MaybeNumericalString] = None,

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

@@ -16,7 +16,7 @@ import scala.cli.commands.SpecificationLevel
   "//> using target.scope _scope_",
   "`//> using target.scope `_scope_"
 )
-@DirectiveLevel(SpecificationLevel.RESTRICTED)
+@DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
 final case class RequireScope(
   scope: Option[Positioned[String]] = None
 ) extends HasBuildRequirements {

modules/integration/src/test/scala/scala/cli/integration/RunScalaPyTestDefinitions.scala

@@ -108,7 +108,7 @@ trait RunScalaPyTestDefinitions { _: RunTestDefinitions =>
     inputs.fromRoot { root =>
 
       // Script dir shouldn't be added to PYTHONPATH if PYTHONSAFEPATH is non-empty
-      val errorRes = os.proc(TestUtil.cli, "run", extraOptions, nativeOpt, "src")
+      val errorRes = os.proc(TestUtil.cli, "--power", "run", extraOptions, nativeOpt, "src")
         .call(
           cwd = root,
           env = Map("PYTHONSAFEPATH" -> "foo"),
@@ -119,7 +119,7 @@ trait RunScalaPyTestDefinitions { _: RunTestDefinitions =>
       val errorOutput = errorRes.out.text()
       expect(errorOutput.contains("No module named 'helpers'"))
 
-      val res = os.proc(TestUtil.cli, "run", extraOptions, nativeOpt, "src")
+      val res = os.proc(TestUtil.cli, "--power", "run", extraOptions, nativeOpt, "src")
         .call(cwd = root)
       val output = res.out.trim()
       if (native)

modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala

@@ -54,7 +54,7 @@ class SipScalaTests extends ScalaCliSuite {
     if (isRestricted) {
       expect(res.exitCode == 1)
       val output = res.out.text()
-      expect(output.contains(s"directive is not supported"))
+      expect(output.contains(s"directive is experimental"))
     }
     else
       expect(res.exitCode == 0)