Skip to content

Fix bug when indexing Scala package repo #373

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 1 commit into from
Nov 22, 2021
Merged

Fix bug when indexing Scala package repo #373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/LsifBuildTool.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ class LsifBuildTool(index: IndexCommand) extends BuildTool("LSIF", index) {
return CommandResult(0, Nil)
}

val compileAttemtps = ListBuffer.empty[Try[Unit]]
compileAttemtps += compileJavaFiles(tmp, deps, config, javaFiles)
compileAttemtps += compileScalaFiles(deps, scalaFiles)
compileAttemtps += compileKotlinFiles(deps, config, kotlinFiles)
val errors = compileAttemtps.collect { case Failure(exception) =>
val compileAttempts = ListBuffer.empty[Try[Unit]]
compileAttempts += compileJavaFiles(tmp, deps, config, javaFiles)
compileAttempts += compileScalaFiles(deps, scalaFiles)
compileAttempts += compileKotlinFiles(deps, config, kotlinFiles)
val errors = compileAttempts.collect { case Failure(exception) =>
exception
}

Expand All @@ -179,6 +179,9 @@ class LsifBuildTool(index: IndexCommand) extends BuildTool("LSIF", index) {
val isSemanticdbGenerated = Files
.isDirectory(targetroot.resolve("META-INF"))
if (errors.nonEmpty && !isSemanticdbGenerated) {
errors.foreach { error =>
index.app.reporter.log(Diagnostic.exception(error))
}
CommandResult(1, Nil)
} else {
if (errors.nonEmpty && isSemanticdbGenerated) {
Expand Down Expand Up @@ -376,8 +379,9 @@ class LsifBuildTool(index: IndexCommand) extends BuildTool("LSIF", index) {
)(fn: PresentationCompiler => T): T = {
val scalaVersion = deps
.classpath
.headOption
.iterator
.flatMap(jar => ScalaVersion.inferFromJar(jar))
.nextOption()
.getOrElse {
throw new IllegalArgumentException(
s"failed to infer the Scala version from the dependencies: " +
Expand Down