Skip to content

Add test cases project for presentation compiler #22101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ val `dist-linux-aarch64` = Build.`dist-linux-aarch64`
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-testcases` = Build.`scala3-presentation-compiler-testcases`

val sjsSandbox = Build.sjsSandbox
val sjsJUnitTests = Build.sjsJUnitTests
Expand Down
16 changes: 16 additions & 0 deletions presentation-compiler-testcases/src/tests/macros/20560.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package tests.macros

import scala.quoted.{Expr, Quotes}

object Macro20560:
transparent inline def loadJavaSqlDriver: Int = ${ loadJavaSqlDriverImpl }

private def loadJavaSqlDriverImpl(using Quotes): Expr[42] =
Class.forName("java.sql.Driver")
'{42}

transparent inline def loadJavaSqlInexisting: Int = ${ loadJavaSqlInexistingImpl }

private def loadJavaSqlInexistingImpl(using Quotes): Expr[42] =
Class.forName("java.sql.Inexisting")
'{42}
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import org.junit.runner.RunWith
import scala.meta.pc.CompletionItemPriority

object TestResources:
val scalaLibrary = BuildInfo.ideTestsDependencyClasspath.map(_.toPath).toSeq
val classpath = BuildInfo.ideTestsDependencyClasspath.map(_.toPath).toSeq
val classpathSearch =
ClasspathSearch.fromClasspath(scalaLibrary, ExcludedPackagesHandler.default)
ClasspathSearch.fromClasspath(classpath, ExcludedPackagesHandler.default)

@RunWith(classOf[ReusableClassRunner])
abstract class BasePCSuite extends PcAssertions:
Expand All @@ -38,11 +38,11 @@ abstract class BasePCSuite extends PcAssertions:
val executorService: ScheduledExecutorService =
Executors.newSingleThreadScheduledExecutor()
val testingWorkspaceSearch = TestingWorkspaceSearch(
TestResources.scalaLibrary.map(_.toString)
TestResources.classpath.map(_.toString)
)

lazy val presentationCompiler: PresentationCompiler =
val myclasspath: Seq[Path] = TestResources.scalaLibrary
val myclasspath: Seq[Path] = TestResources.classpath
val scalacOpts = scalacOptions(myclasspath)
val search = new MockSymbolSearch(
testingWorkspaceSearch,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,21 @@ class HoverTermSuite extends BaseHoverSuite:
|""".stripMargin
)

@Test def `i20560`=
check(
"val re@@s = tests.macros.Macro20560.loadJavaSqlDriver",
"""```scala
|val res: Int
|```
|""".stripMargin
)

@Test def `i20560-2`=
check(
"val re@@s = tests.macros.Macro20560.loadJavaSqlInexisting",
"", // crashes in the Macro; no type info
)

@Test def `import-rename` =
check(
"""
Expand Down
9 changes: 7 additions & 2 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,7 @@ object Build {

lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
.withCommonSettings(Bootstrapped)
.dependsOn(`scala3-compiler-bootstrapped`, `scala3-library-bootstrapped`)
.dependsOn(`scala3-compiler-bootstrapped`, `scala3-library-bootstrapped`, `scala3-presentation-compiler-testcases`)
.settings(presentationCompilerSettings)
.settings(scala3PresentationCompilerBuildInfo)
.settings(
Expand All @@ -1436,14 +1436,15 @@ object Build {
def scala3PresentationCompilerBuildInfo =
Seq(
ideTestsDependencyClasspath := {
val testCasesLib = (`scala3-presentation-compiler-testcases` / Compile / classDirectory).value
val dottyLib = (`scala3-library-bootstrapped` / Compile / classDirectory).value
val scalaLib =
(`scala3-library-bootstrapped` / Compile / dependencyClasspath)
.value
.map(_.data)
.filter(_.getName.matches("scala-library.*\\.jar"))
.toList
dottyLib :: scalaLib
testCasesLib :: dottyLib :: scalaLib
// Nil
},
Compile / buildInfoPackage := "dotty.tools.pc.buildinfo",
Expand Down Expand Up @@ -1503,6 +1504,10 @@ object Build {
)
}

lazy val `scala3-presentation-compiler-testcases` = project.in(file("presentation-compiler-testcases"))
.dependsOn(`scala3-compiler-bootstrapped`)
.settings(commonBootstrappedSettings)

lazy val `scala3-language-server` = project.in(file("language-server")).
dependsOn(dottyCompiler(Bootstrapped)).
settings(commonBootstrappedSettings).
Expand Down
Loading