Fixes for caseapp in Scala 3

VirtusLab · Nov 18, 2022 · 5bebf3e · 5bebf3e
1 parent 4ba4e21
commit 5bebf3e
Show file tree

Hide file tree

Showing 4 changed files with 136 additions and 134 deletions.
diff --git a/modules/cli/src/main/scala/scala/cli/commands/RestrictedCommandsParser.scala b/modules/cli/src/main/scala/scala/cli/commands/RestrictedCommandsParser.scala
@@ -51,13 +51,15 @@ object RestrictedCommandsParser {
   def isExperimentalOrRestricted(a: Arg) =
     a.tags.exists(_.name == tags.restricted) || a.tags.exists(_.name == tags.experimental)
 
-  def level(a: Arg) = a.tags.flatMap(t => tags.levelFor(t.name)).headOption.getOrElse {
+  def level(a: Arg): SpecificationLevel = a.tags.flatMap(t =>
+    tags.levelFor(t.name)
+  ).headOption.getOrElse { // TODO why do I need to add it here/
     SpecificationLevel.IMPLEMENTATION
   }
 
-  def apply[T, TD](parser: Parser.Aux[T, TD]): Parser.Aux[T, TD] = new Parser[T] {
+  def apply[T](parser: Parser[T]): Parser[T] = new Parser[T] {
 
-    type D = TD
+    type D = parser.D
 
     private def isArgSupported(a: Arg): Boolean =
       scala.cli.ScalaCli.allowRestrictedFeatures || !isExperimentalOrRestricted(a)
@@ -72,7 +74,7 @@ object RestrictedCommandsParser {
 
     def init: D = parser.init
 
-    def withDefaultOrigin(origin: String): caseapp.core.parser.Parser.Aux[T, D] =
+    def withDefaultOrigin(origin: String): caseapp.core.parser.Parser[T] =
       RestrictedCommandsParser(parser.withDefaultOrigin(origin))
 
     override def step(

diff --git a/modules/cli/src/main/scala/scala/cli/commands/default/Default.scala b/modules/cli/src/main/scala/scala/cli/commands/default/Default.scala
@@ -30,23 +30,23 @@ class Default(
        |  - otherwise, if no inputs were passed, it defaults to the 'repl' subcommand""".stripMargin
 
   private def defaultHelp: String = actualHelp.help(ScalaCliHelp.helpFormat) + defaultCommandHelp
-  
+
   private def defaultFullHelp: String =
     actualHelp.help(ScalaCliHelp.helpFormat, showHidden = true) + defaultCommandHelp
-  
+
   override def scalaSpecificationLevel = SpecificationLevel.MUST
 
-  override def group                                                         = "Main"
-  
+  override def group = "Main"
+
   override def sharedOptions(options: DefaultOptions): Option[SharedOptions] = Some(options.shared)
-  
-  private[cli] var rawArgs                                                   = Array.empty[String]
-  
+
+  private[cli] var rawArgs = Array.empty[String]
+
   override def helpAsked(progName: String, maybeOptions: Either[Error, DefaultOptions]): Nothing = {
     println(defaultHelp)
     sys.exit(0)
   }
-  
+
   override def fullHelpAsked(progName: String): Nothing = {
     println(defaultFullHelp)
     sys.exit(0)

diff --git a/website/docs/reference/scala-command/cli-options.md b/website/docs/reference/scala-command/cli-options.md
@@ -634,7 +634,7 @@ Enable Scala.js. To show more options for Scala.js pass `--help-js`
 
 `SHOULD have` per Scala Runner specification
 
-The Scala.js version (1.10.1 by default).
+The Scala.js version (1.11.0 by default).
 
 ### `--js-mode`
 
@@ -722,7 +722,7 @@ Path to the Scala.js linker
 
 `IMPLEMENTATION specific` per Scala Runner specification
 
-Scala.js CLI version to use for linking (1.1.1-sc6 by default).
+Scala.js CLI version to use for linking (1.1.2-sc1 by default).
 
 ### `--js-cli-java-arg`