Merge pull request #163 from tgodzik/updaten

tgodzik · web-flow · commit 8f65cccf6691 · 2024-04-02T16:37:11.000+02:00
bugfix: Don't show error message if nothing needs to be send, but end was processed
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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.8.0"`
	`1`	`+version = "3.8.1"`
`2`	`2`
`3`	`3`	`align.preset = more`
`4`	`4`	`maxColumn = 100`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.7.3"`
	`1`	`+version = "3.8.1"`
`2`	`2`	`runner.dialect = scala213`
`3`	`3`	`maxColumn = 100`
`4`	`4`	`docstrings.style = Asterisk`
Original file line number	Diff line number	Diff line change
`@@ -276,17 +276,18 @@ final class BspProjectReporter(`
`276`	`276`	`override def reportCancelledCompilation(): Unit = ()`
`277`	`277`
`278`	`278`	`private var endEvent: Option[CompilationEvent.EndCompilation] = None`
	`279`	`+ private var wasEndProcessed: Boolean = false`
`279`	`280`	`override def reportEndCompilation(): Unit = {`
`280`	`281`	`endEvent match {`
`281`	`282`	`case Some(end) => logger.publishCompilationEnd(end)`
`282`		`- case None =>`
	`283`	`+ case None if !wasEndProcessed =>`
`283`	`284`	`logger.error(`
`284`	`285`	"Fatal invariant violated: `reportEndCompilation` was called before `processEndCompilation`"
`285`	`286`	`)`
	`287`	`+ case _ =>`
`286`	`288`	`}`
`287`	`289`	`}`
`288`	`290`
`289`		`- //`
`290`	`291`	`override def processEndCompilation(`
`291`	`292`	`previousSuccessfulProblems: List[ProblemPerPhase],`
`292`	`293`	`code: bsp.StatusCode,`
`@@ -321,7 +322,7 @@ final class BspProjectReporter(`
`321`	`322`	`}`
`322`	`323`	`}`
`323`	`324`	`}`
`324`		`-`
	`325`	`+ wasEndProcessed = true`
`325`	`326`	`endEvent = if (cycleCount.get == 0) {`
`326`	`327`	`recheckProblems`
`327`	`328`	`None`