From c57441b51b65cfe72f57072978c5e03570023663 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 22 Sep 2014 11:43:30 +0400 Subject: [PATCH] Use '$' instead of '-' in package part class names Otherwise some tools break (e.g. CheckMethodAdapter in ASM, used in generic signature writer) because they expect class names to be Java identifiers. Some tests fixed, some will be fixed in future commits --- .../jetbrains/jet/codegen/inline/MethodInliner.java | 13 +++++++++---- .../lang/resolve/kotlin/PackagePartClassUtils.java | 2 +- .../kotlin/incremental/IncrementalCacheUtil.kt | 2 +- .../reflection/enclosing/lambda/lambdaInFunction.kt | 6 +++--- .../reflection/enclosing/lambda/lambdaInPackage.kt | 6 +++--- .../enclosing/lambda/lambdaInPropertyGetter.kt | 6 +++--- .../enclosing/lambda/lambdaInPropertySetter.kt | 7 +++---- .../codegen/bytecodeText/defaultDelegation.kt | 2 +- .../codegen/bytecodeText/inlineFromOtherModule.kt | 4 ++-- .../bytecodeText/topLevelFunWithDefaultArgs.kt | 4 ++-- .../bytecodeText/whenEnumOptimization/expression.kt | 1 - .../functionLiteralInTopLevel.kt | 1 - .../whenEnumOptimization/manyWhensWithinClass.kt | 1 - .../whenEnumOptimization/withoutElse.kt | 1 - .../topLevelMemberInvocation/extensionFunction/1.kt | 4 ++-- .../functionDifferentPackage/1.kt | 4 ++-- .../functionInMultiFilePackage/1.kt | 4 ++-- .../functionSamePackage/1.kt | 4 ++-- .../codegen/topLevelMemberInvocation/property/1.kt | 4 ++-- .../propertyWithGetter/1.kt | 4 ++-- .../property/deprecatedFlag/topLevelProperty.kt | 2 +- .../org/jetbrains/jet/codegen/InlineTestUtil.java | 12 ++++++++---- .../codegen/KotlinSyntheticClassAnnotationTest.java | 12 ++++++------ .../jetbrains/jet/codegen/OuterClassGenTest.java | 6 +++--- .../jet/lang/resolve/java/JvmClassName.java | 7 +++++++ .../PositionManagerLibraryClassFileSearcher.kt | 2 +- .../tinyApp/outs/delegatedPropertyInClass.out | 4 ++-- .../debugger/tinyApp/outs/frameExtensionFun.out | 4 ++-- idea/testData/debugger/tinyApp/outs/frameSimple.out | 4 ++-- .../AbstractKotlinEvaluateExpressionTest.kt | 2 +- .../jet/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- .../jet/jps/build/AbstractIncrementalJpsTest.kt | 8 +++++--- .../incremental/circularDependency/simple/build.log | 6 +++--- .../accessingFunctionsViaPackagePart/build.log | 4 ++-- .../accessingPropertiesViaField/build.log | 6 +++--- .../incremental/pureKotlin/allConstants/build.log | 4 ++-- .../incremental/pureKotlin/annotations/build.log | 2 +- .../pureKotlin/classInlineFunctionChanged/build.log | 2 +- .../incremental/pureKotlin/classRecreated/build.log | 4 ++-- .../pureKotlin/classSignatureChanged/build.log | 4 ++-- .../pureKotlin/classSignatureUnchanged/build.log | 2 +- .../pureKotlin/compilationErrorThenFixed/build.log | 2 +- .../pureKotlin/constantsUnchanged/build.log | 2 +- .../pureKotlin/defaultArguments/build.log | 2 +- .../pureKotlin/dependencyClassReferenced/build.log | 2 +- .../pureKotlin/filesExchangePackages/build.log | 6 +++--- .../pureKotlin/independentClasses/build.log | 2 +- .../inlineFunctionsCircularDependency/build.log | 6 +++--- .../pureKotlin/inlineFunctionsUnchanged/build.log | 2 +- .../pureKotlin/multiplePackagesModified/build.log | 6 +++--- .../pureKotlin/objectValChanged/build.log | 2 +- .../pureKotlin/ourClassReferenced/build.log | 4 ++-- .../pureKotlin/packageConstantChanged/build.log | 2 +- .../pureKotlin/packageFileAdded/build.log | 2 +- .../pureKotlin/packageFileChangedPackage/build.log | 4 ++-- .../packageFileChangedThenOtherRemoved/build.log | 6 +++--- .../pureKotlin/packageFileRemoved/build.log | 8 ++++---- .../pureKotlin/packageFilesChangedInTurn/build.log | 4 ++-- .../packageInlineFunctionAccessingField/build.log | 2 +- .../packageInlineFunctionChanged/build.log | 8 ++++---- .../packageInlineFunctionFromOurPackage/build.log | 2 +- .../pureKotlin/packageRecreated/build.log | 2 +- .../packageRecreatedAfterRenaming/build.log | 4 ++-- .../incremental/pureKotlin/packageRemoved/build.log | 6 +++--- .../pureKotlin/returnTypeChanged/build.log | 4 ++-- .../pureKotlin/simpleClassDependency/build.log | 2 +- .../pureKotlin/soleFileChangesPackage/build.log | 4 ++-- .../topLevelFunctionSameSignature/build.log | 2 +- .../pureKotlin/topLevelMembersInTwoFiles/build.log | 4 ++-- 69 files changed, 148 insertions(+), 135 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java index 2eb06564c88..9591de97661 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java @@ -22,6 +22,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.codegen.ClosureCodegen; import org.jetbrains.jet.codegen.StackValue; import org.jetbrains.jet.codegen.state.JetTypeMapper; +import org.jetbrains.jet.lang.resolve.java.JvmClassName; +import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; @@ -541,10 +543,12 @@ public class MethodInliner { return type; } - int i = type.indexOf('-'); - if (i >= 0) { - return type.substring(0, i); + JvmClassName name = JvmClassName.byInternalName(type); + String packageClassInternalName = PackageClassUtils.getPackageClassInternalName(name.getPackageFqName()); + if (type.startsWith(packageClassInternalName + '$')) { + return packageClassInternalName; } + return type; } @@ -552,7 +556,8 @@ public class MethodInliner { public RuntimeException wrapException(@NotNull Exception originalException, @NotNull MethodNode node, @NotNull String errorSuffix) { if (originalException instanceof InlineException) { return new InlineException(errorPrefix + ": " + errorSuffix, originalException); - } else { + } + else { return new InlineException(errorPrefix + ": " + errorSuffix + "\ncause: " + getNodeText(node), originalException); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java index 6bb4a4f7f50..f462fceb185 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java @@ -56,7 +56,7 @@ public class PackagePartClassUtils { String fileName = FileUtil.getNameWithoutExtension(PathUtil.getFileName(file.getName())); // path hashCode to prevent same name / different path collision - String srcName = facadeFqName.shortName().asString() + "-" + replaceSpecialSymbols(fileName) + "-" + Integer.toHexString( + String srcName = facadeFqName.shortName().asString() + "$" + replaceSpecialSymbols(fileName) + "$" + Integer.toHexString( getPathHashCode(file)); return facadeFqName.parent().child(Name.identifier(srcName)); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt index e17aef26a11..e5d356860de 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt @@ -24,7 +24,7 @@ import java.util.HashMap import java.io.File public fun IncrementalCache.getPackagesWithRemovedFiles(sourceFilesToCompile: Collection): Collection { - return getRemovedPackageParts(sourceFilesToCompile).map { it.getFqNameForClassNameWithoutDollars().parent() } + return getRemovedPackageParts(sourceFilesToCompile).map { it.getPackageFqName() } } public fun IncrementalCache.getRemovedPackageParts(sourceFilesToCompile: Collection): Collection { diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInFunction.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInFunction.kt index 2cfe91a8ce5..ed88fd10d2f 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInFunction.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInFunction.kt @@ -5,11 +5,11 @@ fun box(): String { val enclosingMethod = javaClass.getEnclosingMethod() if (enclosingMethod?.getName() != "box") return "method: $enclosingMethod" - val enclosingClass = javaClass.getEnclosingClass() - if (!enclosingClass!!.getName().startsWith("_DefaultPackage-lambdaInFunction-")) return "enclosing class: $enclosingClass" + val enclosingClass = javaClass.getEnclosingClass()!!.getName() + if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("lambdaInFunction")) return "enclosing class: $enclosingClass" val declaringClass = javaClass.getDeclaringClass() if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPackage.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPackage.kt index fe94a8e5e02..39d50c47b7b 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPackage.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPackage.kt @@ -1,8 +1,8 @@ val l: Any = {} fun box(): String { - val enclosingClass = l.javaClass.getEnclosingClass() - if (!enclosingClass!!.getName().startsWith("_DefaultPackage-lambdaInPackage-")) return "enclosing class: $enclosingClass" + val enclosingClass = l.javaClass.getEnclosingClass()!!.getName() + if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("lambdaInPackage")) return "enclosing class: $enclosingClass" val enclosingConstructor = l.javaClass.getEnclosingConstructor() if (enclosingConstructor != null) return "enclosing constructor found: $enclosingConstructor" @@ -14,4 +14,4 @@ fun box(): String { if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertyGetter.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertyGetter.kt index 14c4f735d0d..8b9f8a3ad79 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertyGetter.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertyGetter.kt @@ -6,11 +6,11 @@ fun box(): String { val enclosingMethod = l.javaClass.getEnclosingMethod() if (enclosingMethod?.getName() != "getL") return "method: $enclosingMethod" - val enclosingClass = l.javaClass.getEnclosingClass() - if (!enclosingClass!!.getName().startsWith("_DefaultPackage-lambdaInPropertyGetter-")) return "enclosing class: $enclosingClass" + val enclosingClass = l.javaClass.getEnclosingClass()!!.getName() + if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("lambdaInPropertyGetter")) return "enclosing class: $enclosingClass" val declaringClass = l.javaClass.getDeclaringClass() if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertySetter.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertySetter.kt index f92401b0678..f35710058d5 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertySetter.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertySetter.kt @@ -1,4 +1,3 @@ - var _l: Any = "" var l: Any @@ -13,11 +12,11 @@ fun box(): String { val enclosingMethod = l.javaClass.getEnclosingMethod() if (enclosingMethod?.getName() != "setL") return "method: $enclosingMethod" - val enclosingClass = l.javaClass.getEnclosingClass() - if (!enclosingClass!!.getName().startsWith("_DefaultPackage-lambdaInPropertySetter-")) return "enclosing class: $enclosingClass" + val enclosingClass = l.javaClass.getEnclosingClass()!!.getName() + if (!enclosingClass.startsWith("_DefaultPackage") || !enclosingClass.contains("lambdaInPropertySetter")) return "enclosing class: $enclosingClass" val declaringClass = l.javaClass.getDeclaringClass() if (declaringClass != null) return "anonymous function has a declaring class: $declaringClass" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/bytecodeText/defaultDelegation.kt b/compiler/testData/codegen/bytecodeText/defaultDelegation.kt index 786304e02ba..33cd85aeef1 100644 --- a/compiler/testData/codegen/bytecodeText/defaultDelegation.kt +++ b/compiler/testData/codegen/bytecodeText/defaultDelegation.kt @@ -5,4 +5,4 @@ fun simpleFoo(s: Int = 111) { } // 1 BIPUSH 111 -// 1 INVOKESTATIC foo/FooPackage-.*\.simpleFoo\$default \(II\)V \ No newline at end of file +// 1 INVOKESTATIC foo/FooPackage.+\.simpleFoo\$default \(II\)V diff --git a/compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt b/compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt index 0d4d499ae61..90aecc0039e 100644 --- a/compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt +++ b/compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt @@ -3,5 +3,5 @@ fun foo() { } // assert function will be inlined, and we assure that there are no calls via package part, but is call via package facade in inlined code -// 0 INVOKESTATIC kotlin\/KotlinPackage-[^-]+-[^-]+.getASSERTIONS_ENABLED \(\)Z -// 1 INVOKESTATIC kotlin\/KotlinPackage.getASSERTIONS_ENABLED \(\)Z \ No newline at end of file +// 0 INVOKESTATIC kotlin\/KotlinPackage.+\.getASSERTIONS_ENABLED \(\)Z +// 1 INVOKESTATIC kotlin\/KotlinPackage\.getASSERTIONS_ENABLED \(\)Z diff --git a/compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt b/compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt index f8d70b00bd0..c0542edf79c 100644 --- a/compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt +++ b/compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt @@ -1,4 +1,4 @@ fun foo(a: Int = 1) {} -//0 _DefaultPackage.foo -//3 INVOKESTATIC _DefaultPackage- +// 0 _DefaultPackage.foo +// 3 INVOKESTATIC _DefaultPackage.+ diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt index 4b158c5472b..d80530f0683 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt @@ -24,4 +24,3 @@ fun bar2(x : Season) : String { } // 2 TABLESWITCH -// 1 @_DefaultPackage-expression-.*\$WhenMappings\.class diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt index 065bf5213da..1e539c4f0f2 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt @@ -19,4 +19,3 @@ fun box() : String { } // 1 LOOKUPSWITCH -// 1 @_DefaultPackage-functionLiteralInTopLevel-[a-z0-9]+\$WhenMappings.class diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt index 5a4d8f18b2c..02b61c03e8c 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt @@ -33,4 +33,3 @@ class A { } // 2 TABLESWITCH -// 1 @abc/foo/A\$WhenMappings\.class diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt index 6b0960fc52a..9a3fa71921b 100644 --- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt +++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt @@ -28,4 +28,3 @@ fun bar2(x : Season) : String { } // 2 TABLESWITCH -// 1 @_DefaultPackage-withoutElse-.*\$WhenMappings\.class diff --git a/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt index d5b86d680c7..0459b9c2297 100644 --- a/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt +++ b/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt @@ -4,5 +4,5 @@ fun test2() { 1.test1() } -// 2 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test1 \(I\)V -// 1 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test2 \(\)V +// 2 INVOKESTATIC _DefaultPackage.+\.test1 \(I\)V +// 1 INVOKESTATIC _DefaultPackage.+\.test2 \(\)V diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt index 748a324778a..a858592c031 100644 --- a/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt +++ b/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt @@ -2,5 +2,5 @@ package a fun test1() {} -// 2 INVOKESTATIC a/APackage-1-[0-9a-f]+\.test1 \(\)V -// 1 INVOKESTATIC b/BPackage-2-[0-9a-f]+\.test2 \(\)V +// 2 INVOKESTATIC a/APackage.+\.test1 \(\)V +// 1 INVOKESTATIC b/BPackage.+\.test2 \(\)V diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/1.kt index 42283b72038..25a13df2ab7 100644 --- a/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/1.kt +++ b/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/1.kt @@ -1,4 +1,4 @@ fun test1() {} -// 2 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test1 \(\)V -// 1 INVOKESTATIC _DefaultPackage-2-[0-9a-f]+\.test2 \(\)V +// 2 INVOKESTATIC _DefaultPackage.+\.test1 \(\)V +// 1 INVOKESTATIC _DefaultPackage.+\.test2 \(\)V diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt index 1c152f19a23..077d97124e9 100644 --- a/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt +++ b/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt @@ -4,5 +4,5 @@ fun test2() { test1() } -// 2 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test1 \(\)V -// 1 INVOKESTATIC _DefaultPackage-1-[0-9a-f]+\.test2 \(\)V +// 2 INVOKESTATIC _DefaultPackage.+\.test1 \(\)V +// 1 INVOKESTATIC _DefaultPackage.+\.test2 \(\)V diff --git a/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt index 279ac944cd4..9d9b4763745 100644 --- a/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt +++ b/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt @@ -2,5 +2,5 @@ package a val prop = 1 -// 2 INVOKESTATIC a/APackage-1-[0-9a-f]+\.getProp \(\)I -// 1 GETSTATIC a/APackage-1-[0-9a-f]+\.prop \: I +// 2 INVOKESTATIC a/APackage.+\.getProp \(\)I +// 1 GETSTATIC a/APackage.+\.prop \: I diff --git a/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt index 812d59fb320..48a4d568490 100644 --- a/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt +++ b/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt @@ -5,5 +5,5 @@ val prop: Int = 0 return $prop + 1 } -// 2 INVOKESTATIC a/APackage-1-[0-9a-f]+\.getProp \(\)I -// 1 GETSTATIC a/APackage-1-[0-9a-f]+\.prop \: I +// 2 INVOKESTATIC a/APackage.+\.getProp \(\)I +// 1 GETSTATIC a/APackage.+\.prop \: I diff --git a/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt b/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt index 9fd83efd517..8ae476b827f 100644 --- a/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt +++ b/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt @@ -1,6 +1,6 @@ deprecated("") val test: Int = 0 // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: _DefaultPackage-topLevelProperty-, test +// TESTED_OBJECTS: _DefaultPackage$, test // IS_FULL_CONTAINING_CLASS_NAME: false // FLAGS: ACC_DEPRECATED, ACC_FINAL, ACC_STATIC diff --git a/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java b/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java index 42ffd52115f..6975a9a27f8 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java @@ -21,6 +21,9 @@ import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.OutputFile; import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.jet.lang.resolve.java.JvmClassName; +import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.tree.MethodNode; @@ -96,16 +99,17 @@ public class InlineTestUtil { public MethodVisitor visitMethod( int access, @NotNull String name, @NotNull String desc, String signature, String[] exceptions ) { + FqName classFqName = JvmClassName.byInternalName(className.get()).getFqNameForClassNameWithoutDollars(); + if (PackageClassUtils.isPackageClassFqName(classFqName)) { + return super.visitMethod(access, name, desc, signature, exceptions); + } + return new MethodNode(Opcodes.ASM4, access, name, desc, signature, exceptions) { @Override public void visitMethodInsn(int opcode, @NotNull String owner, String name, @NotNull String desc, boolean itf) { MethodInfo methodCall = new MethodInfo(owner, name, desc); if (inlinedMethods.contains(methodCall)) { MethodInfo fromCall = new MethodInfo(className.get(), this.name, this.desc); - //skip facades - if (methodCall.owner.startsWith(fromCall.owner + "-")) { - return; - } //skip delegation to trait impl from child class if (methodCall.owner.endsWith(JvmAbi.TRAIT_IMPL_SUFFIX) && !fromCall.owner.equals(methodCall.owner)) { diff --git a/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java b/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java index a3975c3ee6d..dd65996889e 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java @@ -44,7 +44,7 @@ public class KotlinSyntheticClassAnnotationTest extends CodegenTestCase { public void testPackagePart() { doTest("fun foo() = 42", - "-", + "$", PACKAGE_PART); } @@ -62,25 +62,25 @@ public class KotlinSyntheticClassAnnotationTest extends CodegenTestCase { public void testSamLambda() { doTest("val foo = Thread { }", - "$", + "$1", SAM_LAMBDA); } public void testCallableReferenceWrapper() { doTest("val f = String::get", - "$", + "$1", CALLABLE_REFERENCE_WRAPPER); } public void testLocalFunction() { doTest("fun foo() { fun bar() {} }", - "$", + "$1", LOCAL_FUNCTION); } public void testAnonymousFunction() { doTest("val f = {}", - "$", + "$1", ANONYMOUS_FUNCTION); } @@ -104,7 +104,7 @@ public class KotlinSyntheticClassAnnotationTest extends CodegenTestCase { public void testAnonymousObject() { doTest("val o = object {}", - "$", + "$1", ANONYMOUS_OBJECT); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java index 25294d6f05a..6a5bcf11175 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java @@ -71,17 +71,17 @@ public class OuterClassGenTest extends CodegenTestCase { } public void testObjectLiteralInPackageClass() throws Exception { - OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage-outerClassInfo-", null, null); + OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage$outerClassInfo$", null, null); doCustomTest("foo.FooPackage$packageObjectLiteral$1", expectedInfo, "outerClassInfo"); } public void testLocalClassInTopLevelFunction() throws Exception { - OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage-outerClassInfo-", "packageMethod", "(Lfoo/Foo;)V"); + OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage$outerClassInfo$", "packageMethod", "(Lfoo/Foo;)V"); doCustomTest("foo.FooPackage$packageMethod$PackageLocalClass", expectedInfo, "outerClassInfo"); } public void testLocalObjectInTopLevelFunction() throws Exception { - OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage-outerClassInfo-", "packageMethod", "(Lfoo/Foo;)V"); + OuterClassInfo expectedInfo = new OuterClassInfo("foo/FooPackage$outerClassInfo$", "packageMethod", "(Lfoo/Foo;)V"); doCustomTest("foo.FooPackage$packageMethod$PackageLocalObject", expectedInfo, "outerClassInfo"); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java index f80f95296e9..fd9bb0d754c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java @@ -81,6 +81,13 @@ public class JvmClassName { return fqName; } + @NotNull + public FqName getPackageFqName() { + int lastSlash = internalName.lastIndexOf("/"); + if (lastSlash == -1) return FqName.ROOT; + return new FqName(internalName.substring(0, lastSlash).replace('/', '.')); + } + @NotNull public String getInternalName() { return internalName; diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt index 6c53b1c6662..944ea55fae2 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -109,7 +109,7 @@ private fun findPackagePartFileNamesForElement(elementAt: JetElement): List) { // EXPRESSION: val1 + topVal1 // RESULT: 2: I - frame = main():9, FrameSimplePackage-@packagePartHASH {frameSimple} - static = static = frameSimple.FrameSimplePackage-@packagePartHASH + frame = main():9, FrameSimplePackage$@packagePartHASH {frameSimple} + static = static = frameSimple.FrameSimplePackage$@packagePartHASH field = topVal1: int = 1 local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} local = val1: int = 1 diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt index a2b3b696b67..19275ece351 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt @@ -228,7 +228,7 @@ public abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestB val descriptor: NodeDescriptorImpl = node.getDescriptor()!! if (descriptor is DefaultNodeDescriptor) return - val label = descriptor.getLabel()!!.replaceAll("-[\\w]*-[\\w|\\d]+", "-@packagePartHASH") + val label = descriptor.getLabel()!!.replaceAll("Package\\$[\\w]*\\$[0-9a-f]+", "Package\\$@packagePartHASH") if (label.endsWith(XDebuggerUIConstants.COLLECTING_DATA_MESSAGE)) return val curIndent = " ".repeat(indent) diff --git a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 684e1555258..fab5c5f1e39 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -413,7 +413,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC result.add(packagePartClassName) } else { - val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { result.add(packagePartClassName) @@ -432,7 +432,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC map.processKeysWithExistingMapping { key -> val packagePartClassName = map[key!!]!! - val packageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + val packageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() result.add(packageFqName) diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 408760e6c0c..4e6509593b8 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -241,9 +241,11 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { override fun logLine(message: String?) { fun String.replaceHashWithStar(): String { - val lastHyphen = this.lastIndexOf('-') - if (lastHyphen != -1 && substring(lastHyphen + 1).matches("[0-9a-f]{1,8}\\.class")) { - return substring(0, lastHyphen) + "-*.class" + if (this contains "Package$") { + val lastDollar = this.lastIndexOf('$') + if (lastDollar != -1 && substring(lastDollar + 1).matches("[0-9a-f]{1,8}\\.class")) { + return substring(0, lastDollar) + "$*.class" + } } return this } diff --git a/jps-plugin/testData/incremental/circularDependency/simple/build.log b/jps-plugin/testData/incremental/circularDependency/simple/build.log index ee01130e93f..03390944246 100644 --- a/jps-plugin/testData/incremental/circularDependency/simple/build.log +++ b/jps-plugin/testData/incremental/circularDependency/simple/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module2/b/BPackage-module2_b-*.class +out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class End of files Compiling files: @@ -7,9 +7,9 @@ module2/src/module2_b.kt End of files Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage-module1_a-*.class +out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class End of files Compiling files: module1/src/module1_a.kt -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index ee902811972..38c3e40467d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage-b-*.class -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 5e565b356f6..38c3e40467d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,6 +1,6 @@ - Cleaning output files: -out/production/module/test/TestPackage-b-*.class -out/production/module/test/TestPackage-usage-*.class +Cleaning output files: +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index 22f4d62f635..aec0fb80c88 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/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.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/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 3e90e7f7e51..830fd9d2ae7 100644 --- a/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-other-*.class +out/production/module/test/TestPackage$other$*.class out/production/module/test/TestPackage.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 41261841973..eafec833b17 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,7 +6,7 @@ src/inline.kt End of files Cleaning output files: out/production/module/inline/Klass.class -out/production/module/usage/UsagePackage-usage-*.class +out/production/module/usage/UsagePackage$usage$*.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index d59630c7ce7..c326658bdd5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -9,9 +9,9 @@ Compiling files: src/A.kt End of files Cleaning output files: -out/production/module/test/TestPackage-other-*.class +out/production/module/test/TestPackage$other$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 03df388cc2b..22a85136d38 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -5,9 +5,9 @@ Compiling files: src/class.kt End of files Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/usage.kt -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log index cc8924d4caa..5c686f1943a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log @@ -3,4 +3,4 @@ out/production/module/test/Klass.class End of files Compiling files: src/class.kt -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log index f4fb938c215..5a8dee5393d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage-usage-*.class +out/production/module/_DefaultPackage$usage$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 7e364968874..e7a3af58bd6 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/test/Klass$object.class out/production/module/test/Klass.class -out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 9fede6968ce..74e194ec93c 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage-a-*.class +out/production/module/_DefaultPackage$a$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 37112dda098..4e18829e5c5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.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 492218cc4a6..a135c67f323 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-c-*.class +out/production/module/bar/BarPackage$c$*.class out/production/module/bar/BarPackage.class -out/production/module/foo/FooPackage-b-*.class +out/production/module/foo/FooPackage$b$*.class out/production/module/foo/FooPackage.class End of files Compiling files: @@ -9,7 +9,7 @@ src/b.kt src/c.kt End of files Cleaning output files: -out/production/module/foo/FooPackage-a-*.class +out/production/module/foo/FooPackage$a$*.class out/production/module/foo/FooPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log b/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log index b33bb4d2a49..e4d8b80cbf7 100644 --- a/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log @@ -3,4 +3,4 @@ out/production/module/test/Foo.class End of files Compiling files: src/Foo.kt -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 41097177bde..624837de297 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.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/TestPackage-a-*.class -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index b01a631083b..31233b36691 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage$inline$*.class out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 914a8b69528..440fbd4f235 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/BPackage-b2-*.class +out/production/module/b/BPackage$b2$*.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/APackage-a1-*.class +out/production/module/a/APackage$a1$*.class out/production/module/a/APackage.class -out/production/module/b/BPackage-b1-*.class +out/production/module/b/BPackage$b1$*.class out/production/module/b/BPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log index 388e9c57d12..06bb7395a25 100644 --- a/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log @@ -3,4 +3,4 @@ out/production/module/test/Object.class End of files Compiling files: src/const.kt -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index ccf56d9e65b..6d8c334b1ef 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/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -9,7 +9,7 @@ End of files Cleaning output files: out/production/module/klass/Klass.class -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index dbdb31fbbf0..7cb5f4c6a48 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/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index f729fb6d124..df1bd14d31c 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/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.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 076add162ad..c6c913124c1 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index cd5cce6af7e..df9c0c9e3f5 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/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,13 +8,13 @@ End of files Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 7be687a676c..e6ae4266a50 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/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/other/OtherPackage-other-*.class +out/production/module/other/OtherPackage$other$*.class out/production/module/other/OtherPackage.class -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.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/other/OtherPackage-other-*.class +out/production/module/other/OtherPackage$other$*.class out/production/module/other/OtherPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 87d1614e2f1..31269315f90 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/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.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/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.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 7c79a56fe44..edacd856bb9 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log index 2b175459118..1d578c6afff 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/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage$inline$*.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/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage$inline$*.class out/production/module/inline/InlinePackage.class -out/production/module/usage/UsagePackage-usage-*.class +out/production/module/usage/UsagePackage$usage$*.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/inline.kt src/usage.kt -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index 7c79a56fe44..edacd856bb9 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index 73408189236..510015c0156 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/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index 7cb5ae7d3e1..fc781a99d2d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -11,7 +11,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test2/Test2Package-a-*.class +out/production/module/test2/Test2Package$a$*.class out/production/module/test2/Test2Package.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index c307a197264..449c2b5fdd7 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/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class End of files Compiling files: -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 22b74887df0..4b0a58ace9a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/TestPackage-fun-*.class +out/production/module/test/TestPackage$fun$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt End of files Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log b/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log index 2cfeb2be275..cd31e5c6326 100644 --- a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log @@ -4,4 +4,4 @@ out/production/module/test/Foo.class End of files Compiling files: src/Foo.kt -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 3c8fdd9ea17..74244f566b2 100644 --- a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/foo/FooPackage-a-*.class +out/production/module/foo/FooPackage$a$*.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt -End of files \ No newline at end of file +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index 4a956843b6d..560795823cd 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-fun-*.class +out/production/module/test/TestPackage$fun$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 6e7a5e35e00..4e18829e5c5 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/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files \ No newline at end of file +End of files