Merged branch idea243.release into idea243.x

JetBrains · Jan 24, 2025 · 9234298 · 9234298
2 parents 5ddde6b + 974288c
commit 9234298
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/ScalaVersion.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/ScalaVersion.scala
@@ -115,7 +115,7 @@ object LatestScalaVersions {
   // Release candidates
   //
   // Scala LTS RC
-  val Scala_3_LTS_RC: ScalaVersion = Scala_3_3.withMinor("5-RC2")
+  val Scala_3_LTS_RC: ScalaVersion = Scala_3_3.withMinor("5-RC3")
 
   // Scala Next RC
   val Scala_3_Next_RC = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "4-RC1")

diff --git a/...c/org/jetbrains/plugins/scala/annotator/element/ScParameterizedTypeElementAnnotator.scala b/...c/org/jetbrains/plugins/scala/annotator/element/ScParameterizedTypeElementAnnotator.scala
@@ -25,6 +25,8 @@ object ScParameterizedTypeElementAnnotator extends ElementAnnotator[ScParameteri
   )(implicit
     holder: ScalaAnnotationHolder
   ): Unit = {
+    if (!typeAware) return
+
     val prefixType = element.typeElement.getTypeNoConstructor.toOption
 
     val projSubstitutor = element.typeElement.`type`().toOption match {

diff --git a/...a-impl/src/org/jetbrains/plugins/scala/annotator/element/ScTypeBoundsOwnerAnnotator.scala b/...a-impl/src/org/jetbrains/plugins/scala/annotator/element/ScTypeBoundsOwnerAnnotator.scala
@@ -16,6 +16,8 @@ object ScTypeBoundsOwnerAnnotator extends ElementAnnotator[ScTypeBoundsOwner] {
 
   override def annotate(element: ScTypeBoundsOwner, typeAware: Boolean)
                        (implicit holder: ScalaAnnotationHolder): Unit = {
+    if (!typeAware) return
+
     val typeParamClause  = PsiTreeUtil.getParentOfType(element, classOf[ScTypeParamClause]).toOption
     val isFunctionClause = typeParamClause.flatMap(_.parent).exists(_.is[ScFunction])