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 @@
-
+
\ 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
JetBrains
-
+
com.intellij.modules.java
org.jetbrains.idea.maven
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)
}