bugfix: Don't add debugging if using sbt 2 and add test

scalameta · Dec 18, 2024 · 21b387e · 21b387e
1 parent c114b89
commit 21b387e
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 5 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala b/metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala
@@ -302,11 +302,26 @@ object SbtBuildTool {
   def writeSbtMetalsPlugins(projectRoot: AbsolutePath): Boolean = {
     val mainMeta = projectRoot.resolve("project")
     val metaMeta = projectRoot.resolve("project").resolve("project")
-    val writtenPlugin =
-      writePlugins(mainMeta, metalsPluginDetails, debugAdapterPluginDetails)
-    val writtenMeta =
-      writePlugins(metaMeta, metalsPluginDetails, jdiToolsPluginDetails)
-    writtenPlugin || writtenMeta
+
+    val isSbt2 =
+      SbtBuildTool.loadVersion(projectRoot).exists(_.startsWith("2."))
+    if (isSbt2) {
+      val writtenPlugin = writePlugins(mainMeta, metalsPluginDetails)
+      val writtenMeta = writePlugins(
+        metaMeta,
+        metalsPluginDetails,
+      )
+      writtenMeta || writtenPlugin
+    } else {
+      val writtenPlugin = writePlugins(
+        mainMeta,
+        metalsPluginDetails,
+        debugAdapterPluginDetails,
+      )
+      val writtenMeta =
+        writePlugins(metaMeta, metalsPluginDetails, jdiToolsPluginDetails)
+      writtenMeta || writtenPlugin
+    }
   }
 
   private case class PluginDetails(

diff --git a/tests/slow/src/test/scala/tests/sbt/SbtServerSuite.scala b/tests/slow/src/test/scala/tests/sbt/SbtServerSuite.scala
@@ -176,6 +176,47 @@ class SbtServerSuite
     }
   }
 
+  test("sbt-2.0.0") {
+    cleanWorkspace()
+    client.importBuildChanges = ImportBuildChanges.yes
+    for {
+      _ <- initialize(
+        s"""|/project/build.properties
+            |sbt.version=2.0.0-M3
+            |/build.sbt
+            |
+            |scalaVersion := "$scalaVersion"
+            |val a = project.in(file("a"))
+            |val b = project.in(file("b"))
+            |/a/src/main/scala/A.scala
+            |
+            |object A{
+            |  val foo = 1
+            |  foo + foo
+            |}
+            |""".stripMargin
+      )
+      _ <- server.server.indexingPromise.future
+      references <- server.references("a/src/main/scala/A.scala", "foo")
+      _ = assertEmpty(client.workspaceDiagnostics)
+      _ = assertNoDiff(
+        references,
+        """|a/src/main/scala/A.scala:3:7: info: reference
+           |  val foo = 1
+           |      ^^^
+           |a/src/main/scala/A.scala:4:3: info: reference
+           |  foo + foo
+           |  ^^^
+           |a/src/main/scala/A.scala:4:9: info: reference
+           |  foo + foo
+           |        ^^^
+           |""".stripMargin,
+      )
+      _ = assertEmpty(client.workspaceShowMessages)
+    } yield ()
+
+  }
+
   test("reload") {
     cleanWorkspace()
     client.importBuildChanges = ImportBuildChanges.yes