Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Exclude MDoc dependencies on project's classpath to avoid conflicts #4708

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions metals/src/main/scala/scala/meta/internal/metals/Embedded.scala
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,7 @@ final class Embedded(

// Full mdoc classpath seems to be causing some issue with akka
// We want to keep a minimal set of jars needed here
val runtimeClasspath = jars.filter { path =>
val pathString = path.toString
pathString.contains("scala-lang") ||
pathString.contains("fansi") ||
pathString.contains("pprint") ||
pathString.contains("sourcecode") ||
pathString.contains("mdoc") ||
pathString.contains("scalameta") ||
pathString.contains("metaconfig") ||
pathString.contains("diffutils")
}
val runtimeClasspath = jars.filter(Embedded.filterMDocLibraries)
val urls = runtimeClasspath.iterator.map(_.toUri().toURL()).toArray
new URLClassLoader(urls, parent)
}
Expand Down Expand Up @@ -335,4 +325,16 @@ object Embedded {
downloadDependency(dependency, Some(scalaVersion))
}

def filterMDocLibraries(path: Path) = {
val pathString = path.toString
pathString.contains("scala-lang") ||
pathString.contains("fansi") ||
pathString.contains("pprint") ||
pathString.contains("sourcecode") ||
pathString.contains("mdoc") ||
pathString.contains("scalameta") ||
pathString.contains("metaconfig") ||
pathString.contains("diffutils")
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,12 @@ class WorksheetProvider(
.asJava
val mdoc = embedded
.mdoc(info.scalaVersion)
.withClasspath(info.fullClasspath.distinct.asJava)
.withClasspath(
info.fullClasspath
.filterNot(Embedded.filterMDocLibraries)
.distinct
.asJava
)
.withScalacOptions(scalacOptions)
mdocs(key) = MdocRef(scalaVersion, mdoc)
mdoc
Expand Down
24 changes: 24 additions & 0 deletions tests/unit/src/test/scala/tests/worksheets/WorksheetLspSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,28 @@ class WorksheetLspSuite extends tests.BaseWorksheetLspSuite(V.scala213) {
_ = assertNoDiagnostics()
} yield ()
}

test("pprint") {
cleanWorkspace()
val path = "a/src/main/scala/hi.worksheet.sc"
for {
_ <- initialize(
s"""
|/metals.json
|{
| "a": {
| "libraryDependencies": ["com.lihaoyi::pprint:0.6.0"]
| }
|}
|/${path}
|new java.sql.Date(100L)
|""".stripMargin
)
_ <- server.didOpen(path)
_ = assertNoDiff(
client.workspaceDecorations,
"new java.sql.Date(100L) // : java.sql.Date = 1970-01-01",
)
} yield ()
}
}