From bfc1205f6c215fbc53ada8a2c94d5fabc311de05 Mon Sep 17 00:00:00 2001
From: Timur Aliberdov <timur.aliberdov@jetbrains.com>
Date: Fri, 17 Jan 2025 10:56:28 +0100
Subject: [PATCH 1/3] Update intellijVersion to 243.23654.117, fix compilation

---
 .idea/kotlinc.xml                                           | 2 +-
 pluginXml/resources/META-INF/plugin.xml                     | 2 +-
 project/Common.scala                                        | 2 +-
 project/dependencies.scala                                  | 2 +-
 .../evaluation/evaluator/ScalaMethodEvaluator.scala         | 6 ++----
 .../debugger/evaluation/evaluator/ScalaThisEvaluator.scala  | 5 ++---
 .../scala/debugger/smartStepInto/ScalaMethodFilter.scala    | 3 +--
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index d33812237c9..f74105ff56f 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -8,6 +8,6 @@
         <option name="languageVersion" value="1.9"/>
     </component>
     <component name="KotlinJpsPluginSettings">
-        <option name="version" value="2.0.21-RC"/>
+        <option name="version" value="2.0.21"/>
     </component>
 </project>
\ No newline at end of file
diff --git a/pluginXml/resources/META-INF/plugin.xml b/pluginXml/resources/META-INF/plugin.xml
index 56796d76f1c..869eb56b4a9 100644
--- a/pluginXml/resources/META-INF/plugin.xml
+++ b/pluginXml/resources/META-INF/plugin.xml
@@ -35,7 +35,7 @@
     <version>VERSION</version>
     <change-notes></change-notes>
     <vendor url="https://www.jetbrains.com">JetBrains</vendor>
-    <idea-version since-build="243.22562" until-build="243.*"/>
+    <idea-version since-build="243.23654" until-build="243.*"/>
 
     <depends>com.intellij.modules.java</depends>
     <depends optional="true" config-file="scala-maven-integration.xml">org.jetbrains.idea.maven</depends>
diff --git a/project/Common.scala b/project/Common.scala
index a0727d3d118..1188e605666 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -171,7 +171,7 @@ object Common {
       .settings(
         // NOTE: check community/.idea/libraries/kotlin_stdlib.xml in intellij monorepo when updating intellijVersion
         // NOTE: keep versions in sync with ultimate/.idea/kotlinc.xml and community/.idea/kotlinc.xml
-        kotlinVersion := "2.0.21-RC",
+        kotlinVersion := "2.0.21",
         kotlincJvmTarget := "17",
         kotlinRuntimeProvided := true
       )
diff --git a/project/dependencies.scala b/project/dependencies.scala
index cafc7dd58b3..af65cb215cc 100644
--- a/project/dependencies.scala
+++ b/project/dependencies.scala
@@ -15,7 +15,7 @@ object Versions {
   val zincVersion = "1.10.3"
 
   // ATTENTION: check the comment in `Common.newProjectWithKotlin` when updating this version
-  val intellijVersion = "243.22562.145"
+  val intellijVersion = "243.23654.117"
 
   def isNightlyIntellijVersion: Boolean = intellijVersion.count(_ == '.') == 1
 
diff --git a/scala/debugger/src/org/jetbrains/plugins/scala/debugger/evaluation/evaluator/ScalaMethodEvaluator.scala b/scala/debugger/src/org/jetbrains/plugins/scala/debugger/evaluation/evaluator/ScalaMethodEvaluator.scala
index 64e451fa9ed..8663e402c97 100644
--- a/scala/debugger/src/org/jetbrains/plugins/scala/debugger/evaluation/evaluator/ScalaMethodEvaluator.scala
+++ b/scala/debugger/src/org/jetbrains/plugins/scala/debugger/evaluation/evaluator/ScalaMethodEvaluator.scala
@@ -3,12 +3,10 @@ package org.jetbrains.plugins.scala.debugger.evaluation.evaluator
 import com.intellij.debugger.engine.evaluation.EvaluationContextImpl
 import com.intellij.debugger.engine.evaluation.expression.{DisableGC, Evaluator}
 import com.intellij.debugger.engine.{DebugProcess, DebugProcessImpl, DebuggerUtils, JVMName}
-import com.intellij.debugger.impl.DebuggerUtilsEx
 import com.intellij.debugger.{JavaDebuggerBundle, SourcePosition}
 import com.sun.jdi._
 import com.sun.tools.jdi.{ConcreteMethodImpl, TypeComponentImpl}
-import org.jetbrains.plugins.scala.debugger.DebuggerBundle
-import org.jetbrains.plugins.scala.debugger.ScalaPositionManager
+import org.jetbrains.plugins.scala.debugger.{DebuggerBundle, ScalaPositionManager}
 import org.jetbrains.plugins.scala.debugger.evaluation.EvaluationException
 import org.jetbrains.plugins.scala.debugger.evaluation.util.DebuggerUtil
 import org.jetbrains.plugins.scala.extensions._
@@ -142,7 +140,7 @@ case class ScalaMethodEvaluator(objectEvaluator: Evaluator,
       def invokeStaticMethod(jdiMethod: Method): AnyRef = {
         def fixArguments(): Seq[Value] = {
           def correctArgType(arg: AnyRef, typeName: String) = arg match {
-            case objRef: ObjectReference => DebuggerUtilsEx.isAssignableFrom(typeName, objRef.referenceType())
+            case objRef: ObjectReference => DebuggerUtils.instanceOf(objRef.referenceType(), typeName)
             case primValue: PrimitiveValue => primValue.`type`().name() == typeName
             case _ => true
           }
diff --git a/scala/debugger/src/org/jetbrains/plugins/scala/debugger/evaluation/evaluator/ScalaThisEvaluator.scala b/scala/debugger/src/org/jetbrains/plugins/scala/debugger/evaluation/evaluator/ScalaThisEvaluator.scala
index 9d6d856f9d3..8c9322bafd0 100644
--- a/scala/debugger/src/org/jetbrains/plugins/scala/debugger/evaluation/evaluator/ScalaThisEvaluator.scala
+++ b/scala/debugger/src/org/jetbrains/plugins/scala/debugger/evaluation/evaluator/ScalaThisEvaluator.scala
@@ -1,15 +1,14 @@
 package org.jetbrains.plugins.scala.debugger.evaluation.evaluator
 
 import com.intellij.debugger.JavaDebuggerBundle
+import com.intellij.debugger.engine.DebuggerUtils
 import com.intellij.debugger.engine.evaluation.EvaluationContextImpl
 import com.intellij.debugger.engine.evaluation.expression.Evaluator
-import com.intellij.debugger.impl.DebuggerUtilsEx
 import com.intellij.debugger.jdi.{LocalVariableProxyImpl, StackFrameProxyImpl}
 import com.sun.jdi._
 import org.jetbrains.plugins.scala.debugger.DebuggerBundle
 import org.jetbrains.plugins.scala.debugger.evaluation.EvaluationException
 
-import scala.annotation.nowarn
 import scala.jdk.CollectionConverters._
 
 class ScalaThisEvaluator(iterations: Int = 0) extends Evaluator {
@@ -83,7 +82,7 @@ class ScalaThisEvaluator(iterations: Int = 0) extends Evaluator {
   def findInOtherFrame(context: EvaluationContextImpl, rt: ReferenceType): Option[Value] = {
     val threadProxy = context.getFrameProxy.threadProxy()
     threadProxy.frames().asScala.collectFirst {
-      case frame if frame.thisObject() != null && DebuggerUtilsEx.isAssignableFrom(rt.name(), frame.thisObject().referenceType()) =>
+      case frame if frame.thisObject() != null && DebuggerUtils.instanceOf(frame.thisObject().referenceType(), rt.name()) =>
         frame.thisObject()
     }
   }
diff --git a/scala/debugger/src/org/jetbrains/plugins/scala/debugger/smartStepInto/ScalaMethodFilter.scala b/scala/debugger/src/org/jetbrains/plugins/scala/debugger/smartStepInto/ScalaMethodFilter.scala
index 4dfeef960e0..55a145aa0b3 100644
--- a/scala/debugger/src/org/jetbrains/plugins/scala/debugger/smartStepInto/ScalaMethodFilter.scala
+++ b/scala/debugger/src/org/jetbrains/plugins/scala/debugger/smartStepInto/ScalaMethodFilter.scala
@@ -1,7 +1,6 @@
 package org.jetbrains.plugins.scala.debugger.smartStepInto
 
 import com.intellij.debugger.engine._
-import com.intellij.debugger.impl.DebuggerUtilsEx
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.Range
 import com.sun.jdi.Location
@@ -54,7 +53,7 @@ class ScalaMethodFilter(function: ScMethodLike, callingExpressionLines: Range[In
     else if (myTargetMethodSignature != null && method.signature() != myTargetMethodSignature.getName(process))
       false
     else
-      DebuggerUtilsEx.isAssignableFrom(locationTypeName, location.declaringType) &&
+      DebuggerUtils.instanceOf(location.declaringType(), locationTypeName) &&
         !ScalaPositionManager.shouldSkip(location, process)
   }
 

From 109f9d28f19ab1f49f8b0a4ef7c9ce96632abe10 Mon Sep 17 00:00:00 2001
From: Timur Aliberdov <timur.aliberdov@jetbrains.com>
Date: Wed, 18 Dec 2024 14:26:17 +0100
Subject: [PATCH 2/3] [inheritors search] handle import aliases for packages
 #SCL-23294 fixed

---
 .../ScalaDirectClassInheritorsSearcher.scala  |  6 +-
 .../lang/psi/stubs/util/ScalaInheritors.scala | 35 ++++-------
 .../lang/search/InheritorsSearchTest.scala    | 63 +++++++++++++++++--
 3 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/impl/search/ScalaDirectClassInheritorsSearcher.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/impl/search/ScalaDirectClassInheritorsSearcher.scala
index 3c3af0f50e3..242972d713e 100644
--- a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/impl/search/ScalaDirectClassInheritorsSearcher.scala
+++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/impl/search/ScalaDirectClassInheritorsSearcher.scala
@@ -59,9 +59,7 @@ class ScalaDirectClassInheritorsSearcher extends QueryExecutor[PsiClass, DirectC
     }
 
     for (candidate <- candidates if inReadAction { candidate.showAsInheritor }) {
-      ProgressManager.checkCanceled()
-      if (inReadAction(candidate.isInheritor(clazz, false)))
-        add(candidate)
+      add(candidate)
     }
 
     if (map.nonEmpty) {
@@ -104,4 +102,4 @@ class ScalaDirectClassInheritorsSearcher extends QueryExecutor[PsiClass, DirectC
 
     true
   }
-}
\ No newline at end of file
+}
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/util/ScalaInheritors.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/util/ScalaInheritors.scala
index 69dc0de82c4..9c2efd4d7c6 100644
--- a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/util/ScalaInheritors.scala
+++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/util/ScalaInheritors.scala
@@ -1,5 +1,6 @@
 package org.jetbrains.plugins.scala.lang.psi.stubs.util
 
+import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
 import com.intellij.psi.search.searches.ClassInheritorsSearch
@@ -87,46 +88,32 @@ object ScalaInheritors {
 
     val inheritorsBuilder = ArraySeq.newBuilder[ScTemplateDefinition]
 
-    def possibleAliases: List[(String, String)] = {
+    val possibleNames: List[String] = {
       val typeAliases =
-        ALIASED_CLASS_NAME_KEY.elements(name, scope).map(ta => (ta.name, ta.qualifiedNameOpt.getOrElse(ta.name)))
+        ALIASED_CLASS_NAME_KEY.elements(name, scope).map(_.name)
           .toList
       val importAliases =
-        ALIASED_IMPORT_KEY.elements(name, scope).flatMap(_.aliasName.map(x => (x, x)))
-          .toList
+        ALIASED_IMPORT_KEY.elements(name, scope).flatMap(_.aliasName).toList
 
-      typeAliases ::: importAliases
+      name :: typeAliases ::: importAliases
     }
 
-    def addCandidates(superName: String, superQName: String): Unit = {
-
+    possibleNames.foreach { superName =>
       val extendsBlockIterable = SUPER_CLASS_NAME_KEY.elements(superName, scope)
       val extendsBlocks = extendsBlockIterable.iterator
 
       while (extendsBlocks.hasNext) {
+        ProgressManager.checkCanceled()
+
         val extendsBlock = extendsBlocks.next()
         extendsBlock.getParent match {
-          case tp: ScTemplateDefinition =>
-            // simple names are stored in index, but in decompiled files they are qualified
-            val superReferenceTexts =
-              directSuperReferenceTexts(extendsBlock)
-                .iterator
-                .map(_.stripPrefix("_root_.").stripPrefix("super."))
-
-            if (superReferenceTexts.exists(superQName.endsWith)) {
-              inheritorsBuilder += tp
-            }
+          case tp: ScTemplateDefinition if tp.isInheritor(clazz, false) =>
+            inheritorsBuilder += tp
           case _ =>
         }
       }
     }
 
-    val qName = clazz.qualifiedNameOpt.getOrElse(name)
-    val nameWithPossibleAliases = (name, qName) :: possibleAliases
-    nameWithPossibleAliases.foreach {
-      case (name, qName) => addCandidates(name, qName)
-    }
-
     inheritorsBuilder.result()
   }
 
@@ -216,7 +203,7 @@ object ScalaInheritors {
 
         clazz match {
           case td: ScTypeDefinition if !td.isEffectivelyFinal =>
-            val directInheritors = directInheritorCandidates(clazz, clazz.resolveScope).filter(_.isInheritor(td, false))
+            val directInheritors = directInheritorCandidates(clazz, clazz.resolveScope)
             directInheritors.foreach(inner)
 
           //todo collect inheritors of java classes
diff --git a/scala/scala-impl/test/org/jetbrains/plugins/scala/lang/search/InheritorsSearchTest.scala b/scala/scala-impl/test/org/jetbrains/plugins/scala/lang/search/InheritorsSearchTest.scala
index 1c4b5914255..c06615841af 100644
--- a/scala/scala-impl/test/org/jetbrains/plugins/scala/lang/search/InheritorsSearchTest.scala
+++ b/scala/scala-impl/test/org/jetbrains/plugins/scala/lang/search/InheritorsSearchTest.scala
@@ -2,14 +2,15 @@ package org.jetbrains.plugins.scala.lang.search
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.search.searches.ClassInheritorsSearch
+import org.jetbrains.plugins.scala.ScalaVersion
 import org.jetbrains.plugins.scala.base.ScalaLightCodeInsightFixtureTestCase
 import org.jetbrains.plugins.scala.extensions.{PsiElementExt, PsiNamedElementExt}
 import org.junit.Assert.{assertEquals, assertTrue}
 
 import scala.jdk.CollectionConverters.CollectionHasAsScala
 
-class InheritorsSearchTest extends ScalaLightCodeInsightFixtureTestCase {
-  private def doTest(fileText: String, expectedSubclassNames: String*): Unit = {
+abstract class InheritorsSearchTestBase extends ScalaLightCodeInsightFixtureTestCase {
+  protected def doTest(fileText: String, expectedSubclassNames: String*): Unit = {
     val file = configureFromFileText(fileText)
     val caretOffset = getEditor.getCaretModel.getOffset
     assertTrue("Caret position is missing", caretOffset > 0)
@@ -63,6 +64,29 @@ class InheritorsSearchTest extends ScalaLightCodeInsightFixtureTestCase {
     "AA2", "AA3"
   )
 
+  // SCL-23294
+  def testPackageAliasImport(): Unit = {
+    myFixture.addFileToProject(
+      "bar/X.scala",
+      """package bar
+        |
+        |import _root_.{foo => F}
+        |
+        |class X extends F.C
+        |""".stripMargin
+    )
+
+    doTest(
+      s"""package foo
+         |
+         |class ${CARET}C {
+         |  def hello(): Unit = println("Hello")
+         |}
+         |""".stripMargin,
+      "X"
+    )
+  }
+
   def testTypeAlias_WithAliasedFullyQualifiedName_1(): Unit = doTest(
     s"""package org.example
        |
@@ -128,7 +152,6 @@ class InheritorsSearchTest extends ScalaLightCodeInsightFixtureTestCase {
        |""".stripMargin,
     "AA2", "AA3")
 
-
   def testImportAlias(): Unit = doTest(
     s"""
        |object X {
@@ -166,7 +189,6 @@ class InheritorsSearchTest extends ScalaLightCodeInsightFixtureTestCase {
        |""".stripMargin,
     "B1", "B2")
 
-
   //SCL-18672
   def testPrivateSealedTrait(): Unit = doTest(
     s"""
@@ -197,4 +219,35 @@ class InheritorsSearchTest extends ScalaLightCodeInsightFixtureTestCase {
        |}
        |""".stripMargin,
     "SuccessResult", "NotFoundResult", "WrongResult")
-}
\ No newline at end of file
+}
+
+final class InheritorsSearchTest extends InheritorsSearchTestBase {
+  override def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_2_13
+}
+
+final class InheritorsSearchTest_Scala3 extends InheritorsSearchTestBase {
+  override def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3
+
+  // SCL-23294
+  def testPackageAliasUnqualifiedImport(): Unit = {
+    myFixture.addFileToProject(
+      "bar/X.scala",
+      """package bar
+        |
+        |import foo as F
+        |
+        |class X extends F.C
+        |""".stripMargin
+    )
+
+    doTest(
+      s"""package foo
+         |
+         |class ${CARET}C {
+         |  def hello(): Unit = println("Hello")
+         |}
+         |""".stripMargin,
+      "X"
+    )
+  }
+}

From b976b36193ddb512e83ff0a742b15682e1478e5e Mon Sep 17 00:00:00 2001
From: Timur Aliberdov <timur.aliberdov@jetbrains.com>
Date: Mon, 23 Dec 2024 18:44:51 +0100
Subject: [PATCH 3/3] [code with me] fix import quickfixes availability
 #SCL-19639 fixed

---
 .../autoImport/quickFix/ScalaImportElementFix.scala    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/autoImport/quickFix/ScalaImportElementFix.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/autoImport/quickFix/ScalaImportElementFix.scala
index 63bc630cb7d..0912394d1f6 100644
--- a/scala/scala-impl/src/org/jetbrains/plugins/scala/autoImport/quickFix/ScalaImportElementFix.scala
+++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/autoImport/quickFix/ScalaImportElementFix.scala
@@ -5,11 +5,12 @@ import com.intellij.codeInsight.hint.HintManagerImpl
 import com.intellij.codeInsight.intention.PriorityAction
 import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo
 import com.intellij.codeInspection.HintAction
+import com.intellij.codeWithMe.ClientId
 import com.intellij.idea.AppMode
 import com.intellij.model.SideEffectGuard.SideEffectNotAllowedException
 import com.intellij.openapi.application.{ApplicationManager, ReadAction}
 import com.intellij.openapi.components.Service
-import com.intellij.openapi.editor.{Editor, LogicalPosition}
+import com.intellij.openapi.editor.{ClientEditorManager, Editor, LogicalPosition}
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.{ModificationTracker, TextRange}
 import com.intellij.psi.{PsiElement, PsiFile}
@@ -229,8 +230,11 @@ private object ScalaImportElementFix {
       place.getTextRange.grown(1).contains(editor.getCaretModel.getOffset)
 
     def visibleRange: TextRange = {
-      // There is no meaningful visible range for RemoteDev backend
-      if (AppMode.isRemoteDevHost) {
+      // 1. There is no meaningful visible range for RemoteDev backend
+      // 2. For non-local editor its visible area is unreliable
+      //    (see IJPL-163871 Intentions sometimes don't appear in Remote Dev and Code With Me)
+      //    (see SCL-19639 Code With Me: Auto-import quick-fix is offered only after some code editing on host)
+      if (AppMode.isRemoteDevHost || !ClientId.isLocal(ClientEditorManager.getClientId(editor))) {
         return TextRange.create(0, editor.getDocument.getTextLength)
       }