Debugger: fix evaluation for local classes

#KT-5104 Fixed
This commit is contained in:
Natalia Ukhorskaya
2015-09-24 18:16:25 +03:00
parent 4fb4e0c21f
commit 5c04959871
4 changed files with 36 additions and 1 deletions
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.idea.core.*
import org.jetbrains.kotlin.idea.core.refactoring.isMultiLine
import org.jetbrains.kotlin.idea.intentions.ConvertToExpressionBodyIntention
@@ -44,6 +45,7 @@ import org.jetbrains.kotlin.psi.codeFragmentUtil.debugTypeInfo
import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode
import org.jetbrains.kotlin.psi.psiUtil.*
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny
import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.types.isFlexible
@@ -122,7 +124,8 @@ fun ExtractionGeneratorConfiguration.getDeclarationText(
}
fun JetType.isSpecial(): Boolean {
return this.getConstructor().getDeclarationDescriptor()?.getName()?.isSpecial() ?: false
val classDescriptor = this.constructor.declarationDescriptor as? ClassDescriptor ?: return false
return classDescriptor.name.isSpecial || DescriptorUtils.isLocal(classDescriptor)
}
fun createNameCounterpartMap(from: JetElement, to: JetElement): Map<JetSimpleNameExpression, JetSimpleNameExpression> {
+9
View File
@@ -0,0 +1,9 @@
LineBreakpoint created at localClass.kt:10
!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! localClass.LocalClassPackage
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
localClass.kt:10
Compile bytecode for local
Compile bytecode for local.test()
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -0,0 +1,17 @@
package localClass
fun main(args: Array<String>) {
class LocalClass {
fun test() = 1
}
val local = LocalClass()
//Breakpoint!
val a = 1
}
// EXPRESSION: local
// RESULT: instance of localClass.LocalClassKt$main$LocalClass(id=ID): LlocalClass/LocalClassKt$main$LocalClass;
// EXPRESSION: local.test()
// RESULT: 1: I
@@ -181,6 +181,12 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
doSingleBreakpointTest(fileName);
}
@TestMetadata("localClass.kt")
public void testLocalClass() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localClass.kt");
doSingleBreakpointTest(fileName);
}
@TestMetadata("localVariables.kt")
public void testLocalVariables() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localVariables.kt");