fix build.sbt and windows tests

Author: rochala

presentation-compiler/test/dotty/tools/pc/base/BasePcDefinitionSuite.scala

@@ -12,14 +12,15 @@ import dotty.tools.pc.utils.TextEdits
 
 import org.eclipse.lsp4j.TextEdit
 import org.eclipse.lsp4j as l
+import java.nio.file.Paths
 
 abstract class BasePcDefinitionSuite extends BasePCSuite:
 
   def definitions(offsetParams: OffsetParams): List[l.Location]
 
   def check(original: String): Unit =
     val filename = "A.scala"
-    val uri = s"file:///$filename"
+    val uri = Paths.get(filename).toUri
 
     val (_, offset) = params(original.removeRanges, filename)
     val cleanedCode = original.removeRanges.removePos
@@ -30,10 +31,10 @@ abstract class BasePcDefinitionSuite extends BasePCSuite:
     ).toLsp
 
     val locs = definitions(
-      CompilerOffsetParams(URI.create(uri), cleanedCode, offset)
+      CompilerOffsetParams(uri, cleanedCode, offset)
     )
     val edits = locs.flatMap { location =>
-      if (location.getUri() == uri) {
+      if (location.getUri() == uri.toString) {
         List(
           new TextEdit(
             new l.Range(

presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala

@@ -256,16 +256,9 @@ class CompletionSuite extends BaseCompletionSuite:
         |""".stripMargin,
       """|Path - java.nio.file
          |Paths - java.nio.file
-         |XPath - javax.xml.xpath
-         |Path2D - java.awt.geom
-         |CertPath - java.security.cert
-         |TreePath - javax.swing.tree
-         |XPathType - javax.xml.crypto.dsig.spec
-         |LayoutPath - java.awt.font
-         |XPathNodes - javax.xml.xpath
          |PathMatcher - java.nio.file
-         |XPathResult - org.w3c.dom.xpath
-         |""".stripMargin
+         |""".stripMargin,
+         filter = _.contains("java.nio.file")
     )
 
   @Test def import4 =

project/Build.scala

@@ -1076,11 +1076,30 @@ object Build {
     case Bootstrapped => `scala3-presentation-compiler-bootstrapped`
   }
 
+  def scala3PresentationCompilerBuildInfo(implicit mode: Mode) =
+    Seq(
+      ideTestsDependencyClasspath := {
+        val dottyLib = (dottyLibrary / Compile / classDirectory).value
+        val scalaLib =
+          (dottyLibrary / Compile / dependencyClasspath)
+            .value
+            .map(_.data)
+            .filter(_.getName.matches("scala-library.*\\.jar"))
+            .toList
+        dottyLib :: scalaLib
+        // Nil
+      },
+      Compile / buildInfoPackage := "dotty.tools.pc.util",
+      Compile / buildInfoKeys := Seq(scalaVersion),
+      Test / buildInfoKeys := Seq(scalaVersion, ideTestsDependencyClasspath)
+    ) ++ BuildInfoPlugin.buildInfoScopedSettings(Compile) ++
+      BuildInfoPlugin.buildInfoScopedSettings(Test) ++
+      BuildInfoPlugin.buildInfoDefaultSettings
+
   lazy val presentationCompilerSettings = {
     val mtagsVersion = "0.11.12+45-45df705d-SNAPSHOT" // Will be set to stable release after 0.11.13 is published
 
     Seq(
-      moduleName := "scala3-presentation-compiler",
       libraryDependencies ++= Seq(
         "org.lz4" % "lz4-java" % "1.8.0",
         "io.get-coursier" % "interface" % "1.0.13",
@@ -1121,22 +1140,7 @@ object Build {
           mtagsSharedSources
         } (Set(mtagsSharedSourceJar)).toSeq
       }.taskValue,
-      ideTestsDependencyClasspath := {
-        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
-      },
-      Compile / buildInfoPackage := "dotty.tools.pc.util",
-      Compile / buildInfoKeys := Seq(scalaVersion),
-      Test / buildInfoKeys := Seq(scalaVersion, ideTestsDependencyClasspath)
-    ) ++ BuildInfoPlugin.buildInfoScopedSettings(Compile) ++
-      BuildInfoPlugin.buildInfoScopedSettings(Test) ++
-      BuildInfoPlugin.buildInfoDefaultSettings
+    )
   }
 
   lazy val `scala3-language-server` = project.in(file("language-server")).
@@ -1938,8 +1942,9 @@ object Build {
       enablePlugins(JmhPlugin)
 
     def asScala3PresentationCompiler(implicit mode: Mode): Project = project.withCommonSettings.
-      dependsOn(dottyCompiler).
-      settings(presentationCompilerSettings)
+      dependsOn(dottyCompiler, dottyLibrary).
+      settings(presentationCompilerSettings).
+      settings(scala3PresentationCompilerBuildInfo)
 
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).