Evaluate expression: add debug expression inside block for function literals

EA-56887 Fixed
This commit is contained in:
Natalia Ukhorskaya
2014-05-26 17:25:12 +04:00
parent 545b8ac7c3
commit 0c2120b578
4 changed files with 24 additions and 1 deletions
@@ -210,7 +210,7 @@ public class CodeInsightUtils {
public static PsiElement getTopmostElementAtOffset(@NotNull PsiElement element, int offset) {
do {
PsiElement parent = element.getParent();
if (parent == null || (parent.getTextOffset() < offset)) {
if (parent == null || (parent.getTextOffset() < offset) || parent instanceof JetBlockExpression) {
break;
}
element = parent;
@@ -0,0 +1,7 @@
LineBreakpoint created at insertInBlock.kt:6
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! insertInBlock.InsertInBlockPackage
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
insertInBlock.kt:5
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -0,0 +1,11 @@
package insertInBlock
fun main(args: Array<String>) {
val lambda = {
//Breakpoint!
val a = 1
}()
}
// EXPRESSION: 1 + 1
// RESULT: 2: I
@@ -96,6 +96,11 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
doTest("idea/testData/debugger/tinyApp/src/evaluate/imports.kt");
}
@TestMetadata("insertInBlock.kt")
public void testInsertInBlock() throws Exception {
doTest("idea/testData/debugger/tinyApp/src/evaluate/insertInBlock.kt");
}
@TestMetadata("multilineExpressionAtBreakpoint.kt")
public void testMultilineExpressionAtBreakpoint() throws Exception {
doTest("idea/testData/debugger/tinyApp/src/evaluate/multilineExpressionAtBreakpoint.kt");