[kotlin debugger] IDEA-361168 Fix smart step into constructor with value class params

zuevmaxim · intellij-monorepo-bot · commit f95f3dd43858 · 2024-10-24T15:18:57.000Z
GitOrigin-RevId: 5196ca3224053a436403bee997801d51600b6662
diff --git a/plugins/kotlin/jvm-debugger/base/util/src/org/jetbrains/kotlin/idea/debugger/base/util/KotlinDebuggerConstants.kt b/plugins/kotlin/jvm-debugger/base/util/src/org/jetbrains/kotlin/idea/debugger/base/util/KotlinDebuggerConstants.kt
@@ -31,4 +31,5 @@ object KotlinDebuggerConstants {
     const val INLINE_SCOPE_NUMBER_SEPARATOR = '\\'
 
     val INLINE_ONLY_ANNOTATION_FQ_NAME = FqName("kotlin.internal.InlineOnly")
+    val DEFAULT_CONSTRUCTOR_MARKER_FQ_NAME = FqName("kotlin.jvm.internal.DefaultConstructorMarker")
 }
diff --git a/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/core/stepping/KotlinSteppingCommandProvider.kt b/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/core/stepping/KotlinSteppingCommandProvider.kt
@@ -241,7 +241,7 @@ fun Method.isSyntheticMethodForDefaultParameters(): Boolean {
     if (size < 3) return false
     // We should check not only the marker parameter, as it is present also
     // for object constructor and sealed class constructor
-    return arguments[size - 2] == "int" && arguments[size - 1] == "kotlin.jvm.internal.DefaultConstructorMarker"
+    return arguments[size - 2] == "int" && arguments[size - 1] == KotlinDebuggerConstants.DEFAULT_CONSTRUCTOR_MARKER_FQ_NAME.asString()
 }
 
 private fun isInlineFunctionFromLibrary(positionManager: PositionManager, location: Location, token: LocationToken): Boolean {
diff --git a/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/stepping/smartStepInto/KotlinSmartStepTargetFilterer.kt b/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/stepping/smartStepInto/KotlinSmartStepTargetFilterer.kt
@@ -2,6 +2,7 @@
 package org.jetbrains.kotlin.idea.debugger.stepping.smartStepInto
 
 import com.intellij.debugger.engine.DebugProcessImpl
+import com.intellij.debugger.engine.JVMNameUtil
 import com.intellij.debugger.impl.DebuggerUtilsEx
 import com.intellij.openapi.application.readAction
 import com.intellij.openapi.application.runReadAction
@@ -19,6 +20,7 @@ import org.jetbrains.kotlin.analysis.api.types.KaClassType
 import org.jetbrains.kotlin.analysis.api.types.KaType
 import org.jetbrains.kotlin.analysis.api.types.KaTypeParameterType
 import org.jetbrains.kotlin.asJava.LightClassUtil
+import org.jetbrains.kotlin.fileClasses.internalNameWithoutInnerClasses
 import org.jetbrains.kotlin.idea.debugger.base.util.KotlinDebuggerConstants
 import org.jetbrains.kotlin.idea.debugger.base.util.fqnToInternalName
 import org.jetbrains.kotlin.idea.debugger.base.util.internalNameToFqn
@@ -80,6 +82,7 @@ class KotlinSmartStepTargetFilterer(
             .handleMangling(methodInfo)
             .handleValueClassMethods(methodInfo)
             .handleDefaultArgs()
+            .handleDefaultConstructorMarker()
             .handleDefaultInterfaces()
             .handleAccessMethods()
             .handleInvokeSuspend(methodInfo)
@@ -123,7 +126,7 @@ class KotlinSmartStepTargetFilterer(
 
     context(KaSession)
     private fun primaryConstructorMatches(declaration: KtClass, owner: String, name: String, signature: String): Boolean {
-        if (name != "<init>" || signature != "()V") return false
+        if (name != JVMNameUtil.CONSTRUCTOR_NAME || signature != "()V") return false
         val symbol = declaration.symbol as? KaClassSymbol ?: return false
         val internalClassName = symbol.getJvmInternalName()
         return owner == internalClassName
@@ -187,6 +190,16 @@ private fun BytecodeSignature.handleDefaultArgs(): BytecodeSignature {
     )
 }
 
+private fun BytecodeSignature.handleDefaultConstructorMarker(): BytecodeSignature {
+    if (name != JVMNameUtil.CONSTRUCTOR_NAME) return this
+    val type = Type.getType(signature)
+    val defaultMarkerDescriptor = KotlinDebuggerConstants.DEFAULT_CONSTRUCTOR_MARKER_FQ_NAME
+        .internalNameWithoutInnerClasses
+        .internalNameToReferenceTypeName()
+    if (type.argumentTypes.lastOrNull()?.descriptor != defaultMarkerDescriptor) return this
+    return copy(signature = buildSignature(signature, dropCount = 1, fromStart = false))
+}
+
 private fun BytecodeSignature.handleDefaultInterfaces(): BytecodeSignature {
     if (!owner.endsWith(JvmAbi.DEFAULT_IMPLS_SUFFIX)) return this
     return copy(
diff --git a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK1CodeKotlinSteppingTestGenerated.java b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK1CodeKotlinSteppingTestGenerated.java
@@ -1698,6 +1698,11 @@ public void testSmartStepIntoConstructor() throws Exception {
             runTest("../testData/stepping/custom/smartStepIntoConstructor.kt");
         }
 
+        @TestMetadata("smartStepIntoConstructorWithValueClassParam.kt")
+        public void testSmartStepIntoConstructorWithValueClassParam() throws Exception {
+            runTest("../testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.kt");
+        }
+
         @TestMetadata("smartStepIntoDeferredLambdas.kt")
         public void testSmartStepIntoDeferredLambdas() throws Exception {
             runTest("../testData/stepping/custom/smartStepIntoDeferredLambdas.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK2CodeKotlinSteppingTestGenerated.java b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK2CodeKotlinSteppingTestGenerated.java
@@ -1698,6 +1698,11 @@ public void testSmartStepIntoConstructor() throws Exception {
             runTest("../testData/stepping/custom/smartStepIntoConstructor.kt");
         }
 
+        @TestMetadata("smartStepIntoConstructorWithValueClassParam.kt")
+        public void testSmartStepIntoConstructorWithValueClassParam() throws Exception {
+            runTest("../testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.kt");
+        }
+
         @TestMetadata("smartStepIntoDeferredLambdas.kt")
         public void testSmartStepIntoDeferredLambdas() throws Exception {
             runTest("../testData/stepping/custom/smartStepIntoDeferredLambdas.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IndyLambdaKotlinSteppingTestGenerated.java b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IndyLambdaKotlinSteppingTestGenerated.java
@@ -1698,6 +1698,11 @@ public void testSmartStepIntoConstructor() throws Exception {
             runTest("../testData/stepping/custom/smartStepIntoConstructor.kt");
         }
 
+        @TestMetadata("smartStepIntoConstructorWithValueClassParam.kt")
+        public void testSmartStepIntoConstructorWithValueClassParam() throws Exception {
+            runTest("../testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.kt");
+        }
+
         @TestMetadata("smartStepIntoDeferredLambdas.kt")
         public void testSmartStepIntoDeferredLambdas() throws Exception {
             runTest("../testData/stepping/custom/smartStepIntoDeferredLambdas.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IndyLambdaIrKotlinSteppingTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IndyLambdaIrKotlinSteppingTestGenerated.java
@@ -1698,6 +1698,11 @@ public void testSmartStepIntoConstructor() throws Exception {
             runTest("testData/stepping/custom/smartStepIntoConstructor.kt");
         }
 
+        @TestMetadata("smartStepIntoConstructorWithValueClassParam.kt")
+        public void testSmartStepIntoConstructorWithValueClassParam() throws Exception {
+            runTest("testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.kt");
+        }
+
         @TestMetadata("smartStepIntoDeferredLambdas.kt")
         public void testSmartStepIntoDeferredLambdas() throws Exception {
             runTest("testData/stepping/custom/smartStepIntoDeferredLambdas.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java
@@ -1698,6 +1698,11 @@ public void testSmartStepIntoConstructor() throws Exception {
             runTest("testData/stepping/custom/smartStepIntoConstructor.kt");
         }
 
+        @TestMetadata("smartStepIntoConstructorWithValueClassParam.kt")
+        public void testSmartStepIntoConstructorWithValueClassParam() throws Exception {
+            runTest("testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.kt");
+        }
+
         @TestMetadata("smartStepIntoDeferredLambdas.kt")
         public void testSmartStepIntoDeferredLambdas() throws Exception {
             runTest("testData/stepping/custom/smartStepIntoDeferredLambdas.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/K1IdeK2CodeKotlinSteppingTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/K1IdeK2CodeKotlinSteppingTestGenerated.java
@@ -1698,6 +1698,11 @@ public void testSmartStepIntoConstructor() throws Exception {
             runTest("testData/stepping/custom/smartStepIntoConstructor.kt");
         }
 
+        @TestMetadata("smartStepIntoConstructorWithValueClassParam.kt")
+        public void testSmartStepIntoConstructorWithValueClassParam() throws Exception {
+            runTest("testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.kt");
+        }
+
         @TestMetadata("smartStepIntoDeferredLambdas.kt")
         public void testSmartStepIntoDeferredLambdas() throws Exception {
             runTest("testData/stepping/custom/smartStepIntoDeferredLambdas.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.kt b/plugins/kotlin/jvm-debugger/test/testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.kt
@@ -0,0 +1,16 @@
+package smartStepIntoConstructorWithValueClassParam
+
+class Clazz(var name: String, var age: UInt) {
+    fun foo() = name
+}
+
+fun testValueClass() {
+    // SMART_STEP_INTO_BY_INDEX: 2
+    // RESUME: 1
+    //Breakpoint!
+    Clazz("hello", 42u).foo()
+}
+
+fun main() {
+    testValueClass()
+}
diff --git a/plugins/kotlin/jvm-debugger/test/testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.out b/plugins/kotlin/jvm-debugger/test/testData/stepping/custom/smartStepIntoConstructorWithValueClassParam.out
@@ -0,0 +1,8 @@
+LineBreakpoint created at smartStepIntoConstructorWithValueClassParam.kt:11
+Run Java
+Connected to the target VM
+smartStepIntoConstructorWithValueClassParam.kt:11
+smartStepIntoConstructorWithValueClassParam.kt:4
+Disconnected from the target VM
+
+Process finished with exit code 0

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,5 @@ object KotlinDebuggerConstants {`
`31`	`31`	`const val INLINE_SCOPE_NUMBER_SEPARATOR = '\\'`
`32`	`32`
`33`	`33`	`val INLINE_ONLY_ANNOTATION_FQ_NAME = FqName("kotlin.internal.InlineOnly")`
	`34`	`+ val DEFAULT_CONSTRUCTOR_MARKER_FQ_NAME = FqName("kotlin.jvm.internal.DefaultConstructorMarker")`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ fun Method.isSyntheticMethodForDefaultParameters(): Boolean {`
`241`	`241`	`if (size < 3) return false`
`242`	`242`	`// We should check not only the marker parameter, as it is present also`
`243`	`243`	`// for object constructor and sealed class constructor`
`244`		`- return arguments[size - 2] == "int" && arguments[size - 1] == "kotlin.jvm.internal.DefaultConstructorMarker"`
	`244`	`+ return arguments[size - 2] == "int" && arguments[size - 1] == KotlinDebuggerConstants.DEFAULT_CONSTRUCTOR_MARKER_FQ_NAME.asString()`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`private fun isInlineFunctionFromLibrary(positionManager: PositionManager, location: Location, token: LocationToken): Boolean {`