Make the sbt tests pass

scalameta · Dec 15, 2023 · 478d57a · 478d57a
1 parent 19539c6
commit 478d57a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/tests/slow/src/test/scala/tests/sbt/SbtStepDapSuite.scala b/tests/slow/src/test/scala/tests/sbt/SbtStepDapSuite.scala
@@ -3,10 +3,15 @@ package tests.sbt
 import tests.SbtBuildLayout
 import tests.SbtServerInitializer
 import tests.debug.BaseStepDapSuite
+import scala.meta.internal.metals.BuildInfo
 
 class SbtStepDapSuite
     extends BaseStepDapSuite(
       s"sbt-debug-step",
       SbtServerInitializer,
       SbtBuildLayout,
-    )
+    ) {
+
+  // otherwise we get both Scala 2.12 and 2.13 dependencies, whchich is more tricky for the tests
+  override def scalaVersion: String = BuildInfo.scala212
+}
diff --git a/tests/unit/src/main/scala/tests/debug/BaseStepDapSuite.scala b/tests/unit/src/main/scala/tests/debug/BaseStepDapSuite.scala
@@ -109,7 +109,7 @@ abstract class BaseStepDapSuite(
         .at("a/src/main/scala/Main.scala", line = 5)(StepIn)
         .atDependency(
           server.toPathFromSymbol("scala.Predef", "scala/Predef.scala"),
-          line = 427,
+          line = if (scalaVersion.startsWith("2.13")) 427 else 405,
         )(Continue)
     },
   )