Merged branch idea243.release into idea243.x

JetBrains · Dec 2, 2024 · df5109d · df5109d
2 parents 0a6c671 + a1c5a46
commit df5109d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/ScalaVersion.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/ScalaVersion.scala
@@ -118,7 +118,7 @@ object LatestScalaVersions {
   val Scala_3_LTS_RC: ScalaVersion = Scala_3_3.withMinor("4-RC4")
 
   // Scala Next RC
-  val Scala_3_Next_RC = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "2-RC2")
+  val Scala_3_Next_RC = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "2-RC3")
 
   val allScala2: Seq[ScalaVersion] = Seq(
     Scala_2_9,

diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/components/TypeAwareWidget.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/components/TypeAwareWidget.scala
@@ -29,13 +29,13 @@ private final class TypeAwareWidget(project: Project, factory: TypeAwareWidgetFa
 
   override def ID(): String = TypeAwareWidgetFactory.ID
 
-  override def install(statusBar: StatusBar): Unit = {
+  override def install(statusBar: StatusBar): Unit = synchronized {
     this.statusBar = statusBar
     connection.subscribe(TypeAwareWidgetFactory.Topic, this)
     subscribeToRootsChange()
   }
 
-  override def dispose(): Unit = {
+  override def dispose(): Unit = synchronized {
     connection.dispose()
     statusBar = null
   }
@@ -61,7 +61,7 @@ private final class TypeAwareWidget(project: Project, factory: TypeAwareWidgetFa
   override def getClickConsumer: Consumer[MouseEvent] =
     _ => ToggleTypeAwareHighlightingAction.toggleSettingAndRehighlight(project)
 
-  override def updateWidget(): Unit = {
+  override def updateWidget(): Unit = synchronized {
     if (statusBar ne null) {
       widgetsManager.updateWidget(factory)
       statusBar.updateWidget(ID())