semanticdb working

bazeltools · Nov 30, 2023 · 4ae09c1 · 4ae09c1
1 parent 225ff55
commit 4ae09c1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/examples/simple-no-errors/src/example/Main.scala b/examples/simple-no-errors/src/example/Main.scala
@@ -6,5 +6,6 @@ import example.foo.Bar
 object Main extends App {
   val f = Foo(1)
   val b = Bar("b")
+
   Console.println(s"Hello World. I have $f, $b")
 }
diff --git a/src/main/scala/bazeltools/bsp4bazel/runner/BspTaskRunner.scala b/src/main/scala/bazeltools/bsp4bazel/runner/BspTaskRunner.scala
@@ -100,7 +100,9 @@ object BspTaskRunner:
             scalaVersion = info.scalaVersion,
             scalaBinaryVersion = majorVersion(info.scalaVersion),
             platform = ScalaPlatform.JVM,
-            jars = info.scalaCompileJars.map(p => UriFactory.fileUri(workspaceRoot.resolve(p))),
+            jars = info.scalaCompileJars.map(p =>
+              UriFactory.fileUri(workspaceRoot.resolve(p))
+            ),
             jvmBuildTarget = None
           ).asJson
         )
@@ -109,9 +111,16 @@ object BspTaskRunner:
     def asScalaOptionItem: ScalacOptionsItem =
       ScalacOptionsItem(
         target = id,
-        options = info.scalacOptions,
-        classpath = info.classpath.map(p => UriFactory.fileUri(workspaceRoot.resolve(p))),
-        classDirectory = UriFactory.fileUri(workspaceRoot.resolve(info.semanticdbTargetRoot))
+        // NB: Metals looks for these parameters to be set specifically. They don't really do anything here as 
+        // semanticdb is instead configured in the Bazel rules.
+        options = List(
+          s"-Xplugin:${info.semanticdbPluginjar}",
+          s"-P:semanticdb:sourceroot:${workspaceRoot}"
+        ) ::: info.scalacOptions,
+        classpath =
+          info.classpath.map(p => UriFactory.fileUri(workspaceRoot.resolve(p))),
+        classDirectory =
+          UriFactory.fileUri(workspaceRoot.resolve(info.semanticdbTargetRoot))
       )
 
   case class BspTargetInfo(