From b08ed14f669679689d8c387e7b2836656825489a Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 7 Oct 2016 20:14:05 +0300 Subject: [PATCH] Rename PlatformTypesMappedToKotlinChecker -> PlatformClassesMappedToKotlinChecker To prevent confusion with the term "platform type" which has gained a new meaning since this class was introduced --- ...Checker.java => PlatformClassesMappedToKotlinChecker.java} | 4 ++-- .../frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt | 2 +- .../src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/{PlatformTypesMappedToKotlinChecker.java => PlatformClassesMappedToKotlinChecker.java} (95%) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformTypesMappedToKotlinChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformClassesMappedToKotlinChecker.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformTypesMappedToKotlinChecker.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformClassesMappedToKotlinChecker.java index 754c207eaec..ed53b00c7d1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformTypesMappedToKotlinChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformClassesMappedToKotlinChecker.java @@ -28,8 +28,8 @@ import java.util.Collection; import static org.jetbrains.kotlin.diagnostics.Errors.PLATFORM_CLASS_MAPPED_TO_KOTLIN; -public class PlatformTypesMappedToKotlinChecker { - public static void checkPlatformTypesMappedToKotlin( +public class PlatformClassesMappedToKotlinChecker { + public static void checkPlatformClassesMappedToKotlin( @NotNull PlatformToKotlinClassMap platformToKotlinMap, @NotNull BindingTrace trace, @NotNull KtImportDirective importDirective, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index 31c37e6cfd2..a93baaffca4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -765,7 +765,7 @@ class TypeResolver( return qualifiedExpressionResolver.resolveDescriptorForType(userType, scope, trace, isDebuggerContext).apply { if (classifierDescriptor != null) { - PlatformTypesMappedToKotlinChecker.reportPlatformClassMappedToKotlin( + PlatformClassesMappedToKotlinChecker.reportPlatformClassMappedToKotlin( platformToKotlinClassMap, trace, userType, classifierDescriptor ) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt index 623cb3927e7..0899b52512f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import org.jetbrains.kotlin.psi.KtImportDirective import org.jetbrains.kotlin.psi.KtPsiUtil import org.jetbrains.kotlin.resolve.BindingTrace -import org.jetbrains.kotlin.resolve.PlatformTypesMappedToKotlinChecker +import org.jetbrains.kotlin.resolve.PlatformClassesMappedToKotlinChecker import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.ImportingScope @@ -88,7 +88,7 @@ class LazyImportResolver( directive, moduleDescriptor, traceForImportResolve, excludedImportNames, packageFragment )?.apply { if (!directive.isAllUnder) { - PlatformTypesMappedToKotlinChecker.checkPlatformTypesMappedToKotlin( + PlatformClassesMappedToKotlinChecker.checkPlatformClassesMappedToKotlin( platformToKotlinClassMap, traceForImportResolve, directive, getContributedDescriptors() ) }