From 7af88f6797829aec7aa571418f7e0c15f4706193 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 27 Jul 2015 17:38:52 +0300 Subject: [PATCH] Update debug tests & incremental compilation tests depending on part class naming --- .../debugger/positionManager/_DefaultPackage.kt | 2 +- .../positionManager/anonymousNamedFunction.kt | 2 +- .../debugger/positionManager/extensionFunction.kt | 2 +- .../debugger/positionManager/localFunction.kt | 2 +- .../debugger/positionManager/multiFilePackage/a.kt | 2 +- .../debugger/positionManager/multiFilePackage/b.kt | 2 +- .../positionManager/multiFileSameName/1/a1.kt | 2 +- .../positionManager/multiFileSameName/2/a2.kt | 2 +- .../positionManager/multiFileSameName/3/a3.kt | 2 +- .../positionManager/multiFileSameName/4/a4.kt | 2 +- idea/testData/debugger/positionManager/package.kt | 2 +- .../positionManager/topLevelPropertyInitializer.kt | 2 +- .../tinyApp/outs/delegatedPropertyInClass.out | 4 ++-- .../outs/delegatedPropertyInClassWoRenderer.out | 4 ++-- .../outs/evBreakpointOnPropertyDeclaration.out | 4 ++-- .../debugger/tinyApp/outs/evDelegatedProperty.out | 4 ++-- .../debugger/tinyApp/outs/evDuplicateItems.out | 4 ++-- .../debugger/tinyApp/outs/evFinalProperty.out | 4 ++-- idea/testData/debugger/tinyApp/outs/evLineRange.out | 4 ++-- idea/testData/debugger/tinyApp/outs/evProperty.out | 4 ++-- .../debugger/tinyApp/outs/evSkipAnonymousObject.out | 4 ++-- idea/testData/debugger/tinyApp/outs/evSkipLambda.out | 4 ++-- .../debugger/tinyApp/outs/evSkipLocalClass.out | 4 ++-- .../debugger/tinyApp/outs/frameAnonymousObject.out | 6 +++--- .../debugger/tinyApp/outs/frameClosingBracket.out | 4 ++-- .../debugger/tinyApp/outs/frameExtensionFun.out | 4 ++-- .../debugger/tinyApp/outs/frameInnerLambda.out | 6 +++--- idea/testData/debugger/tinyApp/outs/frameLambda.out | 4 ++-- .../debugger/tinyApp/outs/frameLambdaNotUsed.out | 4 ++-- .../debugger/tinyApp/outs/frameLocalVariable.out | 4 ++-- idea/testData/debugger/tinyApp/outs/frameObject.out | 4 ++-- .../debugger/tinyApp/outs/frameSharedVar.out | 4 ++-- .../debugger/tinyApp/outs/frameSharedVarLocalVar.out | 4 ++-- idea/testData/debugger/tinyApp/outs/frameSimple.out | 4 ++-- .../debugger/tinyApp/outs/toStringRenderer.out | 4 ++-- .../compilingEvaluator/ceAnonymousObject.kt | 4 ++-- .../singleBreakpoint/compilingEvaluator/ceObject.kt | 2 +- .../incremental/custom/cacheVersionChanged/build.log | 4 ++-- .../cacheVersionChangedAndFileModified/build.log | 6 +++--- .../custom/cacheVersionChangedMultiModule/build.log | 4 ++-- .../circularDependencySamePackageUnchanged/build.log | 2 +- .../circularDependencyTopLevelFunctions/build.log | 4 ++-- .../multiModule/constantValueChanged/build.log | 2 +- .../multiModule/inlineFunctionChanged/build.log | 8 ++++---- .../multiModule/inlineFunctionInlined/build.log | 8 ++++---- .../multiModule/simpleDependency/build.log | 4 ++-- .../multiModule/simpleDependencyUnchanged/build.log | 2 +- .../multiModule/transitiveDependency/build.log | 4 ++-- .../multiModule/transitiveInlining/build.log | 10 +++++----- .../incremental/multiModule/twoDependants/build.log | 6 +++--- .../pureKotlin/accessPrivateMembers/build.log | 4 ++-- .../accessingFunctionsViaPackagePart/build.log | 6 +++--- .../pureKotlin/accessingPropertiesViaField/build.log | 6 +++--- .../incremental/pureKotlin/allConstants/build.log | 6 +++--- .../incremental/pureKotlin/annotations/build.log | 4 ++-- .../pureKotlin/anonymousObjectChanged/build.log | 4 ++-- .../pureKotlin/classInlineFunctionChanged/build.log | 4 ++-- .../incremental/pureKotlin/classRecreated/build.log | 4 ++-- .../pureKotlin/classSignatureChanged/build.log | 4 ++-- .../compilationErrorThenFixedOtherPackage/build.log | 2 +- .../compilationErrorThenFixedSamePackage/build.log | 4 ++-- .../build.log | 6 +++--- .../build.log | 12 ++++++------ .../build.log | 8 ++++---- .../conflictingPlatformDeclarations/build.log | 2 +- .../incremental/pureKotlin/constantRemoved/build.log | 4 ++-- .../pureKotlin/constantsUnchanged/build.log | 4 ++-- .../pureKotlin/defaultArguments/build.log | 4 ++-- .../pureKotlin/dependencyClassReferenced/build.log | 4 ++-- .../pureKotlin/fileWithConstantRemoved/build.log | 4 ++-- .../fileWithInlineFunctionRemoved/build.log | 4 ++-- .../pureKotlin/filesExchangePackages/build.log | 10 +++++----- .../pureKotlin/funRedeclaration/build.log | 2 +- .../pureKotlin/inlineFunctionRemoved/build.log | 4 ++-- .../inlineFunctionsCircularDependency/build.log | 8 ++++---- .../pureKotlin/inlineFunctionsUnchanged/build.log | 4 ++-- .../pureKotlin/localClassChanged/build.log | 4 ++-- .../pureKotlin/multiplePackagesModified/build.log | 6 +++--- .../pureKotlin/optionalParameter/build.log | 4 ++-- .../pureKotlin/ourClassReferenced/build.log | 6 +++--- .../pureKotlin/packageConstantChanged/build.log | 4 ++-- .../pureKotlin/packageFileAdded/build.log | 2 +- .../pureKotlin/packageFileChangedPackage/build.log | 8 ++++---- .../packageFileChangedThenOtherRemoved/build.log | 8 ++++---- .../pureKotlin/packageFileRemoved/build.log | 10 +++++----- .../pureKotlin/packageFilesChangedInTurn/build.log | 6 +++--- .../packageInlineFunctionAccessingField/build.log | 4 ++-- .../packageInlineFunctionChanged/build.log | 8 ++++---- .../packageInlineFunctionFromOurPackage/build.log | 4 ++-- .../pureKotlin/packageRecreated/build.log | 4 ++-- .../packageRecreatedAfterRenaming/build.log | 8 ++++---- .../incremental/pureKotlin/packageRemoved/build.log | 6 +++--- .../pureKotlin/propertyRedeclaration/build.log | 2 +- .../pureKotlin/returnTypeChanged/build.log | 6 +++--- .../pureKotlin/soleFileChangesPackage/build.log | 4 ++-- .../incremental/pureKotlin/subpackage/build.log | 6 +++--- .../topLevelFunctionSameSignature/build.log | 4 ++-- .../pureKotlin/topLevelMembersInTwoFiles/build.log | 4 ++-- .../javaToKotlin/build.log | 4 ++-- .../javaToKotlinAndBack/build.log | 6 +++--- .../kotlinToJava/build.log | 4 ++-- .../javaUsedInKotlin/changeSignature/build.log | 4 ++-- .../javaAndKotlinChangedSimultaneously/build.log | 4 ++-- .../javaUsedInKotlin/methodRenamed/build.log | 6 +++--- .../samConversions/methodAdded/build.log | 8 ++++---- .../samConversions/methodSignatureChanged/build.log | 10 +++++----- .../kotlinUsedInJava/addOptionalParameter/build.log | 4 ++-- .../changeNotUsedSignature/build.log | 4 ++-- .../kotlinUsedInJava/changeSignature/build.log | 4 ++-- .../withJava/kotlinUsedInJava/funRenamed/build.log | 2 +- .../kotlinUsedInJava/notChangeSignature/build.log | 4 ++-- .../onlyTopLevelFunctionInFileRemoved/build.log | 4 ++-- .../kotlinUsedInJava/packageFileAdded/build.log | 2 +- .../kotlinUsedInJava/propertyRenamed/build.log | 2 +- .../collectToFile/inheritedTopLevel/annotations.txt | 4 ++-- 115 files changed, 256 insertions(+), 256 deletions(-) diff --git a/idea/testData/debugger/positionManager/_DefaultPackage.kt b/idea/testData/debugger/positionManager/_DefaultPackage.kt index d5736ec1f07..d8a61de59b3 100644 --- a/idea/testData/debugger/positionManager/_DefaultPackage.kt +++ b/idea/testData/debugger/positionManager/_DefaultPackage.kt @@ -1,3 +1,3 @@ fun foo() { - "" // _DefaultPackage + "" // _DefaultPackageKt } diff --git a/idea/testData/debugger/positionManager/anonymousNamedFunction.kt b/idea/testData/debugger/positionManager/anonymousNamedFunction.kt index 50f573c6b14..673ec0883d4 100644 --- a/idea/testData/debugger/positionManager/anonymousNamedFunction.kt +++ b/idea/testData/debugger/positionManager/anonymousNamedFunction.kt @@ -2,6 +2,6 @@ package insertInBlock fun foo() { val lambda = { - val a = 1 // insertInBlock/AnonymousNamedFunction\$foo\$lambda\$1 + val a = 1 // insertInBlock/AnonymousNamedFunctionKt\$foo\$lambda\$1 }() } diff --git a/idea/testData/debugger/positionManager/extensionFunction.kt b/idea/testData/debugger/positionManager/extensionFunction.kt index b20d26b6d22..4c1088529aa 100644 --- a/idea/testData/debugger/positionManager/extensionFunction.kt +++ b/idea/testData/debugger/positionManager/extensionFunction.kt @@ -4,5 +4,5 @@ class A { } fun A.foo() { - "" // a/ExtensionFunction + "" // a/ExtensionFunctionKt } diff --git a/idea/testData/debugger/positionManager/localFunction.kt b/idea/testData/debugger/positionManager/localFunction.kt index 3533415e6c9..b2cec05da20 100644 --- a/idea/testData/debugger/positionManager/localFunction.kt +++ b/idea/testData/debugger/positionManager/localFunction.kt @@ -2,7 +2,7 @@ package test fun foo(): String { fun bar(): String { - return "" // test/LocalFunction\$foo\$1 + return "" // test/LocalFunctionKt\$foo\$1 } return bar() } diff --git a/idea/testData/debugger/positionManager/multiFilePackage/a.kt b/idea/testData/debugger/positionManager/multiFilePackage/a.kt index 6a48e2bf97c..134ecff6044 100644 --- a/idea/testData/debugger/positionManager/multiFilePackage/a.kt +++ b/idea/testData/debugger/positionManager/multiFilePackage/a.kt @@ -1,5 +1,5 @@ package test fun foo() { - "" // test/A + "" // test/AKt } diff --git a/idea/testData/debugger/positionManager/multiFilePackage/b.kt b/idea/testData/debugger/positionManager/multiFilePackage/b.kt index e4df69d0201..8193b660198 100644 --- a/idea/testData/debugger/positionManager/multiFilePackage/b.kt +++ b/idea/testData/debugger/positionManager/multiFilePackage/b.kt @@ -1,5 +1,5 @@ package test fun bar() { - foo(); // test/B + foo(); // test/BKt } diff --git a/idea/testData/debugger/positionManager/multiFileSameName/1/a1.kt b/idea/testData/debugger/positionManager/multiFileSameName/1/a1.kt index da4da7cc73d..466d4cf50c4 100644 --- a/idea/testData/debugger/positionManager/multiFileSameName/1/a1.kt +++ b/idea/testData/debugger/positionManager/multiFileSameName/1/a1.kt @@ -1,5 +1,5 @@ package test fun foo() { - "" // test/A1 + "" // test/A1Kt } diff --git a/idea/testData/debugger/positionManager/multiFileSameName/2/a2.kt b/idea/testData/debugger/positionManager/multiFileSameName/2/a2.kt index 326d8ed5314..92d04eebb65 100644 --- a/idea/testData/debugger/positionManager/multiFileSameName/2/a2.kt +++ b/idea/testData/debugger/positionManager/multiFileSameName/2/a2.kt @@ -1,5 +1,5 @@ package test fun bar() { - "" // test/A2 + "" // test/A2Kt } diff --git a/idea/testData/debugger/positionManager/multiFileSameName/3/a3.kt b/idea/testData/debugger/positionManager/multiFileSameName/3/a3.kt index e654d22c65d..0dad6391e3a 100644 --- a/idea/testData/debugger/positionManager/multiFileSameName/3/a3.kt +++ b/idea/testData/debugger/positionManager/multiFileSameName/3/a3.kt @@ -1,5 +1,5 @@ package test fun baz() { - "" // test/A3 + "" // test/A3Kt } diff --git a/idea/testData/debugger/positionManager/multiFileSameName/4/a4.kt b/idea/testData/debugger/positionManager/multiFileSameName/4/a4.kt index 04c79089a01..0e96fc60745 100644 --- a/idea/testData/debugger/positionManager/multiFileSameName/4/a4.kt +++ b/idea/testData/debugger/positionManager/multiFileSameName/4/a4.kt @@ -1,5 +1,5 @@ package test fun quux() { - "" // test/A4 + "" // test/A4Kt } diff --git a/idea/testData/debugger/positionManager/package.kt b/idea/testData/debugger/positionManager/package.kt index bdef81e707d..04b78232954 100644 --- a/idea/testData/debugger/positionManager/package.kt +++ b/idea/testData/debugger/positionManager/package.kt @@ -1,5 +1,5 @@ package test fun foo() { - "" // test/Package + "" // test/PackageKt } diff --git a/idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt b/idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt index c0d72c89238..b0852e43bf3 100644 --- a/idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt +++ b/idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt @@ -1,3 +1,3 @@ package prop -val foo: Int = 5 // prop/TopLevelPropertyInitializer +val foo: Int = 5 // prop/TopLevelPropertyInitializerKt diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out index a2d11c1b2b0..b47ae252c51 100644 --- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out +++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out @@ -26,8 +26,8 @@ class MyDelegateThrowsException { } // PRINT_FRAME - frame = main():8, DelegatedPropertyInClass {delegatedPropertyInClass} - static = static = delegatedPropertyInClass.DelegatedPropertyInClass + frame = main():8, DelegatedPropertyInClassKt {delegatedPropertyInClass} + static = static = delegatedPropertyInClass.DelegatedPropertyInClassKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClass.kt, 5) local = a: delegatedPropertyInClass.A = {delegatedPropertyInClass.A@uniqueID} (sp = delegatedPropertyInClass.kt, 6) field = prop$delegate: delegatedPropertyInClass.MyDelegate = {delegatedPropertyInClass.MyDelegate@uniqueID} (sp = delegatedPropertyInClass.kt, 12) diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out index adccc2820de..7fec0161811 100644 --- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out +++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out @@ -22,8 +22,8 @@ class MyDelegate { // RENDER_DELEGATED_PROPERTIES: false // PRINT_FRAME - frame = main():8, DelegatedPropertyInClassWoRenderer {delegatedPropertyInClassWoRenderer} - static = static = delegatedPropertyInClassWoRenderer.DelegatedPropertyInClassWoRenderer + frame = main():8, DelegatedPropertyInClassWoRendererKt {delegatedPropertyInClassWoRenderer} + static = static = delegatedPropertyInClassWoRenderer.DelegatedPropertyInClassWoRendererKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 5) local = a: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.A@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 6) field = prop: delegatedPropertyInClassWoRenderer.MyDelegate: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 12) diff --git a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out index d4f814a1b51..f7a933a1347 100644 --- a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out +++ b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out @@ -20,8 +20,8 @@ fun main(args: Array) { } // PRINT_FRAME - frame = main():14, EvBreakpointOnPropertyDeclaration {evBreakpointOnPropertyDeclaration} - static = static = evBreakpointOnPropertyDeclaration.EvBreakpointOnPropertyDeclaration + frame = main():14, EvBreakpointOnPropertyDeclarationKt {evBreakpointOnPropertyDeclaration} + static = static = evBreakpointOnPropertyDeclaration.EvBreakpointOnPropertyDeclarationKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evBreakpointOnPropertyDeclaration.kt, 7) local = a1: evBreakpointOnPropertyDeclaration.A = {evBreakpointOnPropertyDeclaration.A@uniqueID} (sp = evBreakpointOnPropertyDeclaration.kt, 8) field = prop: int = 1 (sp = evBreakpointOnPropertyDeclaration.kt, 4) diff --git a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out index d1ed0ea9a27..92b0391d72f 100644 --- a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out +++ b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out @@ -18,8 +18,8 @@ fun main(args: Array) { } // PRINT_FRAME - frame = main():13, EvDelegatedProperty {evDelegatedProperty} - static = static = evDelegatedProperty.EvDelegatedProperty + frame = main():13, EvDelegatedPropertyKt {evDelegatedProperty} + static = static = evDelegatedProperty.EvDelegatedPropertyKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evDelegatedProperty.kt, 9) local = a: evDelegatedProperty.A = {evDelegatedProperty.A@uniqueID} (sp = evDelegatedProperty.kt, 10) field = prop$delegate: kotlin.properties.ReadWriteProperty = {kotlin.properties.NotNullVar@uniqueID} (sp = evDelegatedProperty.kt, 6) diff --git a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out index fcc7f538c6f..47820b38103 100644 --- a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out +++ b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out @@ -15,8 +15,8 @@ fun main(args: Array) { } // PRINT_FRAME - frame = main():10, EvDuplicateItems {evDuplicateItems} - static = static = evDuplicateItems.EvDuplicateItems + frame = main():10, EvDuplicateItemsKt {evDuplicateItems} + static = static = evDuplicateItems.EvDuplicateItemsKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evDuplicateItems.kt, 7) local = a: evDuplicateItems.A = {evDuplicateItems.A@uniqueID} (sp = evDuplicateItems.kt, 8) field = prop: int = 1 (sp = evDuplicateItems.kt, 4) diff --git a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out index b54771d4191..1e9cf77e1ff 100644 --- a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out +++ b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out @@ -15,8 +15,8 @@ fun main(args: Array) { } // PRINT_FRAME - frame = main():10, EvFinalProperty {evFinalProperty} - static = static = evFinalProperty.EvFinalProperty + frame = main():10, EvFinalPropertyKt {evFinalProperty} + static = static = evFinalProperty.EvFinalPropertyKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evFinalProperty.kt, 7) local = a: evFinalProperty.A = {evFinalProperty.A@uniqueID} (sp = evFinalProperty.kt, 8) field = prop: int = 1 (sp = evFinalProperty.kt, 4) diff --git a/idea/testData/debugger/tinyApp/outs/evLineRange.out b/idea/testData/debugger/tinyApp/outs/evLineRange.out index fe14732c960..31270ab2f80 100644 --- a/idea/testData/debugger/tinyApp/outs/evLineRange.out +++ b/idea/testData/debugger/tinyApp/outs/evLineRange.out @@ -24,8 +24,8 @@ fun main(args: Array) { fun foo(i: Int) {} // PRINT_FRAME - frame = main():15, EvLineRange {evLineRange} - static = static = evLineRange.EvLineRange + frame = main():15, EvLineRangeKt {evLineRange} + static = static = evLineRange.EvLineRangeKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evLineRange.kt, 7) local = a1: evLineRange.A = {evLineRange.A@uniqueID} (sp = evLineRange.kt, 8) field = prop: int = 1 (sp = evLineRange.kt, 4) diff --git a/idea/testData/debugger/tinyApp/outs/evProperty.out b/idea/testData/debugger/tinyApp/outs/evProperty.out index 16718e54c77..b3261bd079a 100644 --- a/idea/testData/debugger/tinyApp/outs/evProperty.out +++ b/idea/testData/debugger/tinyApp/outs/evProperty.out @@ -17,8 +17,8 @@ fun main(args: Array) { } // PRINT_FRAME - frame = main():10, EvProperty {evProperty} - static = static = evProperty.EvProperty + frame = main():10, EvPropertyKt {evProperty} + static = static = evProperty.EvPropertyKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evProperty.kt, 7) local = a: evProperty.A = {evProperty.A@uniqueID} (sp = evProperty.kt, 8) field = prop: int = 1 (sp = evProperty.kt, 4) diff --git a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out index 25824da1a4d..a187a9e707f 100644 --- a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out +++ b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out @@ -28,8 +28,8 @@ interface T { fun foo(i: Int) {} // PRINT_FRAME - frame = main():12, EvSkipAnonymousObject {evSkipAnonymousObject} - static = static = evSkipAnonymousObject.EvSkipAnonymousObject + frame = main():12, EvSkipAnonymousObjectKt {evSkipAnonymousObject} + static = static = evSkipAnonymousObject.EvSkipAnonymousObjectKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipAnonymousObject.kt, 7) local = a1: evSkipAnonymousObject.A = {evSkipAnonymousObject.A@uniqueID} (sp = evSkipAnonymousObject.kt, 8) field = prop: int = 1 (sp = evSkipAnonymousObject.kt, 4) diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out index 561ba907a0d..918ac307b09 100644 --- a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out +++ b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out @@ -23,8 +23,8 @@ fun foo(i: Int) {} fun l(f: () -> Unit) {} // PRINT_FRAME - frame = main():12, EvSkipLambda {evSkipLambda} - static = static = evSkipLambda.EvSkipLambda + frame = main():12, EvSkipLambdaKt {evSkipLambda} + static = static = evSkipLambda.EvSkipLambdaKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipLambda.kt, 7) local = a1: evSkipLambda.A = {evSkipLambda.A@uniqueID} (sp = evSkipLambda.kt, 8) field = prop: int = 1 (sp = evSkipLambda.kt, 4) diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out index 71e8be34049..bf581717cd7 100644 --- a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out +++ b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out @@ -24,8 +24,8 @@ fun main(args: Array) { fun foo(i: Int) {} // PRINT_FRAME - frame = main():12, EvSkipLocalClass {evSkipLocalClass} - static = static = evSkipLocalClass.EvSkipLocalClass + frame = main():12, EvSkipLocalClassKt {evSkipLocalClass} + static = static = evSkipLocalClass.EvSkipLocalClassKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipLocalClass.kt, 7) local = a1: evSkipLocalClass.A = {evSkipLocalClass.A@uniqueID} (sp = evSkipLocalClass.kt, 8) field = prop: int = 1 (sp = evSkipLocalClass.kt, 4) diff --git a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out index a8525741146..eb7c4238f2a 100644 --- a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out +++ b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out @@ -25,9 +25,9 @@ fun foo(f: () -> Unit) { } // PRINT_FRAME - frame = invoke():11, FrameAnonymousObject$main$o$1$run$1 {frameAnonymousObject} - this = this = {frameAnonymousObject.FrameAnonymousObject$main$o$1$run$1@uniqueID}kotlin.jvm.functions.Function0 - field = this$0: frameAnonymousObject.FrameAnonymousObject$main$o$1 = {frameAnonymousObject.FrameAnonymousObject$main$o$1@uniqueID} (sp = null) + frame = invoke():11, FrameAnonymousObjectKt$main$o$1$run$1 {frameAnonymousObject} + this = this = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1$run$1@uniqueID}kotlin.jvm.functions.Function0 + field = this$0: frameAnonymousObject.FrameAnonymousObjectKt$main$o$1 = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1@uniqueID} (sp = null) field = obProp: int = 1 (sp = frameAnonymousObject.kt, 6) field = $val1: int = 1 (sp = null) field = arity: int = 0 (sp = Lambda.!EXT!) diff --git a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out index 269d444264b..57527da974f 100644 --- a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out +++ b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out @@ -14,8 +14,8 @@ fun main(args: Array) { // EXPRESSION: a // RESULT: 1: I - frame = main():6, FrameClosingBracket {frameClosingBracket} - static = static = frameClosingBracket.FrameClosingBracket + frame = main():6, FrameClosingBracketKt {frameClosingBracket} + static = static = frameClosingBracket.FrameClosingBracketKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameClosingBracket.kt, 3) local = a: int = 1 (sp = frameClosingBracket.kt, 4) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out index cf89bb1b126..756b816ee73 100644 --- a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out +++ b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out @@ -27,8 +27,8 @@ fun A.foo() { // EXPRESSION: myFun() // RESULT: 1: I - frame = foo():14, FrameExtensionFun {frameExtensionFun} - static = static = frameExtensionFun.FrameExtensionFun + frame = foo():14, FrameExtensionFunKt {frameExtensionFun} + static = static = frameExtensionFun.FrameExtensionFunKt local = $receiver: frameExtensionFun.A = {frameExtensionFun.A@uniqueID} (sp = null) field = prop: int = 1 (sp = frameExtensionFun.kt, 8) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out index b4f7870f9b9..23f148b228d 100644 --- a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out +++ b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out @@ -32,9 +32,9 @@ fun foo(f: () -> Unit) { // EXPRESSION: val1 + val2 // RESULT: 2: I - frame = invoke():9, FrameInnerLambda$main$1$1 {frameInnerLambda} - this = this = {frameInnerLambda.FrameInnerLambda$main$1$1@uniqueID}kotlin.jvm.functions.Function0 - field = this$0: frameInnerLambda.FrameInnerLambda$main$1 = {frameInnerLambda.FrameInnerLambda$main$1@uniqueID}kotlin.jvm.functions.Function0 (sp = null) + frame = invoke():9, FrameInnerLambdaKt$main$1$1 {frameInnerLambda} + this = this = {frameInnerLambda.FrameInnerLambdaKt$main$1$1@uniqueID}kotlin.jvm.functions.Function0 + field = this$0: frameInnerLambda.FrameInnerLambdaKt$main$1 = {frameInnerLambda.FrameInnerLambdaKt$main$1@uniqueID}kotlin.jvm.functions.Function0 (sp = null) field = $val1: int = 1 (sp = null) field = arity: int = 0 (sp = Lambda.!EXT!) field = $val2: int = 1 (sp = null) diff --git a/idea/testData/debugger/tinyApp/outs/frameLambda.out b/idea/testData/debugger/tinyApp/outs/frameLambda.out index cb8b45ea0e9..bb4d1d1a07a 100644 --- a/idea/testData/debugger/tinyApp/outs/frameLambda.out +++ b/idea/testData/debugger/tinyApp/outs/frameLambda.out @@ -21,8 +21,8 @@ fun foo(f: () -> Unit) { // EXPRESSION: val1 // RESULT: 1: I - frame = invoke():7, FrameLambda$main$1 {frameLambda} - this = this = {frameLambda.FrameLambda$main$1@uniqueID}kotlin.jvm.functions.Function0 + frame = invoke():7, FrameLambdaKt$main$1 {frameLambda} + this = this = {frameLambda.FrameLambdaKt$main$1@uniqueID}kotlin.jvm.functions.Function0 field = $val1: int = 1 (sp = null) field = arity: int = 0 (sp = Lambda.!EXT!) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out index e0a4bac3371..232e02dbe47 100644 --- a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out +++ b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out @@ -21,8 +21,8 @@ fun foo(f: () -> Unit) { // EXPRESSION: val1 // RESULT: Cannot find local variable: name = val1 - frame = invoke():7, FrameLambdaNotUsed$main$1 {frameLambdaNotUsed} - this = this = {frameLambdaNotUsed.FrameLambdaNotUsed$main$1@uniqueID}kotlin.jvm.functions.Function0 + frame = invoke():7, FrameLambdaNotUsedKt$main$1 {frameLambdaNotUsed} + this = this = {frameLambdaNotUsed.FrameLambdaNotUsedKt$main$1@uniqueID}kotlin.jvm.functions.Function0 field = arity: int = 0 (sp = Lambda.!EXT!) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out index 1759be7048b..1a0af447670 100644 --- a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out +++ b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out @@ -11,8 +11,8 @@ fun main(args: Array) { } // PRINT_FRAME - frame = main():6, FrameLocalVariable {frameLocalVariable} - static = static = frameLocalVariable.FrameLocalVariable + frame = main():6, FrameLocalVariableKt {frameLocalVariable} + static = static = frameLocalVariable.FrameLocalVariableKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameLocalVariable.kt, 3) local = val1: int = 1 (sp = frameLocalVariable.kt, 4) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameObject.out b/idea/testData/debugger/tinyApp/outs/frameObject.out index 3aa20ef1c27..1ff6ddde5a0 100644 --- a/idea/testData/debugger/tinyApp/outs/frameObject.out +++ b/idea/testData/debugger/tinyApp/outs/frameObject.out @@ -29,8 +29,8 @@ fun foo(f: () -> Unit) { // EXPRESSION: O.obMyFun() // RESULT: 1: I - frame = invoke():6, FrameObject$main$1 {frameObject} - this = this = {frameObject.FrameObject$main$1@uniqueID}kotlin.jvm.functions.Function0 + frame = invoke():6, FrameObjectKt$main$1 {frameObject} + this = this = {frameObject.FrameObjectKt$main$1@uniqueID}kotlin.jvm.functions.Function0 field = arity: int = 0 (sp = Lambda.!EXT!) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out index 1c2d4473b8a..47cccfe9bf1 100644 --- a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out +++ b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out @@ -21,8 +21,8 @@ fun foo(f: () -> Unit) { // EXPRESSION: var1 // RESULT: 1: I - frame = invoke():7, FrameSharedVar$main$1 {frameSharedVar} - this = this = {frameSharedVar.FrameSharedVar$main$1@uniqueID}kotlin.jvm.functions.Function0 + frame = invoke():7, FrameSharedVarKt$main$1 {frameSharedVar} + this = this = {frameSharedVar.FrameSharedVarKt$main$1@uniqueID}kotlin.jvm.functions.Function0 field = $var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = null) field = element: int = 1 (sp = Ref.!EXT!) field = arity: int = 0 (sp = Lambda.!EXT!) diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out index c49e95daf6c..55c6c28c40e 100644 --- a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out +++ b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out @@ -21,8 +21,8 @@ inline fun foo(f: () -> Unit) { // EXPRESSION: var1 // RESULT: 1: I - frame = main():7, FrameSharedVarLocalVar {frameSharedVarLocalVar} - static = static = frameSharedVarLocalVar.FrameSharedVarLocalVar + frame = main():7, FrameSharedVarLocalVarKt {frameSharedVarLocalVar} + static = static = frameSharedVarLocalVar.FrameSharedVarLocalVarKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSharedVarLocalVar.kt, 3) local = var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = frameSharedVarLocalVar.kt, 4) field = element: int = 1 (sp = Ref.!EXT!) diff --git a/idea/testData/debugger/tinyApp/outs/frameSimple.out b/idea/testData/debugger/tinyApp/outs/frameSimple.out index f7e279b201e..4b738409d29 100644 --- a/idea/testData/debugger/tinyApp/outs/frameSimple.out +++ b/idea/testData/debugger/tinyApp/outs/frameSimple.out @@ -32,8 +32,8 @@ class MyClass // EXPRESSION: val1 + topVal1 // RESULT: 2: I - frame = main():9, FrameSimple {frameSimple} - static = static = frameSimple.FrameSimple + frame = main():9, FrameSimpleKt {frameSimple} + static = static = frameSimple.FrameSimpleKt field = topVal1: int = 1 (sp = null) local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSimple.kt, 5) local = val1: int = 1 (sp = frameSimple.kt, 6) diff --git a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out index 9da985873e9..032b64891dd 100644 --- a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out +++ b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out @@ -15,8 +15,8 @@ class A { } // PRINT_FRAME - frame = main():6, ToStringRenderer {toStringRenderer} - static = static = toStringRenderer.ToStringRenderer + frame = main():6, ToStringRendererKt {toStringRenderer} + static = static = toStringRenderer.ToStringRendererKt local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = toStringRenderer.kt, 3) local = a: toStringRenderer.A = {toStringRenderer.A@uniqueID}myA (sp = toStringRenderer.kt, 4) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt index 52570ba965e..9f2ef6200a2 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt @@ -20,10 +20,10 @@ class MyClass { } // EXPRESSION: publicTopLevelObject -// RESULT: instance of ceAnonymousObject.CeAnonymousObject$publicTopLevelObject$1(id=ID): LceAnonymousObject/CeAnonymousObject$publicTopLevelObject$1; +// RESULT: instance of ceAnonymousObject.CeAnonymousObjectKt$publicTopLevelObject$1(id=ID): LceAnonymousObject/CeAnonymousObjectKt$publicTopLevelObject$1; // EXPRESSION: privateTopLevelObject -// RESULT: instance of ceAnonymousObject.CeAnonymousObject$privateTopLevelObject$1(id=ID): LceAnonymousObject/CeAnonymousObject$privateTopLevelObject$1; +// RESULT: instance of ceAnonymousObject.CeAnonymousObjectKt$privateTopLevelObject$1(id=ID): LceAnonymousObject/CeAnonymousObjectKt$privateTopLevelObject$1; // EXPRESSION: publicObject // RESULT: instance of ceAnonymousObject.MyClass$publicObject$1(id=ID): LceAnonymousObject/MyClass$publicObject$1; diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt index ba2759fdfa3..8dd8114e733 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt @@ -16,4 +16,4 @@ interface T { // RESULT: 1: I // EXPRESSION: object: T {} -// RESULT: instance of packageForDebugger.DebugFile$myFun$1(id=ID): LpackageForDebugger/DebugFile$myFun$1; \ No newline at end of file +// RESULT: instance of packageForDebugger.DebugFileKt$myFun$1(id=ID): LpackageForDebugger/DebugFileKt$myFun$1; \ No newline at end of file diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log b/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log index 4515d41dc9c..20769f534c9 100644 --- a/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log +++ b/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/A.class -out/production/module/test/B.class +out/production/module/test/AKt.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log index 6a64cdced63..5fe2ba1a018 100644 --- a/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log +++ b/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/other/Other.class +out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class -out/production/module/test/A.class +out/production/module/test/AKt.class End of files Compiling files: src/a.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log b/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log index d171334035e..de5ea860df8 100644 --- a/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log +++ b/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index fdc98eb8730..5ce22b13f31 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/Module1_a.class +out/production/module1/test/Module1_aKt.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index ffac776c374..7f67ddc3c5c 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt @@ -8,7 +8,7 @@ End of files Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 12e559d1298..6d8cb0dfa1b 100644 --- a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/Module1_const.class +out/production/module1/test/Module1_constKt.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log index 3e4fd010efb..a1763492476 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_inlineKt.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class -out/production/module1/inline/Module1_other.class +out/production/module1/inline/Module1_inlineKt.class +out/production/module1/inline/Module1_otherKt.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/Module2_usage.class +out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index 3e4fd010efb..a1763492476 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_inlineKt.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class -out/production/module1/inline/Module1_other.class +out/production/module1/inline/Module1_inlineKt.class +out/production/module1/inline/Module1_otherKt.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/Module2_usage.class +out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index d171334035e..de5ea860df8 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index dab8c472205..c1d19b434c2 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index d171334035e..de5ea860df8 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 6733bf955d1..0b175864d07 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class -out/production/module1/a/Module1_other.class +out/production/module1/a/Module1_aKt.class +out/production/module1/a/Module1_otherKt.class End of files Compiling files: module1/src/module1_a.kt @@ -16,14 +16,14 @@ module1/src/module1_other.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt End of files Cleaning output files: out/production/module3/c/CPackage.class -out/production/module3/c/Module3_c.class +out/production/module3/c/Module3_cKt.class End of files Compiling files: module3/src/module3_c.kt diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index c5045143b2a..a3ec0221636 100644 --- a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module3/c/CPackage.class -out/production/module3/c/Module3_c.class +out/production/module3/c/Module3_cKt.class End of files Compiling files: module3/src/module3_c.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log b/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log index 4b8f2ce15de..6780d784887 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Bar.class +out/production/module/test/BarKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/bar.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index 3231a7e0e4f..297cb32de76 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/b.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 3231a7e0e4f..297cb32de76 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/b.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index 8b44b97716e..e43e3fd039d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -19,4 +19,4 @@ out/production/module/test/Usage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 7d0f02c00a4..0a7519d35c5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index 0f0bb774f44..4e900cca87d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/a/A$foo$1.class -out/production/module/a/A.class +out/production/module/a/AKt$foo$1.class +out/production/module/a/AKt.class out/production/module/a/APackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index 5ea037dc95a..907d0503304 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,10 +6,10 @@ src/inline.kt End of files Cleaning output files: out/production/module/inline/Klass.class -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/inline.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index b3ac0aae802..4272704a502 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -4,7 +4,7 @@ End of files Compiling files: End of files Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -16,7 +16,7 @@ Compiling files: src/A.kt End of files Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 4ab778caaff..d41dbd731a4 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -6,8 +6,8 @@ src/class.kt End of files Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index bd1fda0f4ea..2a1d15653e6 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 24a112c76b4..7ce32de16cc 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ Expecting an expression Cleaning output files: -out/production/module/Fun.class +out/production/module/FunKt.class End of files Compiling files: src/fun.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index b328af8e3a5..56385078f3a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/Other.class +out/production/module/OtherKt.class out/production/module/_DefaultPackage.class End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class End of files Compiling files: src/usage.kt @@ -13,7 +13,7 @@ Expecting an expression Cleaning output files: -out/production/module/Fun.class +out/production/module/FunKt.class End of files Compiling files: src/fun.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index ed7c4295733..30584bfe5d7 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/Other.class -out/production/module/Usage.class +out/production/module/OtherKt.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -12,7 +12,7 @@ Expecting an expression Cleaning output files: -out/production/module/Fun.class +out/production/module/FunKt.class End of files Compiling files: src/fun.kt @@ -20,11 +20,11 @@ src/other.kt src/usage.kt End of files Cleaning output files: -out/production/module/Fun.class -out/production/module/Usage.class +out/production/module/FunKt.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class out/production/module/new/NewPackage.class -out/production/module/new/Other.class +out/production/module/new/OtherKt.class End of files Compiling files: src/fun.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log index 35b980c31f6..11dbb8afd85 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/B.class -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -17,13 +17,13 @@ src/usage.kt End of files Cleaning output files: out/production/module/A.class -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class -out/production/module/new/LikePart.class +out/production/module/new/LikePartKt.class out/production/module/new/NewPackage.class End of files Compiling files: src/fun.kt src/likePart.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index 5613d7fe110..dbf64919d99 100644 --- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun2.class +out/production/module/test/Fun2Kt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index 659c2dbb504..b794167acd1 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 225764441db..ac0a61f4a9c 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 9104d731416..76c39d54d0e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/A.class +out/production/module/AKt.class out/production/module/_DefaultPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 0ad6529ee73..06ca3a83e53 100644 --- a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index d65d2dd1b90..dc047fca05f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index d2714d00b68..42768060bc9 100644 --- a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index a61ed9b58f5..fc4e42b6812 100644 --- a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/bar/BarPackage.class -out/production/module/bar/C.class -out/production/module/foo/B.class +out/production/module/bar/CKt.class +out/production/module/foo/BKt.class out/production/module/foo/FooPackage.class End of files Compiling files: @@ -9,10 +9,10 @@ src/b.kt src/c.kt End of files Cleaning output files: -out/production/module/bar/B.class +out/production/module/bar/BKt.class out/production/module/bar/BarPackage.class -out/production/module/foo/A.class -out/production/module/foo/C.class +out/production/module/foo/AKt.class +out/production/module/foo/CKt.class out/production/module/foo/FooPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 397ce32b0a9..3f3c94dbdc7 100644 --- a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun2.class +out/production/module/test/Fun2Kt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 39f5f52c58e..bf3a483e16d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 8c8a8c204d6..e3b5d564721 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,16 +1,16 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test/A.class -out/production/module/test/B.class +out/production/module/test/AKt.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt src/b.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index 496646cc7ba..2181542318d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,8 +1,8 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files Compiling files: src/inline.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index 9b19bca18bb..1cf27b4c6cb 100644 --- a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/A$foo$X.class -out/production/module/test/A.class +out/production/module/test/AKt$foo$X.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 10ae55fd3fc..ebde80e9f8e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,14 +1,14 @@ Cleaning output files: -out/production/module/b/B2.class +out/production/module/b/B2Kt.class out/production/module/b/BPackage.class End of files Compiling files: src/a2.kt End of files Cleaning output files: -out/production/module/a/A1.class +out/production/module/a/A1Kt.class out/production/module/a/APackage.class -out/production/module/b/B1.class +out/production/module/b/B1Kt.class out/production/module/b/BPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log index 7d0f02c00a4..0a7519d35c5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index b66392a883c..8a474953e3a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -9,10 +9,10 @@ End of files Cleaning output files: out/production/module/klass/Klass.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/Klass.kt src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index e43a40c534a..0ecd5a944e3 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -10,4 +10,4 @@ out/production/module/test/Usage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 1cae0774d42..0cc5e507ad6 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -2,7 +2,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 1d91a602d06..2f4733727ff 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,17 +1,17 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/newName/B.class +out/production/module/newName/BKt.class out/production/module/newName/NewNamePackage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt src/b.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index 7b94d3dff7d..61712f9bd6d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,15 +8,15 @@ End of files Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 106bcb3840d..28ab0a7b660 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/other/Other.class +out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,9 +17,9 @@ End of files Cleaning output files: -out/production/module/other/Other.class +out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 3cb42f701db..d857bf6ace4 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,7 +17,7 @@ End of files Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index 4c1244a1678..b680e49a2b5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log index d12f6912c76..6df4bbf3181 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log @@ -1,17 +1,17 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/inline.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index 4c1244a1678..b680e49a2b5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index e265035bf65..8239640a50e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,4 +8,4 @@ End of files Compiling files: src/b.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index 0b5d2a4a551..eeeef4416c8 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test2/A.class +out/production/module/test2/AKt.class out/production/module/test2/Test2Package.class End of files Compiling files: @@ -18,9 +18,9 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test2/A.class +out/production/module/test2/AKt.class out/production/module/test2/Test2Package.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 14a46382a5e..80486282e0a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class End of files Compiling files: -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index e96c01ed671..e8a35afbc11 100644 --- a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Prop2.class +out/production/module/test/Prop2Kt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 55a4a60b263..e64dd3eaa61 100644 --- a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,8 +7,8 @@ src/fun.kt End of files Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 4148bf5ec4f..40b306dd41e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/foo/A.class +out/production/module/foo/AKt.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/bar/A.class +out/production/module/bar/AKt.class out/production/module/bar/BarPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index cd0fd87d4e0..e8060b3d718 100644 --- a/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -1,8 +1,8 @@ Cleaning output files: -out/production/module/outer/nested/Nested$main$1.class -out/production/module/outer/nested/Nested.class +out/production/module/outer/nested/NestedKt$main$1.class +out/production/module/outer/nested/NestedKt.class out/production/module/outer/nested/NestedPackage.class End of files Compiling files: src/nested.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index bee7dcaa35e..a72de562da8 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 0ad6529ee73..06ca3a83e53 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index 8fdaf9f5191..fa9d750b5e4 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -6,7 +6,7 @@ src/TheClass.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/UsageInKotlin.class +out/production/module/UsageInKotlinKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -14,4 +14,4 @@ src/usageInKotlin.kt End of files Compiling files: src/Usage.java -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index f0ef53e7b51..1a055b6661b 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -2,7 +2,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ src/Foo.kt src/usage.kt End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -22,7 +22,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index 83446a96350..c3734eac50b 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -8,7 +8,7 @@ src/TheClass.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/UsageInKotlin.class +out/production/module/UsageInKotlinKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -16,4 +16,4 @@ src/usageInKotlin.kt End of files Compiling files: src/Usage.java -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log index 088504b2487..a6aeb64d131 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -5,9 +5,9 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log index dcda0f53cf0..2e16f49a6e4 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/JavaClass.class -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -8,4 +8,4 @@ src/usage.kt End of files Compiling files: src/JavaClass.java -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index 00ecbd8664a..2f97d604bab 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -5,9 +5,9 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/WillBeResolvedToOther$willBeResolvedToOther$1.class -out/production/module/WillBeResolvedToOther.class -out/production/module/WillBeUnresolved.class +out/production/module/WillBeResolvedToOtherKt$willBeResolvedToOther$1.class +out/production/module/WillBeResolvedToOtherKt.class +out/production/module/WillBeUnresolvedKt.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index a0a8e61a9e3..d272966842a 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -5,10 +5,10 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: -out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class -out/production/module/UsageWithFunctionExpression.class -out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class -out/production/module/UsageWithFunctionLiteral.class +out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpressionKt.class +out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteralKt.class out/production/module/_DefaultPackage$sam$SamInterface$*.class out/production/module/_DefaultPackage.class End of files diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log index 93ab0f079cd..671ce9953c7 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -5,14 +5,14 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: -out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class -out/production/module/UsageWithFunctionExpression.class -out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class -out/production/module/UsageWithFunctionLiteral.class +out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpressionKt.class +out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteralKt.class out/production/module/_DefaultPackage$sam$SamInterface$*.class out/production/module/_DefaultPackage.class End of files Compiling files: src/usageWithFunctionExpression.kt src/usageWithFunctionLiteral.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index f3d10e07203..41ca845b2db 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/fun.kt End of files Cleaning output files: out/production/module/JavaUsage.class -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log index bee7dcaa35e..a72de562da8 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 1870e29e800..174d9b3de64 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -10,4 +10,4 @@ out/production/module/Usage.class End of files Compiling files: src/Usage.java -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 916d6b88043..ad53551c271 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log index bee7dcaa35e..a72de562da8 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index 94afef94da4..9ccd8296e83 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/b.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index 2b2f8cd5369..21340e6e03a 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -9,7 +9,7 @@ src/Usage.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index 8e7f8310761..66c2da28efa 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Prop.class +out/production/module/test/PropKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/plugins/annotation-collector/testData/collectToFile/inheritedTopLevel/annotations.txt b/plugins/annotation-collector/testData/collectToFile/inheritedTopLevel/annotations.txt index f74c7345e7e..b7fe5f88b2a 100644 --- a/plugins/annotation-collector/testData/collectToFile/inheritedTopLevel/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/inheritedTopLevel/annotations.txt @@ -1,6 +1,6 @@ p org.test 0 -d 0/TestPackage$inheritedTopLevel$* +d 0/InheritedTopLevelKt a org.jetbrains.annotations.NotNull 0 -m 0 0/TestPackage$inheritedTopLevel$* getTopLevelProperty +m 0 0/InheritedTopLevelKt getTopLevelProperty d 0/TestPackage m 0 0/TestPackage getTopLevelProperty