Factor out canonical names logic

Author: nicolasstucki

library/src/scala/annotation/newMain.scala

@@ -115,23 +115,10 @@ final class newMain extends MainAnnotation[FromString, Any]:
       errors += msg
     }
 
-    val namesToCanonicalName: Map[String, String] = info.parameters.flatMap(
-      infos =>
-        val names = getAlternativeNames(infos)
-        val canonicalName = infos.name
-        if nameIsValid(canonicalName) then (canonicalName +: names).map(_ -> canonicalName)
-        else names.map(_ -> canonicalName)
-    ).toMap
-    val shortNamesToCanonicalName: Map[Char, String] = info.parameters.flatMap(
-      infos =>
-        val names = getShortNames(infos)
-        val canonicalName = infos.name
-        if shortNameIsValid(canonicalName) then (canonicalName(0) +: names).map(_ -> canonicalName)
-        else names.map(_ -> canonicalName)
-    ).toMap
+    val canonicalNames = CanonicalNames(info)
 
-    val helpIsOverridden = namesToCanonicalName.exists((name, _) => name == helpArg)
-    val shortHelpIsOverridden = shortNamesToCanonicalName.exists((name, _) => name == shortHelpArg)
+    val helpIsOverridden = canonicalNames.getName(helpArg).isDefined
+    val shortHelpIsOverridden = canonicalNames.getShortName(shortHelpArg).isDefined
 
     val displayHelp =
       (!helpIsOverridden && args.contains(getNameWithMarker(helpArg))) ||
@@ -146,9 +133,9 @@ final class newMain extends MainAnnotation[FromString, Any]:
       val (positionalArgs, byNameArgs, invalidByNameArgs) = {
         def getCanonicalArgName(arg: String): Option[String] =
           if arg.startsWith(argMarker) && arg.length > argMarker.length then
-            namesToCanonicalName.get(arg.drop(argMarker.length))
+            canonicalNames.getName(arg.drop(argMarker.length))
           else if arg.startsWith(shortArgMarker) && arg.length == shortArgMarker.length + 1 then
-            shortNamesToCanonicalName.get(arg(shortArgMarker.length))
+            canonicalNames.getShortName(arg(shortArgMarker.length))
           else
             None
 
@@ -348,9 +335,33 @@ final class newMain extends MainAnnotation[FromString, Any]:
       execProgram()
   }
 
+  private class CanonicalNames(info: Info):
+    private val namesToCanonicalName: Map[String, String] = info.parameters.flatMap(
+      infos =>
+        val names = getAlternativeNames(infos)
+        val canonicalName = infos.name
+        if nameIsValid(canonicalName) then (canonicalName +: names).map(_ -> canonicalName)
+        else names.map(_ -> canonicalName)
+    ).toMap
+
+    private val shortNamesToCanonicalName: Map[Char, String] = info.parameters.flatMap(
+      infos =>
+        val names = getShortNames(infos)
+        val canonicalName = infos.name
+        if shortNameIsValid(canonicalName) then (canonicalName(0) +: names).map(_ -> canonicalName)
+        else names.map(_ -> canonicalName)
+    ).toMap
+
+    def getName(name: String): Option[String] = namesToCanonicalName.get(name)
+
+    def getShortName(name: Char): Option[String] = shortNamesToCanonicalName.get(name)
+
+  end CanonicalNames
+
 end newMain
 
 object newMain:
   @experimental
   final class Alias(val aliases: String*) extends MainAnnotation.ParameterAnnotation
+
 end newMain