Write lineNumbers for constructors

2015-11-27 12:43:45 +03:00
parent 3ec383dfca
commit d0355a793b
24 changed files with 266 additions and 30 deletions
@@ -2,6 +2,11 @@ LineBreakpoint created at constructors.kt:9
 LineBreakpoint created at constructors.kt:13
 LineBreakpoint created at constructors.kt:20
 LineBreakpoint created at constructors.kt:28
+LineBreakpoint created at constructors.kt:48
+LineBreakpoint created at constructors.kt:53
+LineBreakpoint created at constructors.kt:58
+LineBreakpoint created at constructors.kt:64
+LineBreakpoint created at constructors.kt:70
 !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! constructors.ConstructorsKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 constructors.kt:9
@@ -12,6 +17,16 @@ constructors.kt:20
 Compile bytecode for p1 + p2
 constructors.kt:28
 Compile bytecode for i1
+constructors.kt:48
+Compile bytecode for 1 + 1
+constructors.kt:53
+Compile bytecode for 1 + 2
+constructors.kt:58
+Compile bytecode for a
+constructors.kt:64
+Compile bytecode for 1 + 3
+constructors.kt:70
+Compile bytecode for i
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -2,6 +2,7 @@ LineBreakpoint created at doNotSkipConstructors.kt:5
 !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! doNotSkipConstructors.DoNotSkipConstructorsKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 doNotSkipConstructors.kt:5
+doNotSkipConstructors.kt:9
 doNotSkipConstructors.kt:11
 doNotSkipConstructors.kt:5
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
@@ -22,8 +22,8 @@ fwBackingField.kt:24
 fwBackingField.kt:25
 fwBackingField.kt:26
 fwBackingField.kt:61
-fwBackingField.kt:0
-fwBackingField.kt:0
+fwBackingField.kt:29
+fwBackingField.kt:29
 fwBackingField.kt:61
 fwBackingField.kt:36
 fwBackingField.kt:37
@@ -0,0 +1,38 @@
+LineBreakpoint created at smartStepIntoConstructor.kt:7
+LineBreakpoint created at smartStepIntoConstructor.kt:11
+LineBreakpoint created at smartStepIntoConstructor.kt:15
+LineBreakpoint created at smartStepIntoConstructor.kt:19
+LineBreakpoint created at smartStepIntoConstructor.kt:23
+LineBreakpoint created at smartStepIntoConstructor.kt:27
+LineBreakpoint created at smartStepIntoConstructor.kt:31
+LineBreakpoint created at smartStepIntoConstructor.kt:35
+LineBreakpoint created at smartStepIntoConstructor.kt:39
+LineBreakpoint created at smartStepIntoConstructor.kt:43
+LineBreakpoint created at smartStepIntoConstructor.kt:47
+!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! smartStepIntoConstructor.SmartStepIntoConstructorKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+smartStepIntoConstructor.kt:7
+smartStepIntoConstructor.kt:51
+smartStepIntoConstructor.kt:11
+smartStepIntoConstructor.kt:52
+smartStepIntoConstructor.kt:15
+smartStepIntoConstructor.kt:54
+smartStepIntoConstructor.kt:19
+smartStepIntoConstructor.kt:57
+smartStepIntoConstructor.kt:23
+smartStepIntoConstructor.kt:61
+smartStepIntoConstructor.kt:27
+smartStepIntoConstructor.kt:66
+smartStepIntoConstructor.kt:31
+smartStepIntoConstructor.kt:69
+smartStepIntoConstructor.kt:35
+smartStepIntoConstructor.kt:74
+smartStepIntoConstructor.kt:39
+smartStepIntoConstructor.kt:81
+smartStepIntoConstructor.kt:43
+smartStepIntoConstructor.kt:89
+smartStepIntoConstructor.kt:47
+smartStepIntoConstructor.kt:97
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
@@ -34,4 +34,38 @@ fun main(args: Array<String>) {
    Derived2(1, 1)

    Derived1(1)
-}
+
+    A()
+    B()
+    C(1)
+    D()
+    E(1)
+}
+
+// EXPRESSION: 1 + 1
+// RESULT: 2: I
+//Breakpoint!
+class A
+
+// EXPRESSION: 1 + 2
+// RESULT: 3: I
+//Breakpoint!
+class B()
+
+// EXPRESSION: a
+// RESULT: 0: I
+//Breakpoint!
+class C(val a: Int)
+
+class D {
+    // EXPRESSION: 1 + 3
+    // RESULT: 4: I
+    //Breakpoint!
+    constructor()
+}
+class E {
+    // EXPRESSION: i
+    // RESULT: 1: I
+    //Breakpoint!
+    constructor(i: Int)
+}
@@ -0,0 +1,103 @@
+package smartStepIntoConstructor
+
+fun main(args: Array<String>) {
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    B()
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    C(1)
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    D()
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    E(1)
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    F()
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    G(1)
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    J()
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    K(1)
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    L()
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    M()
+    // SMART_STEP_INTO_BY_INDEX: 1
+    // RESUME: 1
+    //Breakpoint!
+    N(1)
+
+}
+
+class B()
+class C(val a: Int)
+class D {
+    constructor()
+}
+class E {
+    constructor(i: Int)
+}
+class F {
+    constructor() {
+        val a = 1
+    }
+}
+class G {
+    constructor(i: Int) {
+        val a = 1
+    }
+}
+class J {
+    init {
+        val a = 1
+    }
+}
+class K(val i: Int) {
+    init {
+        val a = 1
+    }
+}
+class L {
+    constructor() {
+        val a = 1
+    }
+
+    init {
+        val a = 1
+    }
+}
+class M {
+    constructor(): this(1) {
+        val a = 1
+    }
+
+    constructor(i: Int) {
+    }
+}
+class N {
+    constructor(i: Int): this() {
+        val a = 1
+    }
+
+    constructor() {
+    }
+}
@@ -13,4 +13,4 @@ class A {
 }

 // SKIP_CONSTRUCTORS: false
-// STEP_INTO: 2
+// STEP_INTO: 3
@@ -7,3 +7,5 @@ fun main(args: Array<String>) {
 }

 class A
+
+// SKIP_CONSTRUCTORS: true
@@ -45,4 +45,5 @@ class A {
 }

 // STEP_INTO: 26
-// SKIP_SYNTHETIC_METHODS: false
+// SKIP_SYNTHETIC_METHODS: false
+// SKIP_CONSTRUCTORS: true
@@ -45,4 +45,5 @@ class A {
 }

 // STEP_INTO: 26
-// SKIP_SYNTHETIC_METHODS: true
+// SKIP_SYNTHETIC_METHODS: true
+// SKIP_CONSTRUCTORS: true
@@ -47,4 +47,5 @@ class MyInterfaceImpl: MyInterface {
        get() = 1
 }

-// STEP_INTO: 38
+// STEP_INTO: 38
+// SKIP_CONSTRUCTORS: true
@@ -7,8 +7,8 @@ class A {
 }

 fun main(args: Array<String>) {
-    A()
+    val a = A()

    //Breakpoint!
-    A().bar()
+    a.bar()
 }
@@ -9,8 +9,8 @@ class A {
 }

 fun main(args: Array<String>) {
-    A()
+    val a = A()

    //Breakpoint!
-    A().bar
+    a.bar
 }