jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-02 00:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Count JVM class name for inlined function from base declaration

Browse Source 
Drop code with naive removing all anonymous classes.
Breakpoints now works when inline call is in anonymous call.
This commit is contained in:
Nikolay Krasko
2017-02-24 18:02:16 +03:00
committed by Nikolay Krasko
parent cd92e3fc98
commit dffbe0f707
4 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
View File

@@ -46,6 +46,7 @@ import org.jetbrains.kotlin.idea.search.usagesSearch.isImportUsage
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.parents
@@ -187,7 +188,7 @@ class DebuggerClassNameProvider(val myDebugProcess: DebugProcess, val scopes: Li
private fun inlineCallClassPatterns(typeMapper: KotlinTypeMapper, element: KtElement): List<String> {
val context = typeMapper.bindingContext
val (inlineCall, ktAnonymousClassElementProducer) = runReadAction {
val inlineCall = runReadAction {
element.parents.map {
val ktCallExpression: KtCallExpression = when(it) {
is KtFunctionLiteral -> {
@@ -210,31 +211,26 @@ class DebuggerClassNameProvider(val myDebugProcess: DebugProcess, val scopes: Li
ktCallExpression to (it as KtElement)
}.lastOrNull {
it != null && isInlineCall(context, it.component1())
}
}?.first
} ?: return emptyList()
val lexicalScope = context[BindingContext.LEXICAL_SCOPE, inlineCall] ?: return emptyList()
val baseClassName = classNamesForPosition(inlineCall, false).firstOrNull() ?: return emptyList()
val resolvedCall = runReadAction { inlineCall.getResolvedCall(context) } ?: return emptyList()
val inlineFunctionName = resolvedCall.resultingDescriptor.name
val originalInternalClassName = CodegenBinding.asmTypeForAnonymousClass(
typeMapper.bindingContext, ktAnonymousClassElementProducer).internalName
val ownerDescriptor = lexicalScope.ownerDescriptor
val className = if (isFunctionWithSuspendStateMachine(ownerDescriptor, typeMapper.bindingContext)) {
originalInternalClassName.replaceAfterLast("$", DO_RESUME_METHOD_NAME)
val ownerDescriptorName = if (isFunctionWithSuspendStateMachine(ownerDescriptor, typeMapper.bindingContext)) {
Name.identifier(DO_RESUME_METHOD_NAME)
}
else {
originalInternalClassName.funPrefix()
ownerDescriptor.name
}
val ownerJvmName = if (ownerDescriptorName.isSpecial) InlineCodegenUtil.SPECIAL_TRANSFORMATION_NAME else ownerDescriptorName.asString()
val mangledInternalClassName =
className +
(if (ownerDescriptor.name.isSpecial) "$" + InlineCodegenUtil.SPECIAL_TRANSFORMATION_NAME else "") +
InlineCodegenUtil.INLINE_CALL_TRANSFORMATION_SUFFIX + "$" +
inlineFunctionName
baseClassName + "$" + ownerJvmName + InlineCodegenUtil.INLINE_CALL_TRANSFORMATION_SUFFIX + "$" + inlineFunctionName
return listOf("$mangledInternalClassName*")
}
@@ -254,7 +250,7 @@ class DebuggerClassNameProvider(val myDebugProcess: DebugProcess, val scopes: Li
KtSecondaryConstructor::class.java)
private fun getElementToCalculateClassName(notPositionedElement: PsiElement?): KtElement? {
if (notPositionedElement?.javaClass as Class<*> in TYPES_TO_CALCULATE_CLASSNAME) return notPositionedElement as KtElement
if (notPositionedElement?.let { it::class.java } as Class<*> in TYPES_TO_CALCULATE_CLASSNAME) return notPositionedElement as KtElement
return readAction { PsiTreeUtil.getParentOfType(notPositionedElement, *TYPES_TO_CALCULATE_CLASSNAME) }
}
@@ -411,17 +407,6 @@ private fun isInlineCall(context: BindingContext, expr: KtCallExpression): Boole
private inline fun <reified T : PsiElement> PsiElement.typedParent(): T? = getStrictParentOfType()
private fun String.funPrefix(): String {
if (lastIndexOf("$") < 0) return this
val trimmed = trimEnd { it == '$' || it.isDigit() } // Can accidentally trim end of function name if it ends with a number
val nextDollarIndex = indexOf('$', startIndex = trimmed.length - 1)
if (nextDollarIndex < 0) return this
return this.substring(0, nextDollarIndex)
}
private fun String.substringIndex(): String {
if (lastIndexOf("$") < 0) return this

8
idea/testData/debugger/tinyApp/outs/stopInObjectLiteralInInlineCallWithClosureInAnonymous.out vendored Normal file
View File

@@ -0,0 +1,8 @@
LineBreakpoint created at stopInObjectLiteralInInlineCallWithClosureInAnonymous.kt:11
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInObjectLiteralInInlineCallWithClosureInAnonymous.StopInObjectLiteralInInlineCallWithClosureInAnonymousKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
stopInObjectLiteralInInlineCallWithClosureInAnonymous.kt:11
stopInObjectLiteralInInlineCallWithClosureInAnonymous.kt:12
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0

23
idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInObjectLiteralInInlineCallWithClosureInAnonymous.kt vendored Normal file
View File

@@ -0,0 +1,23 @@
package stopInObjectLiteralInInlineCallWithClosureInAnonymous
fun main(args: Array<String>) {
val a = 12
{
inlineF {
val s = object : () -> Unit {
override fun invoke() {
//Breakpoint!
nop(a)
nop(a)
}
}
s()
}
}()
}
inline fun <R> inlineF(block: () -> R): R = block()
fun nop(a: Any) {}

6
idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java
View File

@@ -824,6 +824,12 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
doStepOverTest(fileName);
}
@TestMetadata("stopInObjectLiteralInInlineCallWithClosureInAnonymous.kt")
public void testStopInObjectLiteralInInlineCallWithClosureInAnonymous() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInObjectLiteralInInlineCallWithClosureInAnonymous.kt");
doStepOverTest(fileName);
}
@TestMetadata("stopInSuspendFunctionWithSuspendPoints.kt")
public void testStopInSuspendFunctionWithSuspendPoints() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInSuspendFunctionWithSuspendPoints.kt");