From 01fd3905be298890b9673ad4e61782e0b32efe21 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 21 Oct 2015 18:45:08 +0300 Subject: [PATCH] Minor. Fix typo in package name: typeEnhacement -> typeEnhancement --- .../kotlin/synthetic/SamAdapterFunctionsScope.kt | 2 +- .../java/lazy/descriptors/LazyJavaClassMemberScope.kt | 2 +- .../kotlin/load/java/lazy/descriptors/LazyJavaScope.kt | 2 +- .../signatureEnhancement.kt | 2 +- .../typeEnhancement.kt | 10 +++++----- .../typeQualifiers.kt | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) rename core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/{typeEnhacement => typeEnhancement}/signatureEnhancement.kt (97%) rename core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/{typeEnhacement => typeEnhancement}/typeEnhancement.kt (95%) rename core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/{typeEnhacement => typeEnhancement}/typeQualifiers.kt (94%) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt index 9a8bdbe6cc6..182a14d47be 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.load.java.sam.SingleAbstractMethodUtils -import org.jetbrains.kotlin.load.java.typeEnhacement.enhanceSignature +import org.jetbrains.kotlin.load.java.typeEnhancement.enhanceSignature import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.descriptorUtil.parentsWithSelf diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt index 57e144f4f44..d0322e1c75f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.load.java.structure.JavaArrayType import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.java.structure.JavaConstructor import org.jetbrains.kotlin.load.java.structure.JavaMethod -import org.jetbrains.kotlin.load.java.typeEnhacement.enhanceSignatures +import org.jetbrains.kotlin.load.java.typeEnhancement.enhanceSignatures import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorFactory import org.jetbrains.kotlin.resolve.DescriptorUtils diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt index 93fbdb52971..4fc4ec865ec 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.load.java.structure.JavaArrayType import org.jetbrains.kotlin.load.java.structure.JavaField import org.jetbrains.kotlin.load.java.structure.JavaMethod import org.jetbrains.kotlin.load.java.structure.JavaValueParameter -import org.jetbrains.kotlin.load.java.typeEnhacement.enhanceSignatures +import org.jetbrains.kotlin.load.java.typeEnhancement.enhanceSignatures import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude.NonExtensions diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/signatureEnhancement.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt similarity index 97% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/signatureEnhancement.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt index f884655aa8e..1e92171fbcd 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/signatureEnhancement.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.typeEnhacement +package org.jetbrains.kotlin.load.java.typeEnhancement import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/typeEnhancement.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt similarity index 95% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/typeEnhancement.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt index 943979101c4..865331d97dd 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/typeEnhancement.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.typeEnhacement +package org.jetbrains.kotlin.load.java.typeEnhancement import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptor @@ -23,10 +23,10 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationWithTarget import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.annotations.CompositeAnnotations import org.jetbrains.kotlin.load.java.JvmAnnotationNames -import org.jetbrains.kotlin.load.java.typeEnhacement.MutabilityQualifier.MUTABLE -import org.jetbrains.kotlin.load.java.typeEnhacement.MutabilityQualifier.READ_ONLY -import org.jetbrains.kotlin.load.java.typeEnhacement.NullabilityQualifier.NOT_NULL -import org.jetbrains.kotlin.load.java.typeEnhacement.NullabilityQualifier.NULLABLE +import org.jetbrains.kotlin.load.java.typeEnhancement.MutabilityQualifier.MUTABLE +import org.jetbrains.kotlin.load.java.typeEnhancement.MutabilityQualifier.READ_ONLY +import org.jetbrains.kotlin.load.java.typeEnhancement.NullabilityQualifier.NOT_NULL +import org.jetbrains.kotlin.load.java.typeEnhancement.NullabilityQualifier.NULLABLE import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.types.* diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/typeQualifiers.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeQualifiers.kt similarity index 94% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/typeQualifiers.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeQualifiers.kt index 96b3256c1f8..32508c68a7d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/typeQualifiers.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeQualifiers.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.typeEnhacement +package org.jetbrains.kotlin.load.java.typeEnhancement import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.load.java.JvmAnnotationNames -import org.jetbrains.kotlin.load.java.typeEnhacement.MutabilityQualifier.MUTABLE -import org.jetbrains.kotlin.load.java.typeEnhacement.MutabilityQualifier.READ_ONLY -import org.jetbrains.kotlin.load.java.typeEnhacement.NullabilityQualifier.NOT_NULL -import org.jetbrains.kotlin.load.java.typeEnhacement.NullabilityQualifier.NULLABLE +import org.jetbrains.kotlin.load.java.typeEnhancement.MutabilityQualifier.MUTABLE +import org.jetbrains.kotlin.load.java.typeEnhancement.MutabilityQualifier.READ_ONLY +import org.jetbrains.kotlin.load.java.typeEnhancement.NullabilityQualifier.NOT_NULL +import org.jetbrains.kotlin.load.java.typeEnhancement.NullabilityQualifier.NULLABLE import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.types.KotlinType