Merge branch 'main' into fix/repl-multiline-colon

Author: vaibhav410

.github/workflows/ci.yaml

@@ -125,7 +125,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Test
-        run: sbt ";scala3-bootstrapped/compile; scala3-presentation-compiler/test; scala3-language-server/test"
+        run: sbt ";scala3-bootstrapped/compile"
         shell: cmd
 
       - name: build binary
@@ -219,14 +219,15 @@ jobs:
       - name: Check compiler version
         shell: bash
         run : |
-          version=$(./project/scripts/sbt "print scala3-compiler-bootstrapped/version" | tail -n1)
+          version=$(./project/scripts/sbt "print scala3-compiler-bootstrapped-new/version" | tail -n1)
           echo "This build version: ${version}"
           if [ "${version}" != "${{ env.RELEASE_TAG }}" ]; then
             echo "Compiler version for this build '${version}', does not match tag: ${{ env.RELEASE_TAG }}"
             exit 1
           fi
 
       - name: Prepare the SDKs
+        if: false # TODO: Requires changes to dist targets, to be done before stable release
         shell: bash
         run : |
           prepareSDK() {
@@ -253,11 +254,13 @@ jobs:
           prepareSDK "-x86_64-pc-win32"      "dist-win-x86_64"    "./dist/win-x86_64/"
 
       - name: Download MSI package
+        if: false # TODO: Requires changes to dist targets, to be done before stable release
         uses: actions/download-artifact@v6
         with:
           name: scala.msi
           path: .
       - name: Prepare MSI package
+        if: false # TODO: Requires changes to dist targets, to be done before stable release
         shell: bash
         run: |
           msiInstaller="scala3-${{ env.RELEASE_TAG }}.msi"
@@ -285,13 +288,14 @@ jobs:
           --latest=${{ !contains(env.RELEASE_TAG, '-RC') }} \
           --prerelease=${{ contains(env.RELEASE_TAG, '-RC') }} \
           --verify-tag ${{ env.RELEASE_TAG }} \
-          scala3-${{ env.RELEASE_TAG }}*.zip \
-          scala3-${{ env.RELEASE_TAG }}*.tar.gz \
-          scala3-${{ env.RELEASE_TAG }}*.sha256 \
-          scala3-${{ env.RELEASE_TAG }}.msi
+          # TODO: dist packaging for 3.8.0 stable release
+          # scala3-${{ env.RELEASE_TAG }}*.zip \
+          # scala3-${{ env.RELEASE_TAG }}*.tar.gz \
+          # scala3-${{ env.RELEASE_TAG }}*.sha256 \
+          # scala3-${{ env.RELEASE_TAG }}.msi
 
       - name: Publish Release
-        run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaUpload"
+        run: ./project/scripts/sbtPublish ";project scala3-bootstrapped-new ;publishSigned ;sonaUpload"
 
   build-msi-package:
     uses: ./.github/workflows/build-msi.yml

.github/workflows/lts-backport.yaml

@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 0
       - uses: coursier/cache-action@v7
-      - uses: VirtusLab/scala-cli-setup@v1.9.1
+      - uses: VirtusLab/scala-cli-setup@v1.10.0
       - run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
         env:
           GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

.github/workflows/releases.yml

@@ -32,6 +32,7 @@ jobs:
 
   publish-winget:
     uses: ./.github/workflows/publish-winget.yml
+    if: false # TODO: Requires setting up initial WinGet package
     with:
       version: ${{ inputs.version }}
     secrets:

.github/workflows/stdlib.yaml

@@ -316,6 +316,40 @@ jobs:
       - name: Compile `scaladoc`
         run: ./project/scripts/sbt scaladoc-new/compile
 
+  presentation-compiler:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
+
+      - name: Compile `scala3-presentation-compiler`
+        run: ./project/scripts/sbt scala3-presentation-compiler/compile
+
+  language-server:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
+
+      - name: Compile `scala3-language-server`
+        run: ./project/scripts/sbt scala3-language-server/compile
+
   #################################################################################################
   ########################################### MiMa JOBS ###########################################
   #################################################################################################
@@ -583,6 +617,40 @@ jobs:
       - name: Test REPL
         run: ./project/scripts/sbt scala3-repl/test
 
+  test-presentation-compiler:
+    runs-on: ubuntu-latest
+    needs: [presentation-compiler]
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
+      - name: Test Presentation Compiler
+        run: ./project/scripts/sbt scala3-presentation-compiler/test
+
+  test-language-server:
+    runs-on: ubuntu-latest
+    needs: [language-server]
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
+      - name: Test Language Server
+        run: ./project/scripts/sbt scala3-language-server/test
+
   scripted-tests:
     runs-on: ubuntu-latest
     needs: [scala3-compiler-bootstrapped, tasty-core-bootstrapped, scala3-staging, scala3-tasty-inspector, scala-library-sjs, scaladoc]

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -42,7 +42,7 @@ class CommunityBuildTestB:
   @Test def discipline = projects.discipline.run()
   @Test def disciplineMunit = projects.disciplineMunit.run()
   @Test def disciplineSpecs2 = projects.disciplineSpecs2.run()
-  @Test def fs2 = projects.fs2.run()
+  //@Test def fs2 = projects.fs2.run()
   @Test def monocle = projects.monocle.run()
   @Test def munit = projects.munit.run()
   @Test def munitCatsEffect = projects.munitCatsEffect.run()

compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala

@@ -69,8 +69,6 @@ final class JSDefinitions()(using Context) {
     @threadUnsafe lazy val PseudoUnion_fromTypeConstructorR = PseudoUnionModule.requiredMethodRef("fromTypeConstructor")
     def PseudoUnion_fromTypeConstructor(using Context) = PseudoUnion_fromTypeConstructorR.symbol
 
-  @threadUnsafe lazy val UnionOpsModuleRef = requiredModuleRef("scala.scalajs.js.internal.UnitOps")
-
   @threadUnsafe lazy val JSArrayType: TypeRef = requiredClassRef("scala.scalajs.js.Array")
   def JSArrayClass(using Context) = JSArrayType.symbol.asClass
   @threadUnsafe lazy val JSDynamicType: TypeRef = requiredClassRef("scala.scalajs.js.Dynamic")

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

@@ -480,7 +480,15 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
     else if tp.symbol.hasAnnotation(defn.ScalaStaticAnnot) then
       Ident(tp)
     else
+      // Throw an error here if we detect a skolem to improve the error message in tests/neg/i8623.scala
+      def checkNoSkolemInPrefix(pre: Type): Unit = pre.dealias match
+        case pre: SkolemType =>
+          throw TypeError(em"cannot construct a tree referring to $tp because of skolem prefix $pre")
+        case pre: TermRef => checkNoSkolemInPrefix(pre.prefix)
+        case _ =>
+
       val pre = tp.prefix
+      checkNoSkolemInPrefix(tp)
       if pre.isSingleton then followOuterLinks(singleton(pre.dealias, needLoad)).select(tp)
       else
         val res = Select(TypeTree(pre), tp)
@@ -517,9 +525,10 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
   def singleton(tp: Type, needLoad: Boolean = true)(using Context): Tree = tp.dealias match {
     case tp: TermRef => ref(tp, needLoad)
     case tp: ThisType => This(tp.cls)
-    case tp: SkolemType => singleton(tp.narrow(), needLoad)
     case SuperType(qual, _) => singleton(qual, needLoad)
     case ConstantType(value) => Literal(value)
+    case tp: SkolemType =>
+      throw TypeError(em"cannot construct a tree referring to skolem $tp")
   }
 
   /** A tree representing a `newXYZArray` operation of the right

compiler/src/dotty/tools/dotc/cc/Capability.scala

@@ -375,10 +375,14 @@ object Capabilities:
       case tp: SetCapability => tp.captureSetOfInfo.isReadOnly
       case _ => this ne stripReadOnly
 
-    /** The restriction of this capability or NoSymbol if there is none */
-    final def restriction(using Context): Symbol = this match
+    /** The classifier, either given in an explicit `.only` or assumed for a
+     *  FreshCap. AnyRef for unclassified FreshCaps. Otherwise NoSymbol if no
+     *  classifier is given.
+     */
+    final def classifier(using Context): Symbol = this match
       case Restricted(_, cls) => cls
-      case Maybe(ref1) => ref1.restriction
+      case Maybe(ref1) => ref1.classifier
+      case self: FreshCap => self.hiddenSet.classifier
       case _ => NoSymbol
 
     /** Is this a reach reference of the form `x*` or a readOnly or maybe variant
@@ -609,7 +613,7 @@ object Capabilities:
           case Reach(_) =>
             captureSetOfInfo.transClassifiers
           case self: CoreCapability =>
-            if self.derivesFromCapability then toClassifiers(self.classifier)
+            if self.derivesFromCapability then toClassifiers(self.inheritedClassifier)
             else captureSetOfInfo.transClassifiers
         if myClassifiers != UnknownClassifier then
           classifiersValid == currentId

compiler/src/dotty/tools/dotc/cc/CaptureOps.scala

@@ -488,7 +488,7 @@ extension (tp: Type)
     case _ =>
       tp
 
-  def classifier(using Context): ClassSymbol =
+  def inheritedClassifier(using Context): ClassSymbol =
     tp.classSymbols.map(_.classifier).foldLeft(defn.AnyClass)(leastClassifier)
 
 extension (tp: MethodType)

compiler/src/dotty/tools/dotc/cc/CapturingType.scala

@@ -40,7 +40,7 @@ object CapturingType:
         apply(parent1, refs ++ refs1, boxed)
       case _ =>
         if parent.derivesFromMutable then refs.associateWithMutable()
-        refs.adoptClassifier(parent.classifier)
+        refs.adoptClassifier(parent.inheritedClassifier)
         AnnotatedType(parent, CaptureAnnotation(refs, boxed)(defn.RetainsAnnot))
 
   /** An extractor for CapturingTypes. Capturing types are recognized if