Skip to content

Commit 2fe4081

Browse files
authored
improvement: Small fixes to allow using Metals with scaladoc with sbt (#16816)
This would require just setting `bspEnabled := true`, but not for sjsJUnitTests which seem to cause inifinite loop of compilations. I also need to work a bit on Bloop to also make it work. This still needs scalameta/metals#4938
2 parents 6183cde + 7f6a2f7 commit 2fe4081

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

project/Build.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ object Build {
360360

361361
// Settings used when compiling dotty with a non-bootstrapped dotty
362362
lazy val commonBootstrappedSettings = commonDottySettings ++ NoBloopExport.settings ++ Seq(
363+
// To enable support of scaladoc and language-server projects you need to change this to true and use sbt as your build server
363364
bspEnabled := false,
364365
(Compile / unmanagedSourceDirectories) += baseDirectory.value / "src-bootstrapped",
365366

@@ -1130,6 +1131,7 @@ object Build {
11301131
enablePlugins(DottyJSPlugin).
11311132
dependsOn(`scala3-library-bootstrappedJS`).
11321133
settings(
1134+
bspEnabled := false,
11331135
scalacOptions --= Seq("-Xfatal-warnings", "-deprecation"),
11341136

11351137
// Required to run Scala.js tests.

project/build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
// Used by VersionUtil to get gitHash and commitDate
22
libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.201803080745-r"
33

4-
5-
Compile / unmanagedSourceDirectories +=
6-
baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config"
74
libraryDependencies += Dependencies.`jackson-databind`

0 commit comments

Comments
 (0)