diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java index 75fb23a5e1a..480f90a140b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java @@ -21,6 +21,7 @@ import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.fileClasses.JvmFileClassInfo; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; @@ -112,6 +113,8 @@ public class KotlinCodegenFacade { @NotNull Collection jetFiles, @NotNull CompilationErrorHandler errorHandler ) { + // We do not really generate package class, but use old package fqName to identify package in module-info. + //FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(packageFqName); PackageCodegen codegen = state.getFactory().forPackage(packageFqName, jetFiles); codegen.generate(errorHandler); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index 275d97bf757..442a4d2318d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -49,12 +49,12 @@ public class PackageCodegen { public PackageCodegen( @NotNull GenerationState state, @NotNull Collection files, - @NotNull FqName fqName + @NotNull FqName packageFqName ) { this.state = state; this.files = files; - this.packageFragment = getOnlyPackageFragment(fqName); - packageParts = new PackageParts(fqName.asString()); + this.packageFragment = getOnlyPackageFragment(packageFqName); + packageParts = new PackageParts(packageFqName.asString()); } public void generate(@NotNull CompilationErrorHandler errorHandler) { @@ -124,14 +124,14 @@ public class PackageCodegen { } @Nullable - private PackageFragmentDescriptor getOnlyPackageFragment(@NotNull FqName expectedFqName) { + private PackageFragmentDescriptor getOnlyPackageFragment(@NotNull FqName expectedPackageFqName) { SmartList fragments = new SmartList(); for (JetFile file : files) { PackageFragmentDescriptor fragment = state.getBindingContext().get(BindingContext.FILE_TO_PACKAGE_FRAGMENT, file); assert fragment != null : "package fragment is null for " + file + "\n" + file.getText(); - assert expectedFqName.equals(fragment.getFqName()) : - "expected package fq name: " + expectedFqName + ", actual: " + fragment.getFqName(); + assert expectedPackageFqName.equals(fragment.getFqName()) : + "expected package fq name: " + expectedPackageFqName + ", actual: " + fragment.getFqName(); if (!fragments.contains(fragment)) { fragments.add(fragment); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt index 0502d005c29..c2a050d275e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt @@ -56,7 +56,7 @@ public fun FunctionDescriptor.getClassFilePath(typeMapper: JetTypeMapper, cache: kotlinClass.file.canonicalPath!! } else -> { - val implementationOwnerType = typeMapper.mapOwner(this) + val implementationOwnerType = typeMapper.mapImplementationOwner(this) val className = implementationOwnerType.internalName cache.getClassFilePath(className) } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index d67ab7a6adf..b57f402b791 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -147,13 +147,23 @@ public class JetTypeMapper { @NotNull public Type mapOwner(@NotNull DeclarationDescriptor descriptor) { + return mapOwner(descriptor, true); + } + + public Type mapImplementationOwner(@NotNull DeclarationDescriptor descriptor) { + return mapOwner(descriptor, false); + } + + @NotNull + public Type mapOwner(@NotNull DeclarationDescriptor descriptor, boolean publicFacade) { if (isLocalFunction(descriptor)) { return asmTypeForAnonymousClass(bindingContext, (FunctionDescriptor) descriptor); } DeclarationDescriptor container = descriptor.getContainingDeclaration(); if (container instanceof PackageFragmentDescriptor) { - return Type.getObjectType(internalNameForPackageMemberOwner((CallableMemberDescriptor) descriptor)); + String packageMemberOwner = internalNameForPackageMemberOwner((CallableMemberDescriptor) descriptor, publicFacade); + return Type.getObjectType(packageMemberOwner); } else if (container instanceof ClassDescriptor) { return mapClass((ClassDescriptor) container); @@ -190,7 +200,7 @@ public class JetTypeMapper { CallableMemberDescriptor directMember = getDirectMember(descriptor); if (directMember instanceof DeserializedCallableMemberDescriptor) { - String facadeFqName = getPackageMemberOwnerInternalName((DeserializedCallableMemberDescriptor) directMember); + String facadeFqName = getPackageMemberOwnerInternalName((DeserializedCallableMemberDescriptor) directMember, publicFacade); if (facadeFqName != null) return facadeFqName; } @@ -261,7 +271,7 @@ public class JetTypeMapper { } @Nullable - private String getPackageMemberOwnerInternalName(@NotNull DeserializedCallableMemberDescriptor descriptor) { + private String getPackageMemberOwnerInternalName(@NotNull DeserializedCallableMemberDescriptor descriptor, boolean publicFacade) { DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); assert containingDeclaration instanceof PackageFragmentDescriptor : "Not a top-level member: " + descriptor; @@ -270,7 +280,9 @@ public class JetTypeMapper { return null; } - return JvmClassName.byClassId(containingClasses.getFacadeClassId()).getInternalName(); + ClassId ownerClassId = publicFacade ? containingClasses.getFacadeClassId() + : containingClasses.getImplClassId(); + return JvmClassName.byClassId(ownerClassId).getInternalName(); } private static final ClassId FAKE_CLASS_ID_FOR_BUILTINS = ClassId.topLevel(new FqName("kotlin.KotlinPackage")); diff --git a/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.txt b/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.txt index 31666333918..eb73fe9a8e6 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.txt +++ b/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.txt @@ -23,16 +23,8 @@ @kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass Anno @kotlin.jvm.internal.KotlinFileFacade DefaultTargetsKt { - @Anno field p2: int - public method getP(): int - public method getP2(): int + final @Anno field p2: int method (): void -} - -@java.lang.Deprecated @kotlin.jvm.internal.KotlinPackage _DefaultPackage { - public synthetic field $kotlinPackage: kotlin.reflect.KPackage - public synthetic field $moduleName: java.lang.String - method (): void - public @kotlin.jvm.internal.KotlinDelegatedMethod method getP(): int - public @kotlin.jvm.internal.KotlinDelegatedMethod method getP2(): int -} + public final method getP(): int + public final method getP2(): int +} \ No newline at end of file diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/PackageClassUtils.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/PackageClassUtils.java index 885f2e9fd4d..43ec5bc1a50 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/PackageClassUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/PackageClassUtils.java @@ -52,9 +52,4 @@ public final class PackageClassUtils { public static ClassId getPackageClassId(@NotNull FqName packageFQN) { return new ClassId(packageFQN, Name.identifier(getPackageClassName(packageFQN))); } - - @NotNull - public static String getPackageClassInternalName(@NotNull FqName packageFQN) { - return JvmClassName.byFqNameWithoutInnerClasses(getPackageClassFqName(packageFQN)).getInternalName(); - } } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 1e462e4f7c9..d7aeaf112a9 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -67,6 +67,7 @@ public class IncrementalCacheImpl( val PROTO_MAP = "proto" val CONSTANTS_MAP = "constants" val INLINE_FUNCTIONS = "inline-functions" + val PACKAGE_PARTS = "package-parts" val MULTIFILE_CLASS_FACADES = "multifile-class-facades" val MULTIFILE_CLASS_PARTS = "multifile-class-parts" val SOURCE_TO_CLASSES = "source-to-classes" @@ -91,11 +92,11 @@ public class IncrementalCacheImpl( private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile)) private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile)) + private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile)) private val multifileClassFacadeMap = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile)) private val multifileClassPartMap = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile)) private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile)) private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile)) - // TODO: can be removed? private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile)) private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile)) @@ -177,7 +178,8 @@ public class IncrementalCacheImpl( header.isCompatiblePackageFacadeKind() -> protoMap.process(kotlinClass, isPackage = true) header.isCompatibleFileFacadeKind() -> { - assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } + assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } + packagePartMap.addPackagePart(className) protoMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass) + @@ -193,7 +195,8 @@ public class IncrementalCacheImpl( inlineFunctionsMap.process(kotlinClass) } header.isCompatibleMultifileClassPartKind() -> { - assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" } + assert(sourceFiles.size() == 1) { "Multifile class part from several source files: $sourceFiles" } + packagePartMap.addPackagePart(className) multifileClassPartMap.add(className.internalName, header.multifileClassName!!) protoMap.process(kotlinClass, isPackage = true) + @@ -233,6 +236,7 @@ public class IncrementalCacheImpl( dirtyClasses.forEach { protoMap.remove(it) + packagePartMap.remove(it) multifileClassFacadeMap.remove(it) multifileClassPartMap.remove(it) constantsMap.remove(it) @@ -243,11 +247,10 @@ public class IncrementalCacheImpl( } override fun getObsoletePackageParts(): Collection { - return emptyList() -// val obsoletePackageParts = -// dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } -// KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}") -// return obsoletePackageParts + val obsoletePackageParts = + dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } + KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}") + return obsoletePackageParts } override fun getPackagePartData(fqName: String): JvmPackagePartProto? { @@ -520,6 +523,21 @@ public class IncrementalCacheImpl( value.dumpMap { java.lang.Long.toHexString(it) } } + private inner class PackagePartMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { + public fun addPackagePart(className: JvmClassName) { + storage[className.internalName] = true + } + + public fun remove(className: JvmClassName) { + storage.remove(className.internalName) + } + + public fun isPackagePart(className: JvmClassName): Boolean = + className.internalName in storage + + override fun dumpValue(value: Boolean) = "" + } + private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { public fun add(facadeName: JvmClassName, partNames: List) { storage[facadeName.internalName] = partNames diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt index 9a002b05951..007e8d0db17 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt @@ -59,13 +59,13 @@ internal class LazyStorage( val keys: Collection get() = getStorageIfExists()?.allKeysWithExistingMapping ?: listOf() - fun contains(key: K): Boolean = + operator fun contains(key: K): Boolean = getStorageIfExists()?.containsMapping(key) ?: false - fun get(key: K): V? = + operator fun get(key: K): V? = getStorageIfExists()?.get(key) - fun set(key: K, value: V) { + operator fun set(key: K, value: V) { getStorageOrCreateNew().put(key, value) } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index fca9885dc30..d6a6ae7a97d 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -43,9 +43,9 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } - @TestMetadata("classToPackageFacade") - public void testClassToPackageFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/"); + @TestMetadata("classToFileFacade") + public void testClassToFileFacade() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/"); doTest(fileName); } diff --git a/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/new.kt b/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/new.kt similarity index 100% rename from jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/new.kt rename to jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/new.kt diff --git a/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/old.kt b/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/old.kt similarity index 100% rename from jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/old.kt rename to jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/old.kt diff --git a/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out b/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/result.out similarity index 63% rename from jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out rename to jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/result.out index 2d7f4a601b2..f20b90a9fb8 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/result.out @@ -1,3 +1,3 @@ REMOVED: class MainKt$Companion.class +REMOVED: class TestPackage.class changes in test/MainKt: CLASS_SIGNATURE -changes in test/TestPackage: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out b/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out index ea61b532d55..aeacc916ed4 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out @@ -1,3 +1,3 @@ ADDED: class MainKt$Companion.class +ADDED: class TestPackage.class changes in test/MainKt: CLASS_SIGNATURE -changes in test/TestPackage: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out b/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out index 7868fd3e24c..6408bf25bd5 100644 --- a/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out +++ b/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out @@ -1,4 +1,3 @@ -changes in test/TestPackage: NONE skip test/Utils changes in test/Utils__Main1Kt: MEMBERS [publicAddedFun1] diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out b/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out index 2b72c17b8c9..f1d7bb25ec4 100644 --- a/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out +++ b/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out @@ -1,2 +1 @@ changes in test/MainKt: NONE -changes in test/TestPackage: NONE diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out b/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out index 78f2014d8d6..44a87ed54f8 100644 --- a/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out +++ b/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out @@ -1,3 +1,2 @@ changes in test/MainKt: MEMBERS [addedFun, addedVal, changedFun, changedVal, removedFun, removedVal] -changes in test/TestPackage: NONE diff --git a/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out b/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out index 2b72c17b8c9..f1d7bb25ec4 100644 --- a/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out +++ b/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out @@ -1,2 +1 @@ changes in test/MainKt: NONE -changes in test/TestPackage: NONE diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index 28e47e17c31..3b32ed64b7a 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/Module1_aKt.class -out/production/module1/test/TestPackage.class End of files Compiling files: module1/src/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index b7aa90ed99f..39074c74d70 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 0a36e429697..fd4b25b3281 100644 --- a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/Module1_constKt.class -out/production/module1/test/TestPackage.class End of files Compiling files: module1/src/module1_const.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index d83166dbc16..791a5274399 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineKt.class End of files Compiling files: @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageKt.class -out/production/module2/usage/UsagePackage.class End of files Compiling files: module2/src/module2_usage.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log index e58786bb51a..a5103f47632 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineFKt.class End of files Compiling files: @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageFKt.class -out/production/module2/usage/UsagePackage.class End of files Compiling files: module2/src/module2_usageF.kt @@ -18,7 +16,6 @@ End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineGKt.class End of files Compiling files: @@ -27,7 +24,6 @@ End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageGKt.class -out/production/module2/usage/UsagePackage.class End of files Compiling files: module2/src/module2_usageG.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index e41875375b3..c1cc4371b80 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: @@ -9,7 +8,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index b50d1ef170e..d8abebfacd9 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index e41875375b3..c1cc4371b80 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: @@ -9,7 +8,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index cbcb127580d..1a3419a31d0 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: @@ -8,7 +7,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: @@ -16,7 +14,6 @@ module2/src/module2_b.kt End of files Cleaning output files: out/production/module3/META-INF/module3.kotlin_module -out/production/module3/c/CPackage.class out/production/module3/c/Module3_cKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index 17c93731c9a..231ec872217 100644 --- a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: @@ -9,7 +8,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module3/META-INF/module3.kotlin_module -out/production/module3/c/CPackage.class out/production/module3/c/Module3_cKt.class End of files Compiling files: @@ -17,7 +15,6 @@ module3/src/module3_c.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index f6d869802f6..e6382637768 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log index 7f7b03e5656..0ec1f516f0d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: @@ -11,13 +10,9 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class -out/production/module/other/OtherPackage.class out/production/module/test/AKt.class -out/production/module/test/TestPackage.class -out/production/module/test/UsageKt.class End of files Compiling files: src/a.kt src/other.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 f6d869802f6..e6382637768 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.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 d7f5b678069..d06d82dfad0 100644 --- a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt @@ -11,7 +10,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index aea6b8eb09c..05305b4fbc1 100644 --- a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module 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: src/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index 66ea0c9264b..d9c7184cdc5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -7,7 +7,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index 7bfb2824b7b..e0121953e8d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -6,7 +6,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt @@ -19,7 +18,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 5b708acde85..4af27f55f39 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -6,7 +6,6 @@ src/class.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index 608d27e154b..b5bba6d6639 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index b86cc3d98f3..a2d97b25cad 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt @@ -10,10 +9,6 @@ COMPILATION FAILED Expecting an expression -Cleaning output files: -out/production/module/FunKt.class -End of files Compiling files: -src/fun.kt src/usage.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index 9fec192fafc..c40d007ecf8 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -12,10 +12,13 @@ COMPILATION FAILED Expecting an expression +Compiling files: +src/usage.kt +End of files Cleaning output files: out/production/module/FunKt.class +out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/fun.kt -src/usage.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index 568e98b633e..3baa953b9de 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/OtherKt.class out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/other.kt @@ -12,24 +11,14 @@ COMPILATION FAILED Expecting an expression -Cleaning output files: -out/production/module/FunKt.class -End of files Compiling files: -src/fun.kt src/other.kt src/usage.kt End of files Cleaning output files: out/production/module/FunKt.class out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class -out/production/module/new/NewPackage.class -out/production/module/new/OtherKt.class End of files Compiling files: src/fun.kt -src/other.kt -src/usage.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log index 707e820c744..7b1f40c1e02 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/B.class out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/other.kt @@ -20,9 +19,7 @@ Cleaning output files: out/production/module/A.class out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class out/production/module/new/LikePartKt.class -out/production/module/new/NewPackage.class End of files Compiling files: src/fun.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index d510d134860..03a0bbef9ef 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 5dd5778c4da..34e9b8168a2 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -3,7 +3,6 @@ out/production/module/META-INF/module.kotlin_module 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 diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 83f507ec501..2afa4c79cd7 100644 --- a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index 0c625ec403a..9675632dd89 100644 --- a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -1,14 +1,12 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module 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/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 56ddebe1997..8581a0c52c8 100644 --- a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -5,7 +5,10 @@ End of files Compiling files: src/fun2.kt End of files -COMPILATION FAILED -Platform declaration clash: The following declarations have the same JVM signature (function()V): - fun function(): kotlin.Unit - fun function(): kotlin.Unit \ No newline at end of file +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Fun1Kt.class +End of files +Compiling files: +src/fun1.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 1610391fa42..693a52e4076 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 4fc890074a5..a494ecda26d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt @@ -17,7 +15,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index a54e1398ea7..d1fcb39ec95 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log index 387aadf985d..004b241bfbd 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log @@ -1,14 +1,12 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module 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/META-INF/module.kotlin_module -out/production/module/usage/UsagePackage.class out/production/module/usage/UseGKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log index c881d0f9efe..ac2a1edc839 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log @@ -1,14 +1,12 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module 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/META-INF/module.kotlin_module -out/production/module/usage/UsagePackage.class out/production/module/usage/UsesGKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index a1d5fac9789..8bcb920f9f5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module 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: src/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log index 50ccb081084..a92e18853c5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log @@ -4,7 +4,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class out/production/module/test/Test__BKt.class End of files @@ -15,7 +14,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log index 82b2f80c31e..a9a6b9d26d9 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__BKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log index 8366c68cc13..3e38eacb915 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__BKt.class End of files Compiling files: @@ -10,7 +9,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log index 64f2485efca..5d71ad8f098 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log index 9e245d73c4a..18aa43b6fc9 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class End of files Compiling files: @@ -15,7 +14,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test2/Test2.class -out/production/module/test2/Test2Package.class out/production/module/test2/Test2__AKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index 6330ba2d73d..f6db1281cca 100644 --- a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt @@ -12,7 +11,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/klass/Klass.class out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/Klass.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index 3e12fb327e1..e2f10970eb7 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index e72ed20e75d..63886b2e9de 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -4,7 +4,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 9256b8b2c7b..3bf6a00fbf0 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,19 +1,14 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module 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/META-INF/module.kotlin_module -out/production/module/newName/BKt.class -out/production/module/newName/NewNamePackage.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 \ 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 c3202a992c2..6d48cad7fb8 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt @@ -11,14 +10,12 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module 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/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 756a5208a1e..201a5da3f4d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt @@ -11,7 +10,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt @@ -21,7 +19,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index 64f2485efca..5d71ad8f098 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log b/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log index a9c8fe4ddc2..5c549fedfb3 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/Utils.class out/production/module/test/Utils__Pkg1Kt.class out/production/module/test/Utils__Pkg2Kt.class diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log index 4c132408b65..86929627da9 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/Utils.class out/production/module/test/Utils__Pkg1Kt.class out/production/module/test/Utils__Pkg2Kt.class diff --git a/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log index ed1502ec2a6..6aa345e8bd2 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/PkgKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/pkg.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index 447eefc6d66..f03973ae191 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index e9ec0e2d294..e0e7540f091 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,15 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module 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/META-INF/module.kotlin_module -out/production/module/test2/AKt.class -out/production/module/test2/Test2Package.class End of files Compiling files: src/a.kt @@ -22,7 +13,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test2/AKt.class -out/production/module/test2/Test2Package.class End of files Compiling files: src/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 031eab48aa7..58112c0c033 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Cleaning output files: out/production/module/test/BKt.class diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 03c96004241..6314d92d2ad 100644 --- a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -5,7 +5,10 @@ End of files Compiling files: src/prop2.kt End of files -COMPILATION FAILED -Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): - fun (): kotlin.Int - fun (): kotlin.Int \ No newline at end of file +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Prop1Kt.class +End of files +Compiling files: +src/prop1.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index 7da9e935797..e3f3aac4243 100644 --- a/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module 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 diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index 29261260d2e..6d42272706d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 83f507ec501..2afa4c79cd7 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log index 992db6b386d..4827d2f4878 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: @@ -10,10 +9,6 @@ COMPILATION FAILED Cannot access 'foo': it is 'private' in file -Cleaning output files: -out/production/module/test/FooKt.class -End of files Compiling files: -src/foo.kt src/usage.kt -End of files +End of files \ No newline at end of file