Merge pull request #163 from tgodzik/updaten

bugfix: Don't show error message if nothing needs to be send, but end was processed
scala-cli · Apr 2, 2024 · 8f65ccc · 8f65ccc
2 parents 967aa1b + 242278b
commit 8f65ccc
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           submodules: true
           fetch-depth: 0
-      - uses: coursier/setup-action@v1.3.0
+      - uses: coursier/setup-action@v1.3.5
         with:
           apps: scalafmt
           jvm: "temurin:17"

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.0"
+version = "3.8.1"
 
 align.preset = more
 maxColumn = 100

diff --git a/backend/.scalafmt.conf b/backend/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.3"
+version = "3.8.1"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk

diff --git a/benchmarks/.scalafmt.conf b/benchmarks/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.3"
+version = "3.8.1"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk

diff --git a/bridges/.scalafmt.conf b/bridges/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.3"
+version = "3.8.1"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk

diff --git a/frontend/.scalafmt.conf b/frontend/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.3"
+version = "3.8.1"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk

diff --git a/frontend/src/main/scala/bloop/reporter/BspProjectReporter.scala b/frontend/src/main/scala/bloop/reporter/BspProjectReporter.scala
@@ -276,17 +276,18 @@ final class BspProjectReporter(
   override def reportCancelledCompilation(): Unit = ()
 
   private var endEvent: Option[CompilationEvent.EndCompilation] = None
+  private var wasEndProcessed: Boolean = false
   override def reportEndCompilation(): Unit = {
     endEvent match {
       case Some(end) => logger.publishCompilationEnd(end)
-      case None =>
+      case None if !wasEndProcessed =>
         logger.error(
           "Fatal invariant violated: `reportEndCompilation` was called before `processEndCompilation`"
         )
+      case _ =>
     }
   }
 
-  //
   override def processEndCompilation(
       previousSuccessfulProblems: List[ProblemPerPhase],
       code: bsp.StatusCode,
@@ -321,7 +322,7 @@ final class BspProjectReporter(
           }
       }
     }
-
+    wasEndProcessed = true
     endEvent = if (cycleCount.get == 0) {
       recheckProblems
       None

diff --git a/shared/.scalafmt.conf b/shared/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.3"
+version = "3.8.1"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk