diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b97965066a..38258f9430 100644 --- 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 index a0c6724130..09a55075b1 100644 --- 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 index 8e2ee6c517..21396adb9f 100644 --- 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 index 8e2ee6c517..21396adb9f 100644 --- 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 index 8e2ee6c517..21396adb9f 100644 --- 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 index 8e2ee6c517..21396adb9f 100644 --- 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 index 52544ae32d..dd01baa3a8 100644 --- 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 index 8e2ee6c517..21396adb9f 100644 --- 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