From 5d297c40fde5056fadc2abf15d6e75f04580ad96 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 22 Feb 2019 11:08:32 +0100 Subject: [PATCH] Minor, move ReifiedTypeParameterSubstitutionChecker to PlatformConfiguratorBase --- .../kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt | 2 -- .../jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt | 3 +-- .../jetbrains/kotlin/js/resolve/JsPlatformConfigurator.kt | 4 +--- .../resolve/konan/platform/KonanPlatformConfigurator.kt | 7 ++----- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt index 394bd32fd41..06d7e7b8b05 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.container.useInstance import org.jetbrains.kotlin.load.java.sam.JvmSamConversionTransformer import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl import org.jetbrains.kotlin.resolve.PlatformConfiguratorBase -import org.jetbrains.kotlin.resolve.calls.checkers.ReifiedTypeParameterSubstitutionChecker import org.jetbrains.kotlin.resolve.checkers.BigFunctionTypeAvailabilityChecker import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker import org.jetbrains.kotlin.resolve.jvm.* @@ -49,7 +48,6 @@ object JvmPlatformConfigurator : PlatformConfiguratorBase( UnsupportedSyntheticCallableReferenceChecker(), SuperCallWithDefaultArgumentsChecker(), ProtectedSyntheticExtensionCallChecker, - ReifiedTypeParameterSubstitutionChecker(), RuntimeAssertionsOnExtensionReceiverCallChecker, ApiVersionIsAtLeastArgumentsChecker, InconsistentOperatorFromJavaCallChecker diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt index ecb536be175..52a0e6e9734 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.resolve.checkers.* import org.jetbrains.kotlin.resolve.lazy.DelegationFilter import org.jetbrains.kotlin.types.DynamicTypesSettings - private val DEFAULT_DECLARATION_CHECKERS = listOf( DataClassDeclarationChecker(), ConstModifierChecker, @@ -46,7 +45,7 @@ private val DEFAULT_CALL_CHECKERS = listOf( UnderscoreUsageChecker, AssigningNamedArgumentToVarargChecker(), PrimitiveNumericComparisonCallChecker, LambdaWithSuspendModifierCallChecker, UselessElvisCallChecker(), ResultTypeWithNullableOperatorsChecker(), NullableVarargArgumentCallChecker, - NamedFunAsExpressionChecker, ContractNotAllowedCallChecker + NamedFunAsExpressionChecker, ContractNotAllowedCallChecker, ReifiedTypeParameterSubstitutionChecker() ) private val DEFAULT_TYPE_CHECKERS = emptyList() private val DEFAULT_CLASSIFIER_USAGE_CHECKERS = listOf( diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatformConfigurator.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatformConfigurator.kt index a75eee8f7a9..7a39184cc66 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatformConfigurator.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatformConfigurator.kt @@ -26,8 +26,7 @@ import org.jetbrains.kotlin.js.resolve.diagnostics.* import org.jetbrains.kotlin.resolve.DeclarationReturnTypeSanitizer import org.jetbrains.kotlin.resolve.OverloadFilter import org.jetbrains.kotlin.resolve.OverridesBackwardCompatibilityHelper -import org.jetbrains.kotlin.resolve.* -import org.jetbrains.kotlin.resolve.calls.checkers.ReifiedTypeParameterSubstitutionChecker +import org.jetbrains.kotlin.resolve.PlatformConfiguratorBase import org.jetbrains.kotlin.resolve.calls.components.SamConversionTransformer import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker import org.jetbrains.kotlin.resolve.deprecation.CoroutineCompatibilitySupport @@ -46,7 +45,6 @@ object JsPlatformConfigurator : PlatformConfiguratorBase( ExpectedActualDeclarationChecker() ), additionalCallCheckers = listOf( - ReifiedTypeParameterSubstitutionChecker(), JsModuleCallChecker, JsDynamicCallChecker, JsDefinedExternallyCallChecker diff --git a/konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt b/konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt index d84a68f3254..1e861813da7 100644 --- a/konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt +++ b/konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt @@ -9,10 +9,10 @@ import org.jetbrains.kotlin.builtins.PlatformToKotlinClassMap import org.jetbrains.kotlin.container.StorageComponentContainer import org.jetbrains.kotlin.container.useInstance import org.jetbrains.kotlin.resolve.* -import org.jetbrains.kotlin.resolve.calls.checkers.ReifiedTypeParameterSubstitutionChecker import org.jetbrains.kotlin.resolve.calls.components.SamConversionTransformer import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker +import org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker import org.jetbrains.kotlin.resolve.lazy.DelegationFilter import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes import org.jetbrains.kotlin.types.DynamicTypesSettings @@ -20,10 +20,7 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings object KonanPlatformConfigurator : PlatformConfiguratorBase( DynamicTypesSettings(), additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker()), - additionalCallCheckers = listOf( - org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker(), - ReifiedTypeParameterSubstitutionChecker() - ), + additionalCallCheckers = listOf(SuperCallWithDefaultArgumentsChecker()), additionalTypeCheckers = listOf(), additionalClassifierUsageCheckers = listOf(), additionalAnnotationCheckers = listOf(),