Backport "Migrate presentation compiler" to 3.8.0 (#24426)

WojciechMazur · web-flow · commit 52958fd09d90 · 2025-11-13T17:16:47.000-05:00
Backports #24413 to the 3.8.0-RC1. PR submitted by the release tooling. [skip ci]
diff --git a/.github/workflows/ci.yaml b/.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; scala3-language-server/test"
         shell: cmd
 
       - name: build binary
diff --git a/.github/workflows/stdlib.yaml b/.github/workflows/stdlib.yaml
@@ -315,6 +315,23 @@ 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
+
   #################################################################################################
   ########################################### MiMa JOBS ###########################################
   #################################################################################################
@@ -582,6 +599,23 @@ 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
+
   scripted-tests:
     runs-on: ubuntu-latest
     needs: [scala3-compiler-bootstrapped, tasty-core-bootstrapped, scala3-staging, scala3-tasty-inspector, scala-library-sjs, scaladoc]
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/InferExpectedTypeSuite.scala
@@ -93,7 +93,7 @@ class InferExpectedTypeSuite extends BasePCSuite:
     check(
       """|val i: Option[Int] = Option(@@)
          |""".stripMargin,
-      """|Int
+      """|Int | Null
          |""".stripMargin
     )
 
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/NoIndentSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/NoIndentSuite.scala
@@ -5,6 +5,7 @@ import java.nio.file.Path
 import dotty.tools.pc.base.{BaseCompletionSuite, BaseExtractMethodSuite}
 
 import org.junit.Test
+import org.junit.Ignore
 
 class ExtractMethodNoIndentSuite extends BaseExtractMethodSuite:
   override protected def scalacOptions(classpath: Seq[Path]): Seq[String] =
@@ -73,6 +74,7 @@ class CompletionMatchNoIndentSuite extends BaseCompletionSuite:
       filter = !_.contains("exhaustive")
     )
 
+  @Ignore
   @Test def `exhaustive` =
     checkEdit(
       s"""
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala
@@ -4,6 +4,7 @@ import dotty.tools.pc.base.BaseCompletionSuite
 
 import org.junit.FixMethodOrder
 import org.junit.Test
+import org.junit.Ignore
 import org.junit.runners.MethodSorters
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -157,7 +158,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
           |  Option[Int](@@)
           |}
           |""".stripMargin,
-      """|x = : A
+      """|x = : A | Null
          |Main test
          |""".stripMargin,
       topLines = Option(2)
@@ -1174,6 +1175,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
       topLines = Some(1),
     )
 
+  @Ignore
   @Test def `comparison` =
     check(
       """
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionCaseSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionCaseSuite.scala
@@ -6,6 +6,7 @@ import scala.meta.pc.PresentationCompilerConfig
 import dotty.tools.pc.base.BaseCompletionSuite
 
 import org.junit.Test
+import org.junit.Ignore
 
 class CompletionCaseSuite extends BaseCompletionSuite:
 
@@ -249,6 +250,7 @@ class CompletionCaseSuite extends BaseCompletionSuite:
          |""".stripMargin
     )
 
+  @Ignore
   @Test def `lambda` =
     check(
       """
@@ -291,6 +293,7 @@ class CompletionCaseSuite extends BaseCompletionSuite:
          |""".stripMargin
     )
 
+  @Ignore
   @Test def `lambda-curry` =
     check(
       """
@@ -305,6 +308,7 @@ class CompletionCaseSuite extends BaseCompletionSuite:
          |""".stripMargin
     )
 
+  @Ignore
   @Test def `partial` =
     check(
       """
@@ -347,6 +351,7 @@ class CompletionCaseSuite extends BaseCompletionSuite:
          |""".stripMargin
     )
 
+  @Ignore
   @Test def `infix` =
     check(
       """
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionKeywordSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionKeywordSuite.scala
@@ -3,9 +3,11 @@ package dotty.tools.pc.tests.completion
 import dotty.tools.pc.base.BaseCompletionSuite
 
 import org.junit.Test
+import org.junit.Ignore
 
 class CompletionKeywordSuite extends BaseCompletionSuite:
 
+  @Ignore
   @Test def `super-template` =
     check(
       """
@@ -61,6 +63,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
       includeCommitCharacter = true
     )
 
+  @Ignore
   @Test def `super-def` =
     check(
       """
@@ -81,6 +84,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
          |""".stripMargin
     )
 
+  @Ignore
   @Test def `super-val` =
     check(
       """
@@ -101,6 +105,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
          |""".stripMargin
     )
 
+  @Ignore
   @Test def `super-var` =
     check(
       """
@@ -121,6 +126,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
          |""".stripMargin
     )
 
+  @Ignore
   @Test def `super-arg` =
     check(
       """
@@ -380,6 +386,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite:
       ""
     )
 
+  @Ignore
   @Test def `super-typeapply` =
     check(
       """
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionMatchSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionMatchSuite.scala
@@ -4,6 +4,7 @@ import dotty.tools.pc.base.BaseCompletionSuite
 import dotty.tools.pc.utils.MockEntries
 
 import org.junit.Test
+import org.junit.Ignore
 
 class CompletionMatchSuite extends BaseCompletionSuite:
 
@@ -335,6 +336,7 @@ class CompletionMatchSuite extends BaseCompletionSuite:
       filter = _.contains("exhaustive")
     )
 
+  @Ignore
   @Test def `exhaustive-map` =
     check(
       """
@@ -346,6 +348,7 @@ class CompletionMatchSuite extends BaseCompletionSuite:
       filter = _.contains("exhaustive")
     )
 
+  @Ignore
   @Test def `exhaustive-map-edit` =
     checkEdit(
       """
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSnippetSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSnippetSuite.scala
@@ -384,6 +384,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite:
       topLines = Some(4)
     )
 
+  @Ignore
   @Test def `no-apply` =
     checkSnippet(
       s"""|package example
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
@@ -412,6 +412,7 @@ class CompletionSuite extends BaseCompletionSuite:
       includeCommitCharacter = true
     )
 
+  @Ignore
   @Test def `numeric-sort` =
     check(
       """
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/definition/TypeDefinitionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/definition/TypeDefinitionSuite.scala
@@ -9,6 +9,7 @@ import dotty.tools.pc.utils.MockEntries
 
 import org.eclipse.lsp4j.Location
 import org.junit.Test
+import org.junit.Ignore
 
 class TypeDefinitionSuite extends BasePcDefinitionSuite:
 
@@ -216,6 +217,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite:
          |""".stripMargin
     )
 
+  @Ignore
   @Test def `string` =
     check(
       """|object Main {
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala
@@ -3,6 +3,7 @@ package dotty.tools.pc.tests.hover
 import dotty.tools.pc.base.BaseHoverSuite
 
 import org.junit.Test
+import org.junit.Ignore
 
 class HoverTermSuite extends BaseHoverSuite:
 
@@ -68,6 +69,7 @@ class HoverTermSuite extends BaseHoverSuite:
          |""".stripMargin.hover
     )
 
+  @Ignore
   @Test def `interpolator-name` =
     check(
       """
@@ -80,6 +82,7 @@ class HoverTermSuite extends BaseHoverSuite:
          |""".stripMargin.hover
     )
 
+  @Ignore
   @Test def `interpolator-macro` =
     check(
       """
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/signaturehelp/SignatureHelpDocSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/signaturehelp/SignatureHelpDocSuite.scala
@@ -122,8 +122,8 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite:
         |}
       """.stripMargin,
       """|Found documentation for scala/Option.apply().
-         |apply[A](x: A): Option[A]
-         |         ^^^^
+         |apply[A](x: A | Null): Option[A]
+         |         ^^^^^^^^^^^
          |  @param x Found documentation for param x
          |""".stripMargin
     )
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/signaturehelp/SignatureHelpPatternSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/signaturehelp/SignatureHelpPatternSuite.scala
@@ -3,9 +3,11 @@ package dotty.tools.pc.tests.signaturehelp
 import dotty.tools.pc.base.BaseSignatureHelpSuite
 
 import org.junit.Test
+import org.junit.Ignore
 
 class SignatureHelpPatternSuite extends BaseSignatureHelpSuite:
 
+  @Ignore
   @Test def `case` =
     check(
       """
@@ -170,6 +172,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite:
          | """.stripMargin
     )
 
+  @Ignore
   @Test def `pat2` =
     check(
       """
diff --git a/presentation-compiler/test/dotty/tools/pc/tests/signaturehelp/SignatureHelpSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/signaturehelp/SignatureHelpSuite.scala
@@ -162,8 +162,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
         |  List(Option(1@@))
         |}
       """.stripMargin,
-      """|apply[A](x: A): Option[A]
-         |         ^^^^
+      """|apply[A](x: A | Null): Option[A]
+         |         ^^^^^^^^^^^
          |""".stripMargin
     )
 
@@ -186,8 +186,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
         |  List(Option(@@))
         |}
       """.stripMargin,
-      """|apply[A](x: A): Option[A]
-         |         ^^^^
+      """|apply[A](x: A | Null): Option[A]
+         |         ^^^^^^^^^^^
          |""".stripMargin
     )
 
@@ -235,7 +235,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
         |  Option[I@@]
         |}
       """.stripMargin,
-      """|apply[A](x: A): Option[A]
+      """|apply[A](x: A | Null): Option[A]
          |      ^
          |""".stripMargin
     )
@@ -345,8 +345,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
         |  } yield k
         |}
       """.stripMargin,
-      """|apply[A](x: A): Option[A]
-         |         ^^^^
+      """|apply[A](x: A | Null): Option[A]
+         |         ^^^^^^^^^^^
          |""".stripMargin
     )
 
@@ -580,8 +580,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
         |  Option(a @@)
         |}
       """.stripMargin,
-      """|apply[A](x: A): Option[A]
-         |         ^^^^
+      """|apply[A](x: A | Null): Option[A]
+         |         ^^^^^^^^^^^
          |""".stripMargin
     )
 
@@ -641,6 +641,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
          |""".stripMargin
     )
 
+  @Ignore
   @Test def `evidence` =
     check(
       """
diff --git a/project/Build.scala b/project/Build.scala

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class InferExpectedTypeSuite extends BasePCSuite:`
`93`	`93`	`check(`
`94`	`94`	`"""\|val i: Option[Int] = Option(@@)`
`95`	`95`	`\|""".stripMargin,`
`96`		`- """\|Int`
	`96`	`+ """\|Int \| Null`
`97`	`97`	`\|""".stripMargin`
`98`	`98`	`)`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite:`
`384`	`384`	`topLines = Some(4)`
`385`	`385`	`)`
`386`	`386`
	`387`	`+ @Ignore`
`387`	`388`	@Test def `no-apply` =
`388`	`389`	`checkSnippet(`
`389`	`390`	`s"""\|package example`
Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,7 @@ class CompletionSuite extends BaseCompletionSuite:`
`412`	`412`	`includeCommitCharacter = true`
`413`	`413`	`)`
`414`	`414`
	`415`	`+ @Ignore`
`415`	`416`	@Test def `numeric-sort` =
`416`	`417`	`check(`
`417`	`418`	`"""`