From fe901e95165f99aa3e181c510361f930ecbd92cc Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 13 Oct 2016 00:49:23 +0300 Subject: [PATCH] Use Dex suffix instead of dex prefix for better test sorting (cherry picked from commit 7f3a9c1) --- .../dexSeveralInlineFunctionsInOneFile.out | 23 ---- .../outs/dexStopInInlineInOtherFile.out | 8 -- .../outs/{dexInline.out => inlineDex.out} | 8 +- ...InlineInClass.out => inlineInClassDex.out} | 8 +- ...lineInObject.out => inlineInObjectDex.out} | 8 +- ...File.out => inlineInObjectSameFileDex.out} | 10 +- ...1.out => manyFilesWithInlineCalls1Dex.out} | 6 +- ...2.out => manyFilesWithInlineCalls2Dex.out} | 6 +- ...=> severalInlineCallsFromOtherFileDex.out} | 12 +- .../severalInlineFunctionsInOneFileDex.out | 6 + ...InInlineFun.out => stopInInlineFunDex.out} | 8 +- .../outs/stopInInlineInOtherFileDex.out | 8 ++ .../dexManyFilesWithInlineCalls1.Second.kt | 5 - .../custom/dexManyFilesWithInlineCalls1.kt | 14 -- .../dexManyFilesWithInlineCalls2.First.kt | 5 - .../custom/dexManyFilesWithInlineCalls2.kt | 14 -- ...meFile.kt => inlineInObjectSameFileDex.kt} | 2 +- ... => manyFilesWithInlineCalls1Dex.First.kt} | 2 +- .../manyFilesWithInlineCalls1Dex.Second.kt | 5 + .../custom/manyFilesWithInlineCalls1Dex.kt | 14 ++ .../manyFilesWithInlineCalls2Dex.First.kt | 5 + ...=> manyFilesWithInlineCalls2Dex.Second.kt} | 2 +- .../custom/manyFilesWithInlineCalls2Dex.kt | 14 ++ ...veralInlineCallsFromOtherFileDex.Other.kt} | 2 +- ... => severalInlineCallsFromOtherFileDex.kt} | 4 +- ... => severalInlineFunctionsInOneFileDex.kt} | 2 +- .../stepInto/{dexInline.kt => inlineDex.kt} | 2 +- .../src/stepping/stepOver/dexInlineInClass.kt | 7 - .../stepping/stepOver/dexInlineInObject.kt | 7 - .../stepOver/dexStopInInlineInOtherFile.kt | 7 - ...ass.Other.kt => inlineInClassDex.Other.kt} | 2 +- .../src/stepping/stepOver/inlineInClassDex.kt | 7 + ...ct.Other.kt => inlineInObjectDex.Other.kt} | 2 +- .../stepping/stepOver/inlineInObjectDex.kt | 7 + ...opInInlineFun.kt => stopInInlineFunDex.kt} | 2 +- ...kt => stopInInlineInOtherFileDex.Other.kt} | 2 +- .../stepOver/stopInInlineInOtherFileDex.kt | 7 + .../idea/debugger/KotlinDebuggerTestCase.java | 4 +- .../debugger/KotlinSteppingTestGenerated.java | 120 +++++++++--------- .../idea/debugger/dexLikeBytecodePatch.kt | 4 +- 40 files changed, 183 insertions(+), 198 deletions(-) delete mode 100644 idea/testData/debugger/tinyApp/outs/dexSeveralInlineFunctionsInOneFile.out delete mode 100644 idea/testData/debugger/tinyApp/outs/dexStopInInlineInOtherFile.out rename idea/testData/debugger/tinyApp/outs/{dexInline.out => inlineDex.out} (78%) rename idea/testData/debugger/tinyApp/outs/{dexInlineInClass.out => inlineInClassDex.out} (71%) rename idea/testData/debugger/tinyApp/outs/{dexInlineInObject.out => inlineInObjectDex.out} (70%) rename idea/testData/debugger/tinyApp/outs/{dexInlineInObjectSameFile.out => inlineInObjectSameFileDex.out} (61%) rename idea/testData/debugger/tinyApp/outs/{dexManyFilesWithInlineCalls1.out => manyFilesWithInlineCalls1Dex.out} (69%) rename idea/testData/debugger/tinyApp/outs/{dexManyFilesWithInlineCalls2.out => manyFilesWithInlineCalls2Dex.out} (69%) rename idea/testData/debugger/tinyApp/outs/{dexSeveralInlineCallsFromOtherFile.out => severalInlineCallsFromOtherFileDex.out} (54%) create mode 100644 idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out rename idea/testData/debugger/tinyApp/outs/{dexStopInInlineFun.out => stopInInlineFunDex.out} (71%) create mode 100644 idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out delete mode 100644 idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.Second.kt delete mode 100644 idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.kt delete mode 100644 idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.First.kt delete mode 100644 idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.kt rename idea/testData/debugger/tinyApp/src/stepping/custom/{dexInlineInObjectSameFile.kt => inlineInObjectSameFileDex.kt} (84%) rename idea/testData/debugger/tinyApp/src/stepping/custom/{dexManyFilesWithInlineCalls1.First.kt => manyFilesWithInlineCalls1Dex.First.kt} (58%) create mode 100644 idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.Second.kt create mode 100644 idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.kt create mode 100644 idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.First.kt rename idea/testData/debugger/tinyApp/src/stepping/custom/{dexManyFilesWithInlineCalls2.Second.kt => manyFilesWithInlineCalls2Dex.Second.kt} (58%) create mode 100644 idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.kt rename idea/testData/debugger/tinyApp/src/stepping/custom/{dexSeveralInlineCallsFromOtherFile.Other.kt => severalInlineCallsFromOtherFileDex.Other.kt} (64%) rename idea/testData/debugger/tinyApp/src/stepping/custom/{dexSeveralInlineCallsFromOtherFile.kt => severalInlineCallsFromOtherFileDex.kt} (64%) rename idea/testData/debugger/tinyApp/src/stepping/custom/{dexSeveralInlineFunctionsInOneFile.kt => severalInlineFunctionsInOneFileDex.kt} (96%) rename idea/testData/debugger/tinyApp/src/stepping/stepInto/{dexInline.kt => inlineDex.kt} (86%) delete mode 100644 idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInClass.kt delete mode 100644 idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInObject.kt delete mode 100644 idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineInOtherFile.kt rename idea/testData/debugger/tinyApp/src/stepping/stepOver/{dexInlineInClass.Other.kt => inlineInClassDex.Other.kt} (81%) create mode 100644 idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.kt rename idea/testData/debugger/tinyApp/src/stepping/stepOver/{dexInlineInObject.Other.kt => inlineInObjectDex.Other.kt} (81%) create mode 100644 idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.kt rename idea/testData/debugger/tinyApp/src/stepping/stepOver/{dexStopInInlineFun.kt => stopInInlineFunDex.kt} (82%) rename idea/testData/debugger/tinyApp/src/stepping/stepOver/{dexStopInInlineInOtherFile.Other.kt => stopInInlineInOtherFileDex.Other.kt} (68%) create mode 100644 idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.kt diff --git a/idea/testData/debugger/tinyApp/outs/dexSeveralInlineFunctionsInOneFile.out b/idea/testData/debugger/tinyApp/outs/dexSeveralInlineFunctionsInOneFile.out deleted file mode 100644 index 06d247b7dac..00000000000 --- a/idea/testData/debugger/tinyApp/outs/dexSeveralInlineFunctionsInOneFile.out +++ /dev/null @@ -1,23 +0,0 @@ -LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:5 -LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:23 -LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:29 -LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:34 -LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:41 -LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:46 -LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:53 -LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:60 -LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:66 -!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! dexSeveralInlineFunctionsInOneFile.DexSeveralInlineFunctionsInOneFileKt -Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexSeveralInlineFunctionsInOneFile.kt:5 -dexSeveralInlineFunctionsInOneFile.kt:23 -dexSeveralInlineFunctionsInOneFile.kt:29 -dexSeveralInlineFunctionsInOneFile.kt:41 -dexSeveralInlineFunctionsInOneFile.kt:66 -dexSeveralInlineFunctionsInOneFile.kt:34 -dexSeveralInlineFunctionsInOneFile.kt:46 -dexSeveralInlineFunctionsInOneFile.kt:53 -dexSeveralInlineFunctionsInOneFile.kt:60 -Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' - -Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/dexStopInInlineInOtherFile.out b/idea/testData/debugger/tinyApp/outs/dexStopInInlineInOtherFile.out deleted file mode 100644 index a56a0bb9027..00000000000 --- a/idea/testData/debugger/tinyApp/outs/dexStopInInlineInOtherFile.out +++ /dev/null @@ -1,8 +0,0 @@ -LineBreakpoint created at dexStopInInlineInOtherFile.Other.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 !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexStopInInlineInOtherFile.DexStopInInlineInOtherFileKt -Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexStopInInlineInOtherFile.Other.kt:6 -dexStopInInlineInOtherFile.Other.kt:7 -Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' - -Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/dexInline.out b/idea/testData/debugger/tinyApp/outs/inlineDex.out similarity index 78% rename from idea/testData/debugger/tinyApp/outs/dexInline.out rename to idea/testData/debugger/tinyApp/outs/inlineDex.out index dafecd3dd5f..26a2ac35cf0 100644 --- a/idea/testData/debugger/tinyApp/outs/dexInline.out +++ b/idea/testData/debugger/tinyApp/outs/inlineDex.out @@ -1,8 +1,8 @@ -LineBreakpoint created at dexInline.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! dexInline.DexInlineKt +LineBreakpoint created at inlineDex.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! inlineDex.InlineDexKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexInline.kt:5 -dexInline.kt:9 +inlineDex.kt:5 +inlineDex.kt:9 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/dexInlineInClass.out b/idea/testData/debugger/tinyApp/outs/inlineInClassDex.out similarity index 71% rename from idea/testData/debugger/tinyApp/outs/dexInlineInClass.out rename to idea/testData/debugger/tinyApp/outs/inlineInClassDex.out index ac6ace8655f..3c8657a3331 100644 --- a/idea/testData/debugger/tinyApp/outs/dexInlineInClass.out +++ b/idea/testData/debugger/tinyApp/outs/inlineInClassDex.out @@ -1,8 +1,8 @@ -LineBreakpoint created at dexInlineInClass.Other.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 !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInlineInClass.DexInlineInClassKt +LineBreakpoint created at inlineInClassDex.Other.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 !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInClassDex.InlineInClassDexKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexInlineInClass.Other.kt:6 -dexInlineInClass.Other.kt:7 +inlineInClassDex.Other.kt:6 +inlineInClassDex.Other.kt:7 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/dexInlineInObject.out b/idea/testData/debugger/tinyApp/outs/inlineInObjectDex.out similarity index 70% rename from idea/testData/debugger/tinyApp/outs/dexInlineInObject.out rename to idea/testData/debugger/tinyApp/outs/inlineInObjectDex.out index 5c3db39b53a..f5eacc34858 100644 --- a/idea/testData/debugger/tinyApp/outs/dexInlineInObject.out +++ b/idea/testData/debugger/tinyApp/outs/inlineInObjectDex.out @@ -1,8 +1,8 @@ -LineBreakpoint created at dexInlineInObject.Other.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 !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInlineInObject.DexInlineInObjectKt +LineBreakpoint created at inlineInObjectDex.Other.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 !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInObjectDex.InlineInObjectDexKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexInlineInObject.Other.kt:6 -dexInlineInObject.Other.kt:7 +inlineInObjectDex.Other.kt:6 +inlineInObjectDex.Other.kt:7 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/dexInlineInObjectSameFile.out b/idea/testData/debugger/tinyApp/outs/inlineInObjectSameFileDex.out similarity index 61% rename from idea/testData/debugger/tinyApp/outs/dexInlineInObjectSameFile.out rename to idea/testData/debugger/tinyApp/outs/inlineInObjectSameFileDex.out index daf6af3cfc0..3b2f5fbc899 100644 --- a/idea/testData/debugger/tinyApp/outs/dexInlineInObjectSameFile.out +++ b/idea/testData/debugger/tinyApp/outs/inlineInObjectSameFileDex.out @@ -1,9 +1,9 @@ -LineBreakpoint created at dexInlineInObjectSameFile.kt:5 -LineBreakpoint created at dexInlineInObjectSameFile.kt:11 -!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! dexInlineInObjectSameFile.DexInlineInObjectSameFileKt +LineBreakpoint created at inlineInObjectSameFileDex.kt:5 +LineBreakpoint created at inlineInObjectSameFileDex.kt:11 +!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! inlineInObjectSameFileDex.InlineInObjectSameFileDexKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexInlineInObjectSameFile.kt:5 -dexInlineInObjectSameFile.kt:11 +inlineInObjectSameFileDex.kt:5 +inlineInObjectSameFileDex.kt:11 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/dexManyFilesWithInlineCalls1.out b/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls1Dex.out similarity index 69% rename from idea/testData/debugger/tinyApp/outs/dexManyFilesWithInlineCalls1.out rename to idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls1Dex.out index c3f14d00d66..45245cf26c5 100644 --- a/idea/testData/debugger/tinyApp/outs/dexManyFilesWithInlineCalls1.out +++ b/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls1Dex.out @@ -1,7 +1,7 @@ -LineBreakpoint created at dexManyFilesWithInlineCalls1.First.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! dexManyFilesWithInlineCalls1.DexManyFilesWithInlineCalls1Kt +LineBreakpoint created at manyFilesWithInlineCalls1Dex.First.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! manyFilesWithInlineCalls1Dex.ManyFilesWithInlineCalls1DexKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexManyFilesWithInlineCalls1.First.kt:5 +manyFilesWithInlineCalls1Dex.First.kt:5 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/dexManyFilesWithInlineCalls2.out b/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls2Dex.out similarity index 69% rename from idea/testData/debugger/tinyApp/outs/dexManyFilesWithInlineCalls2.out rename to idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls2Dex.out index 547fc8d02a8..3270b43d6f0 100644 --- a/idea/testData/debugger/tinyApp/outs/dexManyFilesWithInlineCalls2.out +++ b/idea/testData/debugger/tinyApp/outs/manyFilesWithInlineCalls2Dex.out @@ -1,7 +1,7 @@ -LineBreakpoint created at dexManyFilesWithInlineCalls2.Second.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! dexManyFilesWithInlineCalls2.DexManyFilesWithInlineCalls2Kt +LineBreakpoint created at manyFilesWithInlineCalls2Dex.Second.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! manyFilesWithInlineCalls2Dex.ManyFilesWithInlineCalls2DexKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexManyFilesWithInlineCalls2.Second.kt:5 +manyFilesWithInlineCalls2Dex.Second.kt:5 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/dexSeveralInlineCallsFromOtherFile.out b/idea/testData/debugger/tinyApp/outs/severalInlineCallsFromOtherFileDex.out similarity index 54% rename from idea/testData/debugger/tinyApp/outs/dexSeveralInlineCallsFromOtherFile.out rename to idea/testData/debugger/tinyApp/outs/severalInlineCallsFromOtherFileDex.out index 0e33ed23c4a..aae16a6dd3e 100644 --- a/idea/testData/debugger/tinyApp/outs/dexSeveralInlineCallsFromOtherFile.out +++ b/idea/testData/debugger/tinyApp/outs/severalInlineCallsFromOtherFileDex.out @@ -1,10 +1,10 @@ -LineBreakpoint created at dexSeveralInlineCallsFromOtherFile.Other.kt:6 -LineBreakpoint created at dexSeveralInlineCallsFromOtherFile.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! dexSeveralInlineCallsFromOtherFile.DexSeveralInlineCallsFromOtherFileKt +LineBreakpoint created at severalInlineCallsFromOtherFileDex.Other.kt:6 +LineBreakpoint created at severalInlineCallsFromOtherFileDex.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! severalInlineCallsFromOtherFileDex.SeveralInlineCallsFromOtherFileDexKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexSeveralInlineCallsFromOtherFile.kt:5 -dexSeveralInlineCallsFromOtherFile.Other.kt:6 -dexSeveralInlineCallsFromOtherFile.Other.kt:6 +severalInlineCallsFromOtherFileDex.kt:5 +severalInlineCallsFromOtherFileDex.Other.kt:6 +severalInlineCallsFromOtherFileDex.Other.kt:6 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out b/idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out new file mode 100644 index 00000000000..87d29f79994 --- /dev/null +++ b/idea/testData/debugger/tinyApp/outs/severalInlineFunctionsInOneFileDex.out @@ -0,0 +1,6 @@ +!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! severalInlineFunctionsInOneFileDex.SeveralInlineFunctionsInOneFileDexKt +Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' +Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' + +Process finished with exit code 1 +Error: Could not find or load main class severalInlineFunctionsInOneFileDex.SeveralInlineFunctionsInOneFileDexKt diff --git a/idea/testData/debugger/tinyApp/outs/dexStopInInlineFun.out b/idea/testData/debugger/tinyApp/outs/stopInInlineFunDex.out similarity index 71% rename from idea/testData/debugger/tinyApp/outs/dexStopInInlineFun.out rename to idea/testData/debugger/tinyApp/outs/stopInInlineFunDex.out index 97e95cf34e9..542eeb21bfe 100644 --- a/idea/testData/debugger/tinyApp/outs/dexStopInInlineFun.out +++ b/idea/testData/debugger/tinyApp/outs/stopInInlineFunDex.out @@ -1,8 +1,8 @@ -LineBreakpoint created at dexStopInInlineFun.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! dexStopInInlineFun.DexStopInInlineFunKt +LineBreakpoint created at stopInInlineFunDex.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! stopInInlineFunDex.StopInInlineFunDexKt Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' -dexStopInInlineFun.kt:10 -dexStopInInlineFun.kt:11 +stopInInlineFunDex.kt:10 +stopInInlineFunDex.kt:11 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out b/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out new file mode 100644 index 00000000000..aa03e6ef4bb --- /dev/null +++ b/idea/testData/debugger/tinyApp/outs/stopInInlineInOtherFileDex.out @@ -0,0 +1,8 @@ +LineBreakpoint created at stopInInlineInOtherFileDex.Other.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 !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineInOtherFileDex.StopInInlineInOtherFileDexKt +Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' +stopInInlineInOtherFileDex.Other.kt:6 +stopInInlineInOtherFileDex.Other.kt:7 +Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' + +Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.Second.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.Second.kt deleted file mode 100644 index dedc5a04c16..00000000000 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.Second.kt +++ /dev/null @@ -1,5 +0,0 @@ -package dexManyFilesWithInlineCalls1.second - -inline fun secondInline() { - 1 + 1 -} diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.kt deleted file mode 100644 index 559c91ca389..00000000000 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.kt +++ /dev/null @@ -1,14 +0,0 @@ -package dexManyFilesWithInlineCalls1 - -import dexManyFilesWithInlineCalls1.first.* -import dexManyFilesWithInlineCalls1.second.* - -fun main(args: Array) { - firstInline() -} - -fun unused() { - secondInline() -} - -// ADDITIONAL_BREAKPOINT: dexManyFilesWithInlineCalls1.First.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.First.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.First.kt deleted file mode 100644 index 32d79f85935..00000000000 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.First.kt +++ /dev/null @@ -1,5 +0,0 @@ -package dexManyFilesWithInlineCalls2.first - -inline fun firstInline() { - 1 + 1 -} diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.kt deleted file mode 100644 index 15900c480a3..00000000000 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.kt +++ /dev/null @@ -1,14 +0,0 @@ -package dexManyFilesWithInlineCalls2 - -import dexManyFilesWithInlineCalls2.first.* -import dexManyFilesWithInlineCalls2.second.* - -fun main(args: Array) { - secondInline() -} - -fun unused() { - firstInline() -} - -// ADDITIONAL_BREAKPOINT: dexManyFilesWithInlineCalls2.Second.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexInlineInObjectSameFile.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/inlineInObjectSameFileDex.kt similarity index 84% rename from idea/testData/debugger/tinyApp/src/stepping/custom/dexInlineInObjectSameFile.kt rename to idea/testData/debugger/tinyApp/src/stepping/custom/inlineInObjectSameFileDex.kt index ff17972f20d..a545a7abce7 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexInlineInObjectSameFile.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/inlineInObjectSameFileDex.kt @@ -1,4 +1,4 @@ -package dexInlineInObjectSameFile +package inlineInObjectSameFileDex fun main(args: Array) { //Breakpoint! diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.First.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.First.kt similarity index 58% rename from idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.First.kt rename to idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.First.kt index 12444f5e76c..3e3d9acb9d3 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.First.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.First.kt @@ -1,4 +1,4 @@ -package dexManyFilesWithInlineCalls1.first +package manyFilesWithInlineCalls1Dex.first inline fun firstInline() { // Breakpoint 1 diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.Second.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.Second.kt new file mode 100644 index 00000000000..9eacabc91c4 --- /dev/null +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.Second.kt @@ -0,0 +1,5 @@ +package manyFilesWithInlineCalls1Dex.second + +inline fun secondInline() { + 1 + 1 +} diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.kt new file mode 100644 index 00000000000..0960a6416ad --- /dev/null +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.kt @@ -0,0 +1,14 @@ +package manyFilesWithInlineCalls1Dex + +import manyFilesWithInlineCalls1Dex.first.* +import manyFilesWithInlineCalls1Dex.second.* + +fun main(args: Array) { + firstInline() +} + +fun unused() { + secondInline() +} + +// ADDITIONAL_BREAKPOINT: manyFilesWithInlineCalls1Dex.First.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.First.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.First.kt new file mode 100644 index 00000000000..215b81afbbc --- /dev/null +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.First.kt @@ -0,0 +1,5 @@ +package manyFilesWithInlineCalls2Dex.first + +inline fun firstInline() { + 1 + 1 +} diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.Second.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.Second.kt similarity index 58% rename from idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.Second.kt rename to idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.Second.kt index 40c61d46159..b66b2ca19bb 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.Second.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.Second.kt @@ -1,4 +1,4 @@ -package dexManyFilesWithInlineCalls2.second +package manyFilesWithInlineCalls2Dex.second inline fun secondInline() { // Breakpoint 1 diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.kt new file mode 100644 index 00000000000..061ca3ee9b2 --- /dev/null +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.kt @@ -0,0 +1,14 @@ +package manyFilesWithInlineCalls2Dex + +import manyFilesWithInlineCalls2Dex.first.* +import manyFilesWithInlineCalls2Dex.second.* + +fun main(args: Array) { + secondInline() +} + +fun unused() { + firstInline() +} + +// ADDITIONAL_BREAKPOINT: manyFilesWithInlineCalls2Dex.Second.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineCallsFromOtherFile.Other.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.Other.kt similarity index 64% rename from idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineCallsFromOtherFile.Other.kt rename to idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.Other.kt index 90905a85f41..14bbf032e31 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineCallsFromOtherFile.Other.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.Other.kt @@ -1,4 +1,4 @@ -package dexSeveralInlineCallsFromOtherFile +package severalInlineCallsFromOtherFileDex inline fun inlineFun() { var i = 1 diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineCallsFromOtherFile.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.kt similarity index 64% rename from idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineCallsFromOtherFile.kt rename to idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.kt index 1a8b4590ce8..b50058b1c94 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineCallsFromOtherFile.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.kt @@ -1,4 +1,4 @@ -package dexSeveralInlineCallsFromOtherFile +package severalInlineCallsFromOtherFileDex fun main(args: Array) { //Breakpoint! @@ -15,4 +15,4 @@ fun secondCall() { } // RESUME: 2 -// ADDITIONAL_BREAKPOINT: dexSeveralInlineCallsFromOtherFile.Other.kt: Breakpoint 1 +// ADDITIONAL_BREAKPOINT: severalInlineCallsFromOtherFileDex.Other.kt: Breakpoint 1 diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineFunctionsInOneFile.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineFunctionsInOneFileDex.kt similarity index 96% rename from idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineFunctionsInOneFile.kt rename to idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineFunctionsInOneFileDex.kt index ee0008ea734..afc16f87ff4 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineFunctionsInOneFile.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineFunctionsInOneFileDex.kt @@ -1,4 +1,4 @@ -package dexSeveralInlineFunctionsInOneFile +package severalInlineCallsFromOtherFileDex fun main(args: Array) { //Breakpoint! diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepInto/dexInline.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineDex.kt similarity index 86% rename from idea/testData/debugger/tinyApp/src/stepping/stepInto/dexInline.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineDex.kt index 21f76adce24..ab36f37a719 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/stepInto/dexInline.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineDex.kt @@ -1,4 +1,4 @@ -package dexInline +package inlineDex fun main(args: Array) { //Breakpoint! diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInClass.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInClass.kt deleted file mode 100644 index e87ef8d5570..00000000000 --- a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInClass.kt +++ /dev/null @@ -1,7 +0,0 @@ -package dexInlineInClass - -fun main(args: Array) { - dexInlineInClass.other.TestDexInlineInClass().inlineFun() -} - -// ADDITIONAL_BREAKPOINT: dexInlineInClass.Other.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInObject.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInObject.kt deleted file mode 100644 index f2796f7c8ff..00000000000 --- a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInObject.kt +++ /dev/null @@ -1,7 +0,0 @@ -package dexInlineInObject - -fun main(args: Array) { - dexInlineInObject.other.TestDexInlineInObject.inlineFun() -} - -// ADDITIONAL_BREAKPOINT: dexInlineInObject.Other.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineInOtherFile.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineInOtherFile.kt deleted file mode 100644 index 59ef2f4c512..00000000000 --- a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineInOtherFile.kt +++ /dev/null @@ -1,7 +0,0 @@ -package dexStopInInlineInOtherFile - -fun main(args: Array) { - inlineFun() -} - -// ADDITIONAL_BREAKPOINT: dexStopInInlineInOtherFile.Other.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInClass.Other.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.Other.kt similarity index 81% rename from idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInClass.Other.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.Other.kt index 9219980b479..bb98262bc1e 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInClass.Other.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.Other.kt @@ -1,4 +1,4 @@ -package dexInlineInClass.other +package inlineInClassDex.other class TestDexInlineInClass { inline fun inlineFun() { diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.kt new file mode 100644 index 00000000000..220a854ee03 --- /dev/null +++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.kt @@ -0,0 +1,7 @@ +package inlineInClassDex + +fun main(args: Array) { + inlineInClassDex.other.TestDexInlineInClass().inlineFun() +} + +// ADDITIONAL_BREAKPOINT: inlineInClassDex.Other.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInObject.Other.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.Other.kt similarity index 81% rename from idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInObject.Other.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.Other.kt index 9a9caffc7f1..9969a6708da 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInObject.Other.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.Other.kt @@ -1,4 +1,4 @@ -package dexInlineInObject.other +package inlineInObjectDex.other object TestDexInlineInObject { inline fun inlineFun() { diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.kt new file mode 100644 index 00000000000..89fbe65e15e --- /dev/null +++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.kt @@ -0,0 +1,7 @@ +package inlineInObjectDex + +fun main(args: Array) { + inlineInObjectDex.other.TestDexInlineInObject.inlineFun() +} + +// ADDITIONAL_BREAKPOINT: inlineInObjectDex.Other.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineFun.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineFunDex.kt similarity index 82% rename from idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineFun.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineFunDex.kt index 149060e8416..99601d14df1 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineFun.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineFunDex.kt @@ -1,4 +1,4 @@ -package dexStopInInlineFun +package stopInInlineFunDex fun main(args: Array) { inlineFun() diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineInOtherFile.Other.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.Other.kt similarity index 68% rename from idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineInOtherFile.Other.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.Other.kt index a8d1a8aba17..984135277fd 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineInOtherFile.Other.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.Other.kt @@ -1,4 +1,4 @@ -package dexStopInInlineInOtherFile +package stopInInlineInOtherFileDex inline fun inlineFun() { var i = 1 diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.kt new file mode 100644 index 00000000000..c149195afbf --- /dev/null +++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.kt @@ -0,0 +1,7 @@ +package stopInInlineInOtherFileDex + +fun main(args: Array) { + inlineFun() +} + +// ADDITIONAL_BREAKPOINT: stopInInlineInOtherFileDex.Other.kt: Breakpoint 1 \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java index ba9c18a0085..c6a750881ef 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java @@ -120,7 +120,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { } VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); - if (getTestName(true).startsWith("dex")) { + if (DexLikeBytecodePatchKt.needDexPatch(getTestName(true))) { NoStrataPositionManagerHelperKt.setEmulateDexDebugInTests(true); } super.setUp(); @@ -188,7 +188,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { @Override protected void tearDown() throws Exception { - if (getTestName(true).startsWith("dex")) { + if (DexLikeBytecodePatchKt.needDexPatch(getTestName(true))) { NoStrataPositionManagerHelperKt.setEmulateDexDebugInTests(false); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java index 94c5343f728..90ee01c8287 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java @@ -229,12 +229,6 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { doStepIntoTest(fileName); } - @TestMetadata("dexInline.kt") - public void testDexInline() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/dexInline.kt"); - doStepIntoTest(fileName); - } - @TestMetadata("forLoop.kt") public void testForLoop() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/forLoop.kt"); @@ -247,6 +241,12 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { doStepIntoTest(fileName); } + @TestMetadata("inlineDex.kt") + public void testInlineDex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineDex.kt"); + doStepIntoTest(fileName); + } + @TestMetadata("inlineOnly.kt") public void testInlineOnly() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineOnly.kt"); @@ -391,30 +391,6 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { doStepOverTest(fileName); } - @TestMetadata("dexInlineInClass.kt") - public void testDexInlineInClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInClass.kt"); - doStepOverTest(fileName); - } - - @TestMetadata("dexInlineInObject.kt") - public void testDexInlineInObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/dexInlineInObject.kt"); - doStepOverTest(fileName); - } - - @TestMetadata("dexStopInInlineFun.kt") - public void testDexStopInInlineFun() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineFun.kt"); - doStepOverTest(fileName); - } - - @TestMetadata("dexStopInInlineInOtherFile.kt") - public void testDexStopInInlineInOtherFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/dexStopInInlineInOtherFile.kt"); - doStepOverTest(fileName); - } - @TestMetadata("ifCapturedVariableKt9118.kt") public void testIfCapturedVariableKt9118() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/ifCapturedVariableKt9118.kt"); @@ -433,6 +409,12 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { doStepOverTest(fileName); } + @TestMetadata("inlineInClassDex.kt") + public void testInlineInClassDex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInClassDex.kt"); + doStepOverTest(fileName); + } + @TestMetadata("inlineInIfFalse.kt") public void testInlineInIfFalse() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInIfFalse.kt"); @@ -445,6 +427,12 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { doStepOverTest(fileName); } + @TestMetadata("inlineInObjectDex.kt") + public void testInlineInObjectDex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineInObjectDex.kt"); + doStepOverTest(fileName); + } + @TestMetadata("noParameterLambdaArgumentCallInInline.kt") public void testNoParameterLambdaArgumentCallInInline() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/noParameterLambdaArgumentCallInInline.kt"); @@ -618,6 +606,18 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhileWithInline.kt"); doStepOverTest(fileName); } + + @TestMetadata("stopInInlineFunDex.kt") + public void testStopInInlineFunDex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineFunDex.kt"); + doStepOverTest(fileName); + } + + @TestMetadata("stopInInlineInOtherFileDex.kt") + public void testStopInInlineInOtherFileDex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInInlineInOtherFileDex.kt"); + doStepOverTest(fileName); + } } @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/filters") @@ -715,36 +715,6 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { doCustomTest(fileName); } - @TestMetadata("dexInlineInObjectSameFile.kt") - public void testDexInlineInObjectSameFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexInlineInObjectSameFile.kt"); - doCustomTest(fileName); - } - - @TestMetadata("dexManyFilesWithInlineCalls1.kt") - public void testDexManyFilesWithInlineCalls1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls1.kt"); - doCustomTest(fileName); - } - - @TestMetadata("dexManyFilesWithInlineCalls2.kt") - public void testDexManyFilesWithInlineCalls2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexManyFilesWithInlineCalls2.kt"); - doCustomTest(fileName); - } - - @TestMetadata("dexSeveralInlineCallsFromOtherFile.kt") - public void testDexSeveralInlineCallsFromOtherFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineCallsFromOtherFile.kt"); - doCustomTest(fileName); - } - - @TestMetadata("dexSeveralInlineFunctionsInOneFile.kt") - public void testDexSeveralInlineFunctionsInOneFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/dexSeveralInlineFunctionsInOneFile.kt"); - doCustomTest(fileName); - } - @TestMetadata("funLiteral.kt") public void testFunLiteral() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.kt"); @@ -781,6 +751,24 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { doCustomTest(fileName); } + @TestMetadata("inlineInObjectSameFileDex.kt") + public void testInlineInObjectSameFileDex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/inlineInObjectSameFileDex.kt"); + doCustomTest(fileName); + } + + @TestMetadata("manyFilesWithInlineCalls1Dex.kt") + public void testManyFilesWithInlineCalls1Dex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls1Dex.kt"); + doCustomTest(fileName); + } + + @TestMetadata("manyFilesWithInlineCalls2Dex.kt") + public void testManyFilesWithInlineCalls2Dex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/manyFilesWithInlineCalls2Dex.kt"); + doCustomTest(fileName); + } + @TestMetadata("severalFunLiterals.kt") public void testSeveralFunLiterals() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.kt"); @@ -793,6 +781,18 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { doCustomTest(fileName); } + @TestMetadata("severalInlineCallsFromOtherFileDex.kt") + public void testSeveralInlineCallsFromOtherFileDex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineCallsFromOtherFileDex.kt"); + doCustomTest(fileName); + } + + @TestMetadata("severalInlineFunctionsInOneFileDex.kt") + public void testSeveralInlineFunctionsInOneFileDex() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalInlineFunctionsInOneFileDex.kt"); + doCustomTest(fileName); + } + @TestMetadata("simpleConditionalBreakpoint.kt") public void testSimpleConditionalBreakpoint() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.kt"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/dexLikeBytecodePatch.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/dexLikeBytecodePatch.kt index 13e4fca6d5e..72ec930c71d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/dexLikeBytecodePatch.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/dexLikeBytecodePatch.kt @@ -22,8 +22,10 @@ import java.util.* val DEX_BEFORE_PATCH_EXTENSION = "before_dex" +fun String.needDexPatch() = split('.').any { it.endsWith("Dex") } + fun patchDexTests(dir: File) { - dir.listFiles({ file -> file.isDirectory && file.name.startsWith("dex") }).forEach { dir -> + dir.listFiles({ file -> file.isDirectory && file.name.needDexPatch() }).forEach { dir -> dir.listFiles { testOutputFile -> testOutputFile.extension == "class" }.forEach(::applyDexLikePatch) } }