diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 4b008b2f888..b9275f1ebc5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -469,7 +469,7 @@ public abstract class MemberCodegen JvmPackagePartProvider(environment) } + packagePartProviderFactory = { module, content -> JvmPackagePartProvider(environment) } ) val moduleDescriptor = resolver.descriptorForModule(builtInModule) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 59ebcb65af9..cd982b1ecc0 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -242,10 +242,6 @@ public class KotlinCoreEnvironment private constructor( messageCollector.report(severity, message, CompilerMessageLocation.NO_LOCATION) } - public fun getJavaRoots() : List { - return javaRoots - } - companion object { private val APPLICATION_LOCK = Object() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index fbcf0ae2474..4565d6a5b37 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt @@ -130,7 +130,7 @@ public abstract class AnalyzerFacade { platformParameters: P, targetEnvironment: TargetEnvironment, delegateResolver: ResolverForProject = EmptyResolverForProject(), - packagePartProviderFactory: (M, ModuleContent) -> PackagePartProvider = { (m, c) -> PackagePartProvider.EMPTY } + packagePartProviderFactory: (M, ModuleContent) -> PackagePartProvider = { module, content -> PackagePartProvider.EMPTY } ): ResolverForProject { val storageManager = projectContext.storageManager fun createResolverForProject(): ResolverForProjectImpl { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java index 8f714c11f14..e32d0d03836 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java @@ -55,7 +55,6 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase { Class annotationClass = loadAnnotationClassQuietly(JvmAnnotationNames.KOTLIN_PACKAGE.asString()); assertTrue(aClass.isAnnotationPresent(annotationClass)); - assertTrue(aClass.isAnnotationPresent(annotationClass)); Annotation kotlinPackage = aClass.getAnnotation(annotationClass); @@ -80,7 +79,6 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase { Class annotationClass = loadAnnotationClassQuietly(JvmAnnotationNames.KOTLIN_FILE_FACADE.asString()); assertTrue(aClass.isAnnotationPresent(annotationClass)); - assertTrue(aClass.isAnnotationPresent(annotationClass)); Annotation kotlinPackage = aClass.getAnnotation(annotationClass); diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java index 839d08452f7..0b95f1f815f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java @@ -69,7 +69,6 @@ public final class DeserializedDescriptorResolver { @Nullable public JetScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) { - //TODO add assertion from readData(kotlinClass, CLASS); String[] data = readData(kotlinClass, KotlinClassHeader.Kind.FILE_FACADE); if (data != null) { //all classes are included in java scope diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt index 5c9b19f3ebf..a9c96fe8550 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt @@ -51,31 +51,11 @@ public class PackageParts(val packageFqName: String) { val parts = linkedSetOf() - override fun equals(other: Any?): Boolean { - if (other !is PackageParts) { - return false; - } + override fun equals(other: Any?) = + other is PackageParts && other.packageFqName == packageFqName && other.parts == parts - if (other.packageFqName != packageFqName) { - return false; - } - - if (other.parts.size() != parts.size()) { - return false; - } - - for (part in other.parts) { - if (!parts.contains(part)) { - return false; - } - } - - return true; - } - - override fun hashCode(): Int { - return packageFqName.hashCode() / 3 + parts.size() / 3 + (parts.firstOrNull()?.hashCode() ?: 0) / 3 - } + override fun hashCode() = + packageFqName.hashCode() * 31 + parts.hashCode() companion object { @jvmStatic public fun PackageParts.serialize(builder : JvmPackageTable.PackageTable.Builder) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackagePartProvider.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackagePartProvider.kt index 9742f1a887a..4dd3e166b66 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackagePartProvider.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackagePartProvider.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.descriptors interface PackagePartProvider { /** - * return packagepart simple names + * return package part simple names */ fun findPackageParts(packageFqName: String): List diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java index b3a7eff7220..d664ac70e38 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java @@ -32,7 +32,7 @@ public class ReflectionFactoryImpl extends ReflectionFactory { @Override public KPackage createKotlinPackage(Class javaClass) { - return createKotlinPackage(javaClass, "undefined"); + return createKotlinPackage(javaClass, "main"); } @Override diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt index 8976f419aa6..3a5d55a2dfe 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt @@ -92,7 +92,7 @@ public val KType.javaType: Type * See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#package-level-functions) * for more information. */ -@deprecated("After package refactoring it would be impossible to retrieve package by class") +@deprecated("After dropping old package facades it would be impossible to retrieve package by java class") public val Class<*>.kotlinPackage: KPackage? get() = if (getSimpleName().endsWith("Package") && getAnnotation(javaClass()) != null) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt index 9e62c4f3ef9..cd0022a1186 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt @@ -44,13 +44,13 @@ public object KotlinModuleMappingIndex : FileBasedIndexExtension { override fun read(`in`: DataInput): PackageParts? { val packageFqName = `in`.readUTF() - val facades = PackageParts(packageFqName) + val parts = PackageParts(packageFqName) val size = `in`.readInt() (1..size).forEach { - facades.parts.add(`in`.readUTF()) + parts.parts.add(`in`.readUTF()) } - return facades + return parts } override fun save(out: DataOutput, value: PackageParts?) { diff --git a/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log b/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log index 0debfa1295d..f8d028b551d 100644 --- a/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log +++ b/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log @@ -2,7 +2,7 @@ [INFO] Compiling Kotlin sources from [/src/main/kotlin] [INFO] Classes directory is /target/classes [INFO] Using kotlin annotations from /local-repo/org/jetbrains/kotlin/kotlin-jdk-annotations/0.1-SNAPSHOT/kotlin-jdk-annotations-0.1-SNAPSHOT.jar -[INFO] ModuleName is test-project +[INFO] Module name is test-project [INFO] PERF: INIT: Compiler initialized in LLL ms [INFO] PERF: ANALYZE: 1 files (2 lines) in LLL ms [INFO] PERF: GENERATE: 1 files (2 lines) in LLL ms \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java index cbd8676d6dd..49051ceb9d3 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java @@ -119,7 +119,7 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase