Merge branch 'main' into export-diagnostics

Author: tanishiking

.github/ISSUE_TEMPLATE/feature.md

@@ -1,10 +1,10 @@
 ---
 name: "\U0001F389 Suggest a feature"
-about: Please create a feature request here https://github.com/lampepfl/dotty-feature-requests
+about: Please create a feature request here https://github.com/lampepfl/dotty/discussions/new?category=feature-requests
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
-Please create a feature request here: [lampepfl/dotty-feature-requests](https://github.com/lampepfl/dotty-feature-requests).
+Please create a feature request in the [Dotty Discussions](https://github.com/lampepfl/dotty/discussions/new?category=feature-requests).

.github/workflows/ci.yaml

@@ -134,7 +134,7 @@ jobs:
 
       - name: Cmd Tests
         run: |
-          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;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 ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped-tasty-tests/run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
           ./project/scripts/cmdTests
           ./project/scripts/bootstrappedOnlyCmdTests
 
@@ -488,7 +488,7 @@ jobs:
 
       - name: Test
         run: |
-          ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
+          ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped-tasty-tests/run ;stdlib-bootstrapped-tasty-tests/test"
           ./project/scripts/cmdTests
           ./project/scripts/bootstrappedOnlyCmdTests
 

.gitignore

@@ -95,3 +95,7 @@ contributors.js
 content-contributors.css
 docs/_spec/_site/
 docs/_spec/.jekyll-metadata
+
+# scaladoc related
+scaladoc/output/
+

.gitmodules

@@ -21,7 +21,7 @@
 	url = https://github.com/dotty-staging/fastparse
 [submodule "community-build/community-projects/stdLib213"]
 	path = community-build/community-projects/stdLib213
-	url = https://github.com/dotty-staging/scala
+	url = https://github.com/dotty-staging/scala213
 [submodule "community-build/community-projects/sourcecode"]
 	path = community-build/community-projects/sourcecode
 	url = https://github.com/dotty-staging/sourcecode

MAINTENANCE.md

@@ -16,6 +16,11 @@ The issue supervisor is responsible for:
     - Attempting to reproduce the issue (or label “stat:cannot reproduce”)
     - Further minimizing the issue or asking the reporter of the issue to minimize it correctly (or label “stat:needs minimization”)
   - Identifying which issues are of considerable importance and bringing them to the attention of the team during the Dotty meeting, where they can be filtered and added to the [Future Versions](https://github.com/lampepfl/dotty/milestone/46) milestone.
+  - Identifying if a report is really a feature request and if so, converting it to
+    a [feature request discussion](https://github.com/lampepfl/dotty/discussions/categories/feature-requests).
+- Keeping an eye on new
+[discussions](https://github.com/lampepfl/dotty/discussions), making sure they
+don't go unanswered and also correctly labeling new feature requests.
 
 Other core teammates are responsible for providing information to the issue supervisor in a timely manner when it is requested if they have that information.
 
@@ -32,7 +37,6 @@ The issue supervisor schedule is maintained in the [Issue Supervisor Statistics
 An issue supervisor needs to have all the accesses and privileges required to get their job done. This might include:
 
 - Admin rights in lampepfl/dotty repository
-- Admin rights in lampepfl/dotty-feature-requests repository
 - Permission to create new repositories in lampepfl organization (needed to fork repositories for the community build)
 - Access to the LAMP slack to be able to ask for help with the infrastructure, triaging and such
 

NOTICE.md

@@ -89,15 +89,19 @@ major authors were omitted by oversight.
     details.
 
   * dotty.tools.dotc.coverage: Coverage instrumentation utilities have been
-    adapted from the scoverage plugin for scala 2 [5], which is under the
+    adapted from the scoverage plugin for scala 2 [4], which is under the
     Apache 2.0 license.
 
+  * dooty.tools.pc: Presentation compiler implementation adapted from
+    scalameta/metals [5] mtags module, which is under the Apache 2.0 license.
+
   * The Dotty codebase contains parts which are derived from
-    the ScalaPB protobuf library [4], which is under the Apache 2.0 license.
+    the ScalaPB protobuf library [6], which is under the Apache 2.0 license.
 
 
 [1] https://github.com/scala/scala
 [2] https://github.com/adriaanm/scala/tree/sbt-api-consolidate/src/compiler/scala/tools/sbt
 [3] https://github.com/sbt/sbt/tree/0.13/compile/interface/src/main/scala/xsbt
-[4] https://github.com/lampepfl/dotty/pull/5783/files
-[5] https://github.com/scoverage/scalac-scoverage-plugin
+[4] https://github.com/scoverage/scalac-scoverage-plugin
+[5] https://github.com/scalameta/metals
+[6] https://github.com/lampepfl/dotty/pull/5783/files

build.sbt

@@ -15,6 +15,7 @@ val `scala3-bench` = Build.`scala3-bench`
 val `scala3-bench-bootstrapped` = Build.`scala3-bench-bootstrapped`
 val `scala3-bench-micro` = Build.`scala3-bench-micro`
 val `stdlib-bootstrapped` = Build.`stdlib-bootstrapped`
+val `stdlib-bootstrapped-tasty` = Build.`stdlib-bootstrapped-tasty`
 val `stdlib-bootstrapped-tasty-tests` = Build.`stdlib-bootstrapped-tasty-tests`
 val `tasty-core` = Build.`tasty-core`
 val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
@@ -28,6 +29,8 @@ val `scala3-bench-run` = Build.`scala3-bench-run`
 val dist = Build.dist
 val `community-build` = Build.`community-build`
 val `sbt-community-build` = Build.`sbt-community-build`
+val `scala3-presentation-compiler` = Build.`scala3-presentation-compiler`
+val `scala3-presentation-compiler-bootstrapped` = Build.`scala3-presentation-compiler-bootstrapped`
 
 val sjsSandbox = Build.sjsSandbox
 val sjsJUnitTests = Build.sjsJUnitTests

community-build/README.md

@@ -1,75 +1,5 @@
 # Scala 3 Community Build
 
-This project contains tests to build and test a corpus of open sources Scala
-projects against the latest version of Scala 3.
-
-## Running it locally
-
-To run the community build on a local machine, first fetch all the git
-submodules with `git submodule update --init` and run `sbt community-build/test`
-from the root of the dotty repo.
-
-To run a single project, you can use the usual syntax for running a single JUnit
-test, for example `community-build/testOnly -- *shapeless`
-
-In CI the community build is split up into 3 seperate groups: A, B, and C. To
-run one specific build you can also use the same JUnit syntax as above targeting
-the individual group. For example:
-
-```
-sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
-```
-
-## Adding your project
-
-The community build is able to handle both Mill and sbt projects. To add your
-project to the community build you can follow these steps:
-
-1. Ensure your project is compiling with Scala 3. If you need help make sure to
-   check out the [Scala 3 Migration
-   Guide](https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html).
-   You can see the submodules in
-   [community-projects](https://github.com/lampepfl/dotty/tree/main/community-build/community-projects/)
-   for examples of projects that compile with Scala 3.
-
-2. Open a PR against this repo that:
-     - Adds your project as a new git submodule
-       - `git submodule add https://github.com/dotty-staging/XYZ.git community-build/community-projects/XYZ`
-     - Add the project to [projects.scala](https://github.com/lampepfl/dotty/blob/main/community-build/src/scala/dotty/communitybuild/projects.scala)
-     - Adds a test in [CommunityBuildTest.scala](https://github.com/lampepfl/dotty/blob/main/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala)
-
-3. Once the CI is green, someone from the Dotty team will fork your repo and add
-   it to [dotty-staging](https://github.com/dotty-staging). This enables us to
-   make changes to your fork if necessary to keep the community build running
-   smoothly.
-
-4. Once the fork is created, please update your PR to point to this new fork
-   instead of your repo.
-
-## Updating a project
-
-The projects included in the community build are all forked and located in
-[dotty-staging](https://github.com/dotty-staging). When something needs to be
-bumped the process is as follows:
-
-1. Fork the dotty staging repo and sync it with the upstream project.
-
-2. Once you've verified that the tests are all passing you can then either
-   request in your PR that the dotty-staging fork be synced or in the
-   [scala-contributors](https://discord.com/channels/632150470000902164/632628489719382036)
-   discord channel.
-
-### Some helpful tips
-
-- If you're unfamiliar with Git Submodules you can find a nice guide to get
-    familiar with them [here](https://git-scm.com/book/en/v2/Git-Tools-Submodules).
-- Keep in mind that many projects are interrelated. So when you bump one that
-    change may cascade through multiple different projects causing you to have
-    to bump multiple. Plan accordingly and at times it's best to pin it to a
-    stable release version, especially if it's a root library that many others
-    in the community build are relying on.
-
-## Looking for the "unmanaged" Scala 3 community build?
-
-You can find this [here](https://github.com/VirtusLab/community-build3).
-
+For information on the community build check out the [Community Build section of
+the Contributing
+Docs](https://dotty.epfl.ch/docs/contributing/community-build.html).

community-build/community-projects/izumi-reflect

@@ -140,7 +140,7 @@ final case class SbtCommunityProject(
       case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
       case _ => Nil
     extraSbtArgs ++ sbtProps ++ List(
-      "-sbt-version", "1.8.2",
+      "-sbt-version", "1.9.0",
       "-Dsbt.supershell=false",
       s"-Ddotty.communitybuild.dir=$communitybuildDir",
       s"--addPluginSbtFile=$sbtPluginFilePath"

community-build/community-projects/munit

@@ -94,6 +94,7 @@ class CommunityBuildTestC:
   @Test def shapeless = projects.shapeless.run()
   @Test def sourcecode = projects.sourcecode.run()
   @Test def specs2 = projects.specs2.run()
+
   @Test def stdLib213 = projects.stdLib213.run()
   @Test def ujson = projects.ujson.run()
   @Test def upickle = projects.upickle.run()

community-build/community-projects/specs2

@@ -23,6 +23,12 @@ class PostProcessor(val frontendAccess: PostProcessorFrontendAccess, val bTypes:
 
   def postProcessAndSendToDisk(generatedDefs: GeneratedDefs): Unit = {
     val GeneratedDefs(classes, tasty) = generatedDefs
+    if !ctx.settings.YoutputOnlyTasty.value then
+      postProcessClassesAndSendToDisk(classes)
+    postProcessTastyAndSendToDisk(tasty)
+  }
+
+  private def postProcessClassesAndSendToDisk(classes: List[GeneratedClass]): Unit = {
     for (GeneratedClass(classNode, sourceFile, isArtifact, onFileCreated) <- classes) {
       val bytes =
         try
@@ -46,8 +52,10 @@ class PostProcessor(val frontendAccess: PostProcessorFrontendAccess, val bTypes:
         if clsFile != null then onFileCreated(clsFile)
       }
     }
+  }
 
-    for (GeneratedTasty(classNode, binaryGen) <- tasty){
+  private def postProcessTastyAndSendToDisk(tasty: List[GeneratedTasty]): Unit = {
+    for (GeneratedTasty(classNode, binaryGen) <- tasty) {
       classfileWriter.writeTasty(classNode.name.nn, binaryGen())
     }
   }

community-build/community-projects/stdLib213

@@ -5,6 +5,7 @@ import core._
 import Contexts._
 import SymDenotations.ClassDenotation
 import Symbols._
+import Comments.Comment
 import util.{FreshNameCreator, SourceFile, NoSource}
 import util.Spans.Span
 import ast.{tpd, untpd}
@@ -69,6 +70,9 @@ class CompilationUnit protected (val source: SourceFile) {
   /** Can this compilation unit be suspended */
   def isSuspendable: Boolean = true
 
+  /** List of all comments present in this compilation unit */
+  var comments: List[Comment] = Nil
+
   /** Suspends the compilation unit by thowing a SuspendException
    *  and recording the suspended compilation unit
    */

community-build/src/scala/dotty/communitybuild/projects.scala

@@ -308,7 +308,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
 
   private def printTree(last: PrintedTree)(using Context): PrintedTree = {
     val unit = ctx.compilationUnit
-    val fusedPhase = ctx.phase.prevMega
+    val fusedPhase = ctx.phase.prev.megaPhase
     val echoHeader = f"[[syntax trees at end of $fusedPhase%25s]] // ${unit.source}"
     val tree = if ctx.isAfterTyper then unit.tpdTree else unit.untpdTree
     val treeString = fusedPhase.show(tree)