Evaluate expression: add debug expression inside block for function literals
EA-56887 Fixed
This commit is contained in:
@@ -210,7 +210,7 @@ public class CodeInsightUtils {
|
|||||||
public static PsiElement getTopmostElementAtOffset(@NotNull PsiElement element, int offset) {
|
public static PsiElement getTopmostElementAtOffset(@NotNull PsiElement element, int offset) {
|
||||||
do {
|
do {
|
||||||
PsiElement parent = element.getParent();
|
PsiElement parent = element.getParent();
|
||||||
if (parent == null || (parent.getTextOffset() < offset)) {
|
if (parent == null || (parent.getTextOffset() < offset) || parent instanceof JetBlockExpression) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
element = parent;
|
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
|
||||||
+5
@@ -96,6 +96,11 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
|
|||||||
doTest("idea/testData/debugger/tinyApp/src/evaluate/imports.kt");
|
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")
|
@TestMetadata("multilineExpressionAtBreakpoint.kt")
|
||||||
public void testMultilineExpressionAtBreakpoint() throws Exception {
|
public void testMultilineExpressionAtBreakpoint() throws Exception {
|
||||||
doTest("idea/testData/debugger/tinyApp/src/evaluate/multilineExpressionAtBreakpoint.kt");
|
doTest("idea/testData/debugger/tinyApp/src/evaluate/multilineExpressionAtBreakpoint.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user