Merge pull request #3006 from adpi2/sbt-server-tests-2

Alternative version of #2999: Add more tests on using sbt as the build server
scalameta · Aug 10, 2021 · 0edb78e · 0edb78e
2 parents 250cf2f + c2f9869
commit 0edb78e
Show file tree

Hide file tree

Showing 88 changed files with 2,001 additions and 1,638 deletions.
diff --git a/build.sbt b/build.sbt
@@ -507,7 +507,7 @@ lazy val `sbt-metals` = project
       "semanticdbVersion" -> V.semanticdb,
       "supportedScala2Versions" -> V.scala2Versions
     ),
-    addSbtPlugin("ch.epfl.scala" % "sbt-debug-adapter" % "1.1.2")
+    addSbtPlugin("ch.epfl.scala" % "sbt-debug-adapter" % "1.1.3")
   )
   .enablePlugins(BuildInfoPlugin)
   .disablePlugins(ScalafixPlugin)

diff --git a/metals/src/main/scala/scala/meta/internal/metals/Messages.scala b/metals/src/main/scala/scala/meta/internal/metals/Messages.scala
@@ -120,6 +120,7 @@ object Messages {
   object ImportBuildChanges {
     def yes: MessageActionItem =
       new MessageActionItem("Import changes")
+    def notNow: MessageActionItem = Messages.notNow
     def params(buildToolName: String): ShowMessageRequestParams = {
       val params = new ShowMessageRequestParams()
       params.setMessage(s"$buildToolName build needs to be re-imported")
@@ -137,6 +138,7 @@ object Messages {
 
   object ImportBuild {
     def yes = new MessageActionItem("Import build")
+    def notNow: MessageActionItem = Messages.notNow
     def params(buildToolName: String): ShowMessageRequestParams = {
       val params = new ShowMessageRequestParams()
       params.setMessage(

diff --git a/metals/src/main/scala/scala/meta/internal/metals/MetalsLanguageServer.scala b/metals/src/main/scala/scala/meta/internal/metals/MetalsLanguageServer.scala
@@ -2083,6 +2083,7 @@ class MetalsLanguageServer(
           Future.successful(BuildChange.None)
       }
       _ = {
+        tables.dismissedNotifications.ImportChanges.reset()
         treeView.init()
       }
     } yield result)

diff --git a/tests/slow/src/test/scala/tests/MultipleBuildFilesLspSuite.scala b/tests/slow/src/test/scala/tests/MultipleBuildFilesLspSuite.scala
@@ -25,7 +25,7 @@ class MultipleBuildFilesLspSuite
   test("basic") {
     cleanWorkspace()
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""|/build.sbt
             |scalaVersion := "${V.scala212}"
             |/build.sc

diff --git a/tests/slow/src/test/scala/tests/SymlinkedProjectSuite.scala b/tests/slow/src/test/scala/tests/SymlinkedProjectSuite.scala
@@ -6,10 +6,11 @@ import scala.meta.internal.metals.MetalsEnrichments._
 import scala.meta.internal.metals.{BuildInfo => V}
 import scala.meta.io.AbsolutePath
 
-class SymlinkedProjectSuite extends BaseLspSuite("symlinked-project") {
+class SymlinkedProjectSuite
+    extends BaseLspSuite("symlinked-project", BloopImportInitializer) {
   test("definitions-from-other-file") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""|/project/build.properties
             |sbt.version=${V.sbtVersion}
             |
@@ -48,7 +49,7 @@ class SymlinkedProjectSuite extends BaseLspSuite("symlinked-project") {
          |""".stripMargin
     )
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""|/project/build.properties
             |sbt.version=${V.sbtVersion}
             |

diff --git a/tests/slow/src/test/scala/tests/feature/AmmoniteSuite.scala b/tests/slow/src/test/scala/tests/feature/AmmoniteSuite.scala
@@ -8,7 +8,7 @@ class Ammonite212Suite extends tests.BaseAmmoniteSuite(V.ammonite212) {
 
   test("global-version-fallback") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""
            |/metals.json
            |{

diff --git a/tests/slow/src/test/scala/tests/feature/CompletionCrossLspSuite.scala b/tests/slow/src/test/scala/tests/feature/CompletionCrossLspSuite.scala
@@ -26,7 +26,7 @@ class CompletionCrossLspSuite
   test("serializable-2.13") {
     cleanWorkspace()
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""/metals.json
            |{
            |  "a": { "scalaVersion": "${V.scala213}" }

diff --git a/tests/slow/src/test/scala/tests/feature/CrossDebugSuite.scala b/tests/slow/src/test/scala/tests/feature/CrossDebugSuite.scala
@@ -1,110 +1,11 @@
 package tests.feature
 
-import scala.meta.internal.metals.{BuildInfo => V}
-
-import tests.BaseDapSuite
-
-class CrossDebugSuite extends BaseDapSuite("cross-debug") {
-
-  override def scalaVersion: String = V.scala3
-
-  assertBreakpoints(
-    "outer",
-    main = Some("a.helloWorld")
-  )(
-    source = """|/a/src/main/scala/a/Main.scala
-                |package a
-                |
-                |@main 
-                |def helloWorld(): Unit = {
-                |>>println("Hello world")
-                |  System.exit(0)
-                |}
-                |
-                |""".stripMargin
-  )
-
-  assertBreakpoints(
-    "unapply",
-    main = Some("a.helloWorld")
-  )(
-    source = """|/a/src/main/scala/a/Main.scala
-                |package a
-                |
-                |@main 
-                |def helloWorld(): Unit = {
-                |  object Even {
-                |>>  def unapply(s: String): Boolean = s.size % 2 == 0
-                |  }
-                |
-                |  "even" match {
-                |    case Even() => 
-                |    case _      => 
-                |  }
-                |  System.exit(0)
-                |}
-                |
-                |""".stripMargin
-  )
-
-  assertBreakpoints(
-    "object-in-toplevel-method",
-    main = Some("a.helloWorld")
-  )(
-    source = """|/a/src/main/scala/a/Main.scala
-                |package a
-                |
-                |@main 
-                |def helloWorld(): Unit = {
-                |  object Hello{
-                |    def run() = {
-                |>>    println("Hello world")
-                |    }
-                |  }
-                |  Hello.run()
-                |  System.exit(0)
-                |}
-                |
-                |
-                |""".stripMargin
-  )
-
-  assertBreakpoints(
-    "optional-braces",
-    main = Some("a.hello")
-  )(
-    source = """|/a/src/main/scala/a/Main.scala
-                |package a
-                |
-                |@main 
-                |def hello(): Unit = 
-                |  greet("Alice")
-                |  System.exit(0)
-                |
-                |def greet(name: String) = 
-                |>>val message = s"Hello, $name!"
-                |>>println(message)
-                |
-                |""".stripMargin
-  )
-
-  assertBreakpoints(
-    "optional-braces-main",
-    main = Some("a.hello")
-  )(
-    source = """|/a/src/main/scala/a/Main.scala
-                |package a
-                |
-                |@main 
-                |def hello(): Unit = 
-                |>>greet("Alice")
-                |>>System.exit(0)
-                |
-                |def greet(name: String) = 
-                |  val message = s"Hello, $name!"
-                |  println(message)
-                |
-                |""".stripMargin
-  )
-
-}
+import tests.QuickBuildInitializer
+import tests.QuickBuildLayout
+
+class CrossDebugSuite
+    extends BaseCrossDebugSuite(
+      "cross-debug",
+      QuickBuildInitializer,
+      QuickBuildLayout
+    )
diff --git a/tests/slow/src/test/scala/tests/feature/DefinitionCrossLspSuite.scala b/tests/slow/src/test/scala/tests/feature/DefinitionCrossLspSuite.scala
@@ -32,7 +32,7 @@ class DefinitionCrossLspSuite
   test("underscore") {
     cleanDatabase()
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""
            |/metals.json
            |{
@@ -65,7 +65,7 @@ class DefinitionCrossLspSuite
   def basicDefinitionTest(scalaVersion: String): Future[Unit] = {
     cleanDatabase()
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""
            |/metals.json
            |{

diff --git a/tests/slow/src/test/scala/tests/feature/FoldingCrossLspSuite.scala b/tests/slow/src/test/scala/tests/feature/FoldingCrossLspSuite.scala
@@ -8,7 +8,7 @@ class FoldingCrossLspSuite extends BaseLspSuite("foldingRange-cross") {
 
   test("base-213") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""|
             |/metals.json
             |{
@@ -44,7 +44,7 @@ class FoldingCrossLspSuite extends BaseLspSuite("foldingRange-cross") {
 
   test("source-3") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""|
             |/metals.json
             |{

diff --git a/tests/slow/src/test/scala/tests/feature/SyntaxErrorLspSuite.scala b/tests/slow/src/test/scala/tests/feature/SyntaxErrorLspSuite.scala
@@ -33,7 +33,7 @@ class SyntaxErrorLspSuite extends BaseLspSuite("syntax-error") {
         }
 
       for {
-        _ <- server.initialize(
+        _ <- initialize(
           s"""
              |/metals.json
              |{"a": {}}
@@ -49,7 +49,7 @@ class SyntaxErrorLspSuite extends BaseLspSuite("syntax-error") {
 
   test("basic") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         """|
            |/metals.json
            |{"a": {}}
@@ -93,7 +93,7 @@ class SyntaxErrorLspSuite extends BaseLspSuite("syntax-error") {
 
   test("mix1") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         """|
            |/metals.json
            |{"a": {}}
@@ -129,7 +129,7 @@ class SyntaxErrorLspSuite extends BaseLspSuite("syntax-error") {
 
   test("mix2") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         """|
            |/metals.json
            |{"a": {}}
@@ -163,7 +163,7 @@ class SyntaxErrorLspSuite extends BaseLspSuite("syntax-error") {
 
   test("no-build-tool") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         """
           |/A.scala
           |object A { val x = }
@@ -183,7 +183,7 @@ class SyntaxErrorLspSuite extends BaseLspSuite("syntax-error") {
 
   test("unclosed-literal") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         """
           |/metals.json
           |{"a": {}}
@@ -321,7 +321,7 @@ class SyntaxErrorLspSuite extends BaseLspSuite("syntax-error") {
   test("literal-types") {
     cleanWorkspace()
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""
            |/metals.json
            |{"a": { "scalaVersion": "${V.scala213}" }}
@@ -346,7 +346,7 @@ class SyntaxErrorLspSuite extends BaseLspSuite("syntax-error") {
         .sortWith(_ > _)
         .head
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""
            |/metals.json
            |{"a": { "scalaVersion": "$latestScala3" }}

diff --git a/tests/slow/src/test/scala/tests/feature/WorksheetCrossLspSuite.scala b/tests/slow/src/test/scala/tests/feature/WorksheetCrossLspSuite.scala
@@ -11,7 +11,7 @@ class Worksheet213LspSuite extends tests.BaseWorksheetLspSuite(V.scala213) {
 
   test("literals") {
     for {
-      _ <- server.initialize(
+      _ <- initialize(
         s"""
            |/metals.json
            |{"a": {"scalaVersion": "${V.scala213}"}}