Merge remote-tracking branch 'upstream/main' into en-migrate-main

Author: noti0na1

.github/workflows/ci.yaml

@@ -111,7 +111,7 @@ jobs:
 
       - name: Cmd Tests
         run: |
-          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
+          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
           ./project/scripts/cmdTests
           ./project/scripts/bootstrappedOnlyCmdTests
 
@@ -447,7 +447,7 @@ jobs:
 
       - name: Test
         run: |
-          ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
+          ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
           ./project/scripts/cmdTests
           ./project/scripts/bootstrappedOnlyCmdTests
 

.github/workflows/scaladoc.yaml

@@ -68,7 +68,7 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         with:
           inlineScript: |
-            DOC_DEST=pr-${PR_NUMBER:-${GITHUB_REF##*/}}
+            DOC_DEST=$(echo pr-${PR_NUMBER:-${GITHUB_REF##*/}} | tr -d -c "[-A-Za-z0-9]")
             echo uplading docs to https://scala3doc.virtuslab.com/$DOC_DEST
             az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container
             az storage blob upload-batch -s scaladoc/output -d $DOC_DEST --account-name scala3docstorage

.gitignore

@@ -30,22 +30,6 @@ node_modules
 .metals/
 metals.sbt
 
-# Scala-IDE specific
-.scala_dependencies
-.cache
-.cache-main
-.cache-tests
-.classpath
-.project
-.settings
-classes/
-*/bin/
-
-# Dotty IDE
-/.dotty-ide-dev-port
-/.dotty-ide-artifact
-/.dotty-ide.json
-
 # idea
 .idea
 .idea_modules
@@ -79,10 +63,6 @@ compiler/test/debug/Gen.jar
 compiler/before-pickling.txt
 compiler/after-pickling.txt
 bench/compile.txt
-*.dotty-ide-version
-
-# The vscode app for testing
-vscode-dotty/.vscode-test
 
 community-build/scala3-bootstrapped.version
 community-build/sbt-dotty-sbt

CONTRIBUTING.md

@@ -12,14 +12,12 @@ This is the process for committing code to the Scala project. There are of cours
     2. The ticket has been discussed and prioritized by the team.
 3. You should always perform your work in its own Git branch. The branch should be given a descriptive name that explains its intent. Some teams also like adding the ticket number and/or the [GitHub](http://github.com) user ID to the branch name, these details is up to each of the individual teams. (See below for more details on branch naming.)
 4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on GitHub.
-5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that a reviewer can also be an outside contributor—members of Typesafe and independent contributors are encouraged to participate in the review process. It is not a closed process. Please try to avoid conflict of interest—the spirit of the review process is to evenly distribute the understanding of our code base across its maintainers as well as to load balance quality assurance. Assigning a review to a "sure win" reviewer is not a good long-term solution.
+5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that a reviewer can also be an outside contributor—members of Typesafe  or VirtusLab and independent contributors are encouraged to participate in the review process. It is not a closed process. Please try to avoid conflict of interest—the spirit of the review process is to evenly distribute the understanding of our code base across its maintainers as well as to load balance quality assurance. Assigning a review to a "sure win" reviewer is not a good long-term solution.
 6. After the review, you should resolve issues brought up by the reviewers as needed (pushing a new commit to address reviewers' comments), iterating until the reviewers give their thumbs up, the "LGTM" (acronym for "Looks Good To Me").
 7. Once the code has passed review the Pull Request can be merged into the distribution.
 
 ## Pull Request Requirements
 
-First, please have a look at and follow the [Pull Request Policy](https://github.com/scala/scala/wiki/Pull-Request-Policy) for guidelines on submitting a pull request to the dotty project. (the pull request policy is the same as for the Scala programming language)
-
 In order for a Pull Request to be considered, it has to meet these requirements:
 
 1. Live up to the current code standard:
@@ -39,7 +37,7 @@ All contributed code should come accompanied by documentation. Pull requests con
 
 It is ok to work on a public feature branch in the GitHub repository. Something that can sometimes be useful for early feedback etc. If so, then it is preferable to name the branch accordingly. This can be done by either prefixing the name with ``wip-`` as in ‘Work In Progress’, or use hierarchical names like ``wip/..``, ``feature/..`` or ``topic/..``. Either way is fine as long as it is clear that it is work in progress and not ready for merge. This work can temporarily have a lower standard. However, to be merged into master it will have to go through the regular process outlined above, with Pull Request, review etc..
 
-Also, to facilitate both well-formed commits and working together, the ``wip`` and ``feature``/``topic`` identifiers also have special meaning.   Any branch labelled with ``wip`` is considered “git-unstable” and may be rebased and have its history rewritten.   Any branch with ``feature``/``topic`` in the name is considered “stable” enough for others to depend on when a group is working on a feature.
+Also, to facilitate both well-formed commits and working together, the ``wip`` and ``feature``/``topic`` identifiers also have special meaning. Any branch labeled with ``wip`` is considered “git-unstable” and may be rebased and have its history rewritten.   Any branch with ``feature``/``topic`` in the name is considered “stable” enough for others to depend on when a group is working on a feature.
 
 ## Creating Commits And Writing Commit Messages
 
@@ -60,4 +58,3 @@ Example:
       - Details 1
       - Details 2
       - Details 3
-

README.md

@@ -3,12 +3,11 @@ Dotty
 [![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amain)
 [![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://discord.com/invite/scala)
 
-* [Homepage](https://dotty.epfl.ch)
-* [Documentation](https://dotty.epfl.ch/docs)
+* [Documentation](https://docs.scala-lang.org/scala3/)
 
 Try it out
 ==========
-To try it in your project see also the [Getting Started User Guide](https://dotty.epfl.ch/#getting-started).
+To try it in your project see also the [Getting Started User Guide](https://docs.scala-lang.org/scala3/getting-started.html).
 
 Building a Local Distribution
 =============================
@@ -23,7 +22,7 @@ other more direct lines of communication such as email.
 
 How to Contribute
 =================
-* [Getting Started as Contributor](https://dotty.epfl.ch/docs/contributing/getting-started.html)
+* [Getting Started as Contributor](https://docs.scala-lang.org/scala3/guides/contribution/contribution-intro.html)
 * [Issues](https://github.com/lampepfl/dotty/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
 
 License

build.sbt

@@ -33,7 +33,6 @@ val sjsJUnitTests = Build.sjsJUnitTests
 val sjsCompilerTests = Build.sjsCompilerTests
 
 val `sbt-test` = Build.`sbt-test`
-val `vscode-dotty` = Build.`vscode-dotty`
 
 inThisBuild(Build.thisBuildSettings)
 inScope(Global)(Build.globalSettings)

compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala

@@ -16,21 +16,20 @@ import scala.annotation.internal.sharable
 object DesugarEnums {
   import untpd._
 
-  @sharable object CaseKind extends Enumeration {
-    val Simple, Object, Class: Value = Value
-  }
+  enum CaseKind:
+    case Simple, Object, Class
 
-  final case class EnumConstraints(minKind: CaseKind.Value, maxKind: CaseKind.Value, enumCases: List[(Int, RefTree)]):
-    require(minKind <= maxKind && !(cached && enumCases.isEmpty))
+  final case class EnumConstraints(minKind: CaseKind, maxKind: CaseKind, enumCases: List[(Int, RefTree)]):
+    require(minKind.ordinal <= maxKind.ordinal && !(cached && enumCases.isEmpty))
     def requiresCreator = minKind == CaseKind.Simple
-    def isEnumeration   = maxKind < CaseKind.Class
-    def cached          = minKind < CaseKind.Class
+    def isEnumeration   = maxKind.ordinal < CaseKind.Class.ordinal
+    def cached          = minKind.ordinal < CaseKind.Class.ordinal
   end EnumConstraints
 
   /** Attachment containing the number of enum cases, the smallest kind that was seen so far,
    *  and a list of all the value cases with their ordinals.
    */
-  val EnumCaseCount: Property.Key[(Int, CaseKind.Value, CaseKind.Value, List[(Int, TermName)])] = Property.Key()
+  val EnumCaseCount: Property.Key[(Int, CaseKind, CaseKind, List[(Int, TermName)])] = Property.Key()
 
   /** Attachment signalling that when this definition is desugared, it should add any additional
    *  lookup methods for enums.
@@ -249,11 +248,11 @@ object DesugarEnums {
    *   - scaffolding containing the necessary definitions for singleton enum cases
    *     unless that scaffolding was already generated by a previous call to `nextEnumKind`.
    */
-  def nextOrdinal(name: Name, kind: CaseKind.Value, definesLookups: Boolean)(using Context): (Int, List[Tree]) = {
+  def nextOrdinal(name: Name, kind: CaseKind, definesLookups: Boolean)(using Context): (Int, List[Tree]) = {
     val (ordinal, seenMinKind, seenMaxKind, seenCases) =
       ctx.tree.removeAttachment(EnumCaseCount).getOrElse((0, CaseKind.Class, CaseKind.Simple, Nil))
-    val minKind = if kind < seenMinKind then kind else seenMinKind
-    val maxKind = if kind > seenMaxKind then kind else seenMaxKind
+    val minKind = if kind.ordinal < seenMinKind.ordinal then kind else seenMinKind
+    val maxKind = if kind.ordinal > seenMaxKind.ordinal then kind else seenMaxKind
     val cases = name match
       case name: TermName => (ordinal, name) :: seenCases
       case _              => seenCases

compiler/src/dotty/tools/dotc/config/CliCommand.scala

@@ -5,7 +5,9 @@ import scala.language.unsafeNulls
 
 import Settings._
 import core.Contexts._
+import printing.Highlighting
 
+import scala.util.chaining.given
 import scala.PartialFunction.cond
 
 trait CliCommand:
@@ -51,59 +53,31 @@ trait CliCommand:
   end distill
 
   /** Creates a help message for a subset of options based on cond */
-  protected def availableOptionsMsg(cond: Setting[?] => Boolean)(using settings: ConcreteSettings)(using SettingsState): String =
-    val ss = (settings.allSettings filter cond).toList sortBy (_.name)
-    val maxNameWidth = 30
-    val nameWidths = ss.map(_.name.length).partition(_ < maxNameWidth)._1
-    val width = if nameWidths.nonEmpty then nameWidths.max else maxNameWidth
-    val terminalWidth = settings.pageWidth.value
-    val (nameWidth, descriptionWidth) = {
-      val w1 =
-        if width < maxNameWidth then width
-        else maxNameWidth
-      val w2 =
-        if terminalWidth < w1 + maxNameWidth then 0
-        else terminalWidth - w1 - 1
-      (w1, w2)
-    }
-    def formatName(name: String) =
-      if name.length <= nameWidth then ("%-" + nameWidth + "s") format name
-      else (name + "\n%-" + nameWidth + "s") format ""
-    def formatDescription(text: String): String =
-      if descriptionWidth == 0 then text
-      else if text.length < descriptionWidth then text
-      else {
-        val inx = text.substring(0, descriptionWidth).lastIndexOf(" ")
-        if inx < 0 then text
-        else
-          val str = text.substring(0, inx)
-          s"${str}\n${formatName("")} ${formatDescription(text.substring(inx + 1))}"
-      }
-    def formatSetting(name: String, value: String) =
-      if (value.nonEmpty)
-        // the format here is helping to make empty padding and put the additional information exactly under the description.
-        s"\n${formatName("")} $name: $value."
-      else
-        ""
-    def helpStr(s: Setting[?]) =
+  protected def availableOptionsMsg(p: Setting[?] => Boolean)(using settings: ConcreteSettings)(using SettingsState): String =
+    // result is (Option Name, descrption\ndefault: value\nchoices: x, y, z
+    def help(s: Setting[?]): (String, String) =
+      // For now, skip the default values that do not make sense for the end user, such as 'false' for the version command.
       def defaultValue = s.default match
         case _: Int | _: String => s.default.toString
-        case _ =>
-          // For now, skip the default values that do not make sense for the end user.
-          // For example 'false' for the version command.
-          ""
-      s"${formatName(s.name)} ${formatDescription(shortHelp(s))}${formatSetting("Default", defaultValue)}${formatSetting("Choices", s.legalChoices)}"
-    ss.map(helpStr).mkString("", "\n", s"\n${formatName("@<file>")} ${formatDescription("A text file containing compiler arguments (options and source files).")}\n")
+        case _ => ""
+      val info = List(shortHelp(s), if defaultValue.nonEmpty then s"Default $defaultValue" else "", if s.legalChoices.nonEmpty then s"Choices ${s.legalChoices}" else "")
+      (s.name, info.filter(_.nonEmpty).mkString("\n"))
+    end help
+
+    val ss = settings.allSettings.filter(p).toList.sortBy(_.name)
+    val formatter = Columnator("", "", maxField = 30)
+    val fresh = ContextBase().initialCtx.fresh.setSettings(summon[SettingsState])
+    formatter(List(ss.map(help) :+ ("@<file>", "A text file containing compiler arguments (options and source files).")))(using fresh)
   end availableOptionsMsg
 
   protected def shortUsage: String = s"Usage: $cmdName <options> <source files>"
 
   protected def createUsageMsg(label: String, shouldExplain: Boolean, cond: Setting[?] => Boolean)(using settings: ConcreteSettings)(using SettingsState): String =
     val prefix = List(
       Some(shortUsage),
-      Some(explainAdvanced) filter (_ => shouldExplain),
+      Some(explainAdvanced).filter(_ => shouldExplain),
       Some(label + " options include:")
-    ).flatten mkString "\n"
+    ).flatten.mkString("\n")
 
     prefix + "\n" + availableOptionsMsg(cond)
 
@@ -138,31 +112,10 @@ trait CliCommand:
     createUsageMsg("Possible private", shouldExplain = true, isPrivate)
 
   /** Used for the formatted output of -Xshow-phases */
-  protected def phasesMessage(using ctx: Context): String =
-
+  protected def phasesMessage(using Context): String =
     val phases = new Compiler().phases
-    val nameLimit = 25
-    val maxCol = ctx.settings.pageWidth.value
-    val maxName = phases.flatten.map(_.phaseName.length).max
-    val width = maxName.min(nameLimit)
-    val maxDesc = maxCol - (width + 6)
-    val fmt = s"%${width}.${width}s  %.${maxDesc}s%n"
-
-    val sb = new StringBuilder
-    sb ++= fmt.format("phase name", "description")
-    sb ++= fmt.format("----------", "-----------")
-
-    phases.foreach {
-      case List(single) =>
-        sb ++= fmt.format(single.phaseName, single.description)
-      case Nil => ()
-      case more =>
-        sb ++= fmt.format(s"{", "")
-        more.foreach { mini => sb ++= fmt.format(mini.phaseName, mini.description) }
-        sb ++= fmt.format(s"}", "")
-    }
-    sb.mkString
-
+    val formatter = Columnator("phase name", "description", maxField = 25)
+    formatter(phases.map(mega => mega.map(p => (p.phaseName, p.description))))
 
   /** Provide usage feedback on argument summary, assuming that all settings
    *  are already applied in context.
@@ -190,3 +143,56 @@ trait CliCommand:
 
   extension [T](setting: Setting[T])
     protected def value(using ss: SettingsState): T = setting.valueIn(ss)
+
+  extension (s: String)
+    def padLeft(width: Int): String = String.format(s"%${width}s", s)
+
+  // Formatting for -help and -Vphases in two columns, handling long field1 and wrapping long field2
+  class Columnator(heading1: String, heading2: String, maxField: Int, separation: Int = 2):
+    def apply(texts: List[List[(String, String)]])(using Context): String = StringBuilder().tap(columnate(_, texts)).toString
+
+    private def columnate(sb: StringBuilder, texts: List[List[(String, String)]])(using Context): Unit =
+      import Highlighting.*
+      val colors = Seq(Green(_), Yellow(_), Magenta(_), Cyan(_), Red(_))
+      val nocolor = texts.length == 1
+      def color(index: Int): String => Highlight = if nocolor then NoColor(_) else colors(index % colors.length)
+      val maxCol = ctx.settings.pageWidth.value
+      val field1 = maxField.min(texts.flatten.map(_._1.length).filter(_ < maxField).max) // widest field under maxField
+      val field2 = if field1 + separation + maxField < maxCol then maxCol - field1 - separation else 0 // skinny window -> terminal wrap
+      val separator = " " * separation
+      val EOL = "\n"
+      def formatField1(text: String): String = if text.length <= field1 then text.padLeft(field1) else text + EOL + "".padLeft(field1)
+      def formatField2(text: String): String =
+        def loopOverField2(fld: String): List[String] =
+          if field2 == 0 || fld.length <= field2 then List(fld)
+          else
+            fld.lastIndexOf(" ", field2) match
+              case -1 => List(fld)
+              case i  => val (prefix, rest) = fld.splitAt(i) ; prefix :: loopOverField2(rest.trim)
+        text.split("\n").toList.flatMap(loopOverField2).filter(_.nonEmpty).mkString(EOL + "".padLeft(field1) + separator)
+      end formatField2
+      def format(first: String, second: String, index: Int, colorPicker: Int => String => Highlight) =
+        sb.append(colorPicker(index)(formatField1(first)).show)
+          .append(separator)
+          .append(formatField2(second))
+          .append(EOL): Unit
+      def fancy(first: String, second: String, index: Int) = format(first, second, index, color)
+      def plain(first: String, second: String) = format(first, second, 0, _ => NoColor(_))
+
+      if heading1.nonEmpty then
+        plain(heading1, heading2)
+        plain("-" * heading1.length, "-" * heading2.length)
+
+      def emit(index: Int)(textPair: (String, String)): Unit = fancy(textPair._1, textPair._2, index)
+      def group(index: Int)(body: Int => Unit): Unit =
+        if !ctx.useColors then plain(s"{", "")
+        body(index)
+        if !ctx.useColors then plain(s"}", "")
+
+      texts.zipWithIndex.foreach { (text, index) =>
+        text match
+          case List(single) => emit(index)(single)
+          case Nil          =>
+          case mega         => group(index)(i => mega.foreach(emit(i)))
+      }
+  end Columnator