From de60e6d5b74321a11e395fd23f4ca4d79964469a Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 1 Apr 2016 18:44:58 +0300 Subject: [PATCH] Minor: count lambdaOrdinal in tests from 1 instead of 0 --- .../tinyApp/outs/importsLambdaContext.out | 2 +- .../tinyApp/outs/isInsideInlineLambda.out | 20 +++++++++---------- .../outs/multipleBreakpointsAtLine.out | 10 +++++----- .../tinyApp/outs/nestedInlineArguments.out | 2 +- .../outs/smartStepIntoInsideLambda.out | 2 +- .../stepOutInlinedLambdaArgumentOneLine.out | 2 +- .../outs/twoLambdasOnOneLineSecond.out | 2 +- .../isInsideInlineLambda.kt | 20 +++++++++---------- .../multipleBreakpointsAtLine.kt | 10 +++++----- .../singleBreakpoint/importsLambdaContext.kt | 2 +- .../lambdas/twoLambdasOnOneLineSecond.kt | 2 +- .../singleBreakpoint/nestedInlineArguments.kt | 2 +- .../custom/smartStepIntoInsideLambda.kt | 2 +- .../stepOutInlinedLambdaArgumentOneLine.kt | 2 +- .../idea/debugger/KotlinDebuggerTestBase.kt | 7 ++++++- 15 files changed, 46 insertions(+), 41 deletions(-) diff --git a/idea/testData/debugger/tinyApp/outs/importsLambdaContext.out b/idea/testData/debugger/tinyApp/outs/importsLambdaContext.out index ba76b60824c..974b55bfbc5 100644 --- a/idea/testData/debugger/tinyApp/outs/importsLambdaContext.out +++ b/idea/testData/debugger/tinyApp/outs/importsLambdaContext.out @@ -1,4 +1,4 @@ -LineBreakpoint created at importsLambdaContext.kt:10 lambdaOrdinal = 0 +LineBreakpoint created at importsLambdaContext.kt:10 lambdaOrdinal = 1 !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! importsLambdaContext.ImportsLambdaContextKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' importsLambdaContext.kt:10 diff --git a/idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out b/idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out index f51666eac2d..ccc40ad56fb 100644 --- a/idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out +++ b/idea/testData/debugger/tinyApp/outs/isInsideInlineLambda.out @@ -1,13 +1,13 @@ -LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:6 lambdaOrdinal = 0 -LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:11 lambdaOrdinal = 0 -LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:17 lambdaOrdinal = 0 -LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:23 lambdaOrdinal = 0 -LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:31 lambdaOrdinal = 0 -LineBreakpoint created at isInsideInlineLambda.kt:9 lambdaOrdinal = 0 -LineBreakpoint created at isInsideInlineLambda.kt:17 lambdaOrdinal = 0 -LineBreakpoint created at isInsideInlineLambda.kt:25 lambdaOrdinal = 0 -LineBreakpoint created at isInsideInlineLambda.kt:33 lambdaOrdinal = 0 -LineBreakpoint created at isInsideInlineLambda.kt:43 lambdaOrdinal = 0 +LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:6 lambdaOrdinal = 1 +LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:11 lambdaOrdinal = 1 +LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:17 lambdaOrdinal = 1 +LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:23 lambdaOrdinal = 1 +LineBreakpoint created at isInsideInlineLambdaInLibrary.kt:31 lambdaOrdinal = 1 +LineBreakpoint created at isInsideInlineLambda.kt:9 lambdaOrdinal = 1 +LineBreakpoint created at isInsideInlineLambda.kt:17 lambdaOrdinal = 1 +LineBreakpoint created at isInsideInlineLambda.kt:25 lambdaOrdinal = 1 +LineBreakpoint created at isInsideInlineLambda.kt:33 lambdaOrdinal = 1 +LineBreakpoint created at isInsideInlineLambda.kt:43 lambdaOrdinal = 1 !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! isInsideInlineLambda.IsInsideInlineLambdaKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' isInsideInlineLambda.kt:9 diff --git a/idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out b/idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out index ae7edd16ee4..acd6d840642 100644 --- a/idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out +++ b/idea/testData/debugger/tinyApp/outs/multipleBreakpointsAtLine.out @@ -1,12 +1,12 @@ LineBreakpoint created at multipleBreakpointsAtLine.kt:9 lambdaOrdinal = -1 -LineBreakpoint created at multipleBreakpointsAtLine.kt:14 lambdaOrdinal = 0 -LineBreakpoint created at multipleBreakpointsAtLine.kt:19 lambdaOrdinal = 1 +LineBreakpoint created at multipleBreakpointsAtLine.kt:14 lambdaOrdinal = 1 +LineBreakpoint created at multipleBreakpointsAtLine.kt:19 lambdaOrdinal = 2 LineBreakpoint created at multipleBreakpointsAtLine.kt:30 LineBreakpoint created at multipleBreakpointsAtLine.kt:38 lambdaOrdinal = -1 -LineBreakpoint created at multipleBreakpointsAtLine.kt:43 lambdaOrdinal = 0 -LineBreakpoint created at multipleBreakpointsAtLine.kt:48 lambdaOrdinal = 1 +LineBreakpoint created at multipleBreakpointsAtLine.kt:43 lambdaOrdinal = 1 +LineBreakpoint created at multipleBreakpointsAtLine.kt:48 lambdaOrdinal = 2 LineBreakpoint created at multipleBreakpointsAtLine.kt:62 -LineBreakpoint created at multipleBreakpointsAtLine.kt:67 lambdaOrdinal = 1 +LineBreakpoint created at multipleBreakpointsAtLine.kt:67 lambdaOrdinal = 2 !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! multipleBreakpointsAtLine.MultipleBreakpointsAtLineKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' multipleBreakpointsAtLine.kt:9 diff --git a/idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out b/idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out index 812912376fb..d398cdf3998 100644 --- a/idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out +++ b/idea/testData/debugger/tinyApp/outs/nestedInlineArguments.out @@ -1,4 +1,4 @@ -LineBreakpoint created at nestedInlineArguments.kt:13 lambdaOrdinal = 0 +LineBreakpoint created at nestedInlineArguments.kt:13 lambdaOrdinal = 1 !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! nestedInlineArguments.NestedInlineArgumentsKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' nestedInlineArguments.kt:13 diff --git a/idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out b/idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out index 9390ecfe235..6d793b06488 100644 --- a/idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out +++ b/idea/testData/debugger/tinyApp/outs/smartStepIntoInsideLambda.out @@ -1,4 +1,4 @@ -LineBreakpoint created at smartStepIntoInsideLambda.kt:6 lambdaOrdinal = 0 +LineBreakpoint created at smartStepIntoInsideLambda.kt:6 lambdaOrdinal = 1 !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! smartStepIntoInsideLambda.SmartStepIntoInsideLambdaKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' smartStepIntoInsideLambda.kt:6 diff --git a/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out b/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out index 3a889e53cac..687cf90e450 100644 --- a/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out +++ b/idea/testData/debugger/tinyApp/outs/stepOutInlinedLambdaArgumentOneLine.out @@ -1,4 +1,4 @@ -LineBreakpoint created at stepOutInlinedLambdaArgumentOneLine.kt:5 lambdaOrdinal = 0 +LineBreakpoint created at stepOutInlinedLambdaArgumentOneLine.kt:5 lambdaOrdinal = 1 !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! stepOutInlinedLambdaArgumentOneLine.StepOutInlinedLambdaArgumentOneLineKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' stepOutInlinedLambdaArgumentOneLine.kt:5 diff --git a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out index cad656fdce8..a26cf8c42d5 100644 --- a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out +++ b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out @@ -1,4 +1,4 @@ -LineBreakpoint created at twoLambdasOnOneLineSecond.kt:8 lambdaOrdinal = 1 +LineBreakpoint created at twoLambdasOnOneLineSecond.kt:8 lambdaOrdinal = 2 !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! twoLambdasOnOneLineSecond.TwoLambdasOnOneLineSecondKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' twoLambdasOnOneLineSecond.kt:8 diff --git a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.kt b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.kt index 4f41bd0de0d..c7a47edfa41 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.kt @@ -5,7 +5,7 @@ fun main(args: Array) { // EXPRESSION: it + 1 // RESULT: 2: I - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) a.foo(1) { 1 } @@ -13,7 +13,7 @@ fun main(args: Array) { a.foo(1) { // EXPRESSION: it + 2 // RESULT: 3: I - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) a.foo(1) { 1 } 1 } @@ -21,7 +21,7 @@ fun main(args: Array) { // inside variable declaration // EXPRESSION: it + 3 // RESULT: 4: I - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) val x = a.foo(1) { 1 } // inside object declaration @@ -29,7 +29,7 @@ fun main(args: Array) { fun foo() { // EXPRESSION: it + 4 // RESULT: 5: I - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) a.foo(1) { 1 } } } @@ -39,7 +39,7 @@ fun main(args: Array) { fun local() { // EXPRESSION: it + 5 // RESULT: 6: I - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) a.foo(1) { 1 } } local() @@ -54,22 +54,22 @@ class A { } } -// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint1:(0) +// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint1:(1) // EXPRESSION: it + 11 // RESULT: 12: I -// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint2:(0) +// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint2:(1) // EXPRESSION: it + 12 // RESULT: 14: I -// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint3:(0) +// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint3:(1) // EXPRESSION: it + 13 // RESULT: 16: I -// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint4:(0) +// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint4:(1) // EXPRESSION: it + 14 // RESULT: 18: I -// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint5:(0) +// ADDITIONAL_BREAKPOINT: isInsideInlineLambdaInLibrary.kt:Breakpoint5:(1) // EXPRESSION: it + 15 // RESULT: 20: I diff --git a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.kt b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.kt index fe1e2ba15e3..3211ba915d4 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.kt @@ -10,12 +10,12 @@ fun main(args: Array) { // EXPRESSION: it + 2 // RESULT: 3: I - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) a.foo(1) { 1 }.foo(2) { 1 } // EXPRESSION: it + 3 // RESULT: 5: I - //Breakpoint! (lambdaOrdinal = 1) + //Breakpoint! (lambdaOrdinal = 2) a.foo(1) { 1 }.foo(2) { 1 } // EXPRESSION: it + 4 @@ -39,12 +39,12 @@ fun main(args: Array) { // EXPRESSION: it + 9 // RESULT: 10: I - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) a.bar(1) { 1 }.bar(2) { 1 } // EXPRESSION: it + 10 // RESULT: 12: I - //Breakpoint! (lambdaOrdinal = 1) + //Breakpoint! (lambdaOrdinal = 2) a.bar(1) { 1 }.bar(2) { 1 } // EXPRESSION: it + 11 @@ -63,7 +63,7 @@ fun main(args: Array) { // EXPRESSION: it + 15 // RESULT: 17: I - //Breakpoint! (lambdaOrdinal = 1) + //Breakpoint! (lambdaOrdinal = 2) a.bar(1) { 1 }.bar(2) { 1 + 1 1 + 1 } diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.kt index 77b4fc4984f..7c932d1c480 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.kt @@ -6,7 +6,7 @@ import java.util.HashSet import java.util.HashMap as JHashMap fun main(args: Array) { - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) arrayOf(1).map { args.size } } diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineSecond.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineSecond.kt index 9f561bb90a8..beaab0a74e3 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineSecond.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineSecond.kt @@ -4,7 +4,7 @@ fun main(args: Array) { val a = A() // EXPRESSION: it // RESULT: 2: I - //Breakpoint! (lambdaOrdinal = 1) + //Breakpoint! (lambdaOrdinal = 2) a.foo(1) { a }.foo(2) { a } } diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/nestedInlineArguments.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/nestedInlineArguments.kt index a3254d04c4f..b61a1076613 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/nestedInlineArguments.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/nestedInlineArguments.kt @@ -9,7 +9,7 @@ fun main(args: Array) { inline fun List.foo(key: Int): T? { // EXPRESSION: it.i // RESULT: 1: I - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) return this.firstOrNull { it.i == key } } diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInsideLambda.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInsideLambda.kt index 3bb6a2276d7..e4d882bb1e8 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInsideLambda.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInsideLambda.kt @@ -2,7 +2,7 @@ package smartStepIntoInsideLambda fun main(args: Array) { // SMART_STEP_INTO_BY_INDEX: 1 - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) foo { bar() } } diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgumentOneLine.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgumentOneLine.kt index 21d7b7ff4a0..e007336288a 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgumentOneLine.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgumentOneLine.kt @@ -1,7 +1,7 @@ package stepOutInlinedLambdaArgumentOneLine fun main(args: Array) { - //Breakpoint! (lambdaOrdinal = 0) + //Breakpoint! (lambdaOrdinal = 1) dive(3) { x -> x + 4 } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt index a49845039f8..68945a10eda 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt @@ -342,7 +342,12 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() { val properties = javaBreakpoint.xBreakpoint.properties as? JavaLineBreakpointProperties ?: return var suffix = "" if (lambdaOrdinal != null) { - properties.lambdaOrdinal = lambdaOrdinal + if (lambdaOrdinal != -1) { + properties.lambdaOrdinal = lambdaOrdinal - 1 + } + else { + properties.lambdaOrdinal = lambdaOrdinal + } suffix += " lambdaOrdinal = $lambdaOrdinal" } if (condition != null) {