Skip to content

Fix trapped stderr, discard files from JAR filesystems #124

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 29, 2022
Merged

Fix trapped stderr, discard files from JAR filesystems #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
538cbb5
Disable nailgun standard streams stuff
alexarchambault Nov 29, 2022
38c1416
Discard files from JAR filesystems
alexarchambault Nov 29, 2022
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
14 changes: 11 additions & 3 deletions backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopIncremental.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,24 @@ object BloopIncremental {
val setOfSources = sources.toSet
val incremental = new BloopNameHashing(log, uniqueInputs, options, profiler.profileRun, tracer)
val initialChanges = incremental.detectInitialChanges(setOfSources, previous, current, lookup, converter, output)
def isJrt(path: Path) = path.getFileSystem.provider().getScheme == "jrt"
def ignore(path: Path) = {
val scheme = path.getFileSystem.provider().getScheme
scheme == "jrt" || scheme == "jar"
}
val binaryChanges = new DependencyChanges {
val modifiedLibraries = initialChanges.libraryDeps.toArray

val modifiedBinaries: Array[File] = modifiedLibraries
.map(converter.toPath(_))
.collect {
// jrt path is neither a jar nor a normal file
case path if !isJrt(path) =>
path.toFile()
case path if !ignore(path) =>
try path.toFile()
catch {
case e: UnsupportedOperationException =>
System.err.println(s"Error converting $path (provider scheme ${path.getFileSystem.provider().getScheme}) to a file: $e")
throw e
}
}
.distinct
val modifiedClasses = initialChanges.external.allModified.toArray
Expand Down
12 changes: 11 additions & 1 deletion frontend/src/main/scala/bloop/Bloop.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,17 @@ object Bloop {
}

val server =
new NGServer(address, poolSize, heartbeatMs, in, out, err, javaLogger, domainSocketProvider)
new NGServer(
address,
poolSize,
heartbeatMs,
in,
out,
err,
javaLogger,
domainSocketProvider,
false
)
registerAliases(server)
ProxySetup.init()
server
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object Dependencies {
import sbt.librarymanagement.syntax.stringToOrganization
val zinc = "org.scala-sbt" %% "zinc" % zincVersion
val bsp4s = "ch.epfl.scala" %% "bsp4s" % bspVersion
val nailgun = "io.github.alexarchambault.bleep" % "nailgun-server" % "1.0.3"
val nailgun = "io.github.alexarchambault.bleep" % "nailgun-server" % "1.0.4"
val javaDebug = "ch.epfl.scala" % "com-microsoft-java-debug-core" % javaDebugVersion

val libraryManagement = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
Expand Down