SLI-1381 Error when a background task has no ProgressIndicator or Job

SonarSource · Oct 17, 2024 · fc46144 · fc46144
1 parent 4dbe93e
commit fc46144
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/git/src/main/kotlin/org/sonarlint/intellij/git/GitRepo.kt b/git/src/main/kotlin/org/sonarlint/intellij/git/GitRepo.kt
@@ -74,7 +74,13 @@ class GitRepo(private val repo: GitRepository, private val project: Project) : V
  }
 
  private fun distance(project: Project, repository: GitRepository, from: String, to: String): Int? {
- val mergeBase = GitHistoryUtils.getMergeBase(project, repository.root, from, to) ?: return null
+ val mergeBase = try {
+ GitHistoryUtils.getMergeBase(project, repository.root, from, to) ?: return null
+ } catch (e: IllegalStateException) {
+ // SLI-1381: "There is no ProgressIndicator or Job in this thread" should simply be a loud error
+ SonarLintConsole.get(project).debug("Couldn't compute the git distance, reason: ${e.message}")
+ return null
+ }
  val aheadCount = getNumberOfCommitsBetween(repository, from, mergeBase.asString()) ?: return null
  val behindCount = getNumberOfCommitsBetween(repository, to, mergeBase.asString()) ?: return null
  return aheadCount + behindCount