Minor, move ReifiedTypeParameterSubstitutionChecker to PlatformConfiguratorBase
This commit is contained in:
-2
@@ -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.JvmSamConversionTransformer
|
||||||
import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl
|
import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl
|
||||||
import org.jetbrains.kotlin.resolve.PlatformConfiguratorBase
|
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.BigFunctionTypeAvailabilityChecker
|
||||||
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
|
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
|
||||||
import org.jetbrains.kotlin.resolve.jvm.*
|
import org.jetbrains.kotlin.resolve.jvm.*
|
||||||
@@ -49,7 +48,6 @@ object JvmPlatformConfigurator : PlatformConfiguratorBase(
|
|||||||
UnsupportedSyntheticCallableReferenceChecker(),
|
UnsupportedSyntheticCallableReferenceChecker(),
|
||||||
SuperCallWithDefaultArgumentsChecker(),
|
SuperCallWithDefaultArgumentsChecker(),
|
||||||
ProtectedSyntheticExtensionCallChecker,
|
ProtectedSyntheticExtensionCallChecker,
|
||||||
ReifiedTypeParameterSubstitutionChecker(),
|
|
||||||
RuntimeAssertionsOnExtensionReceiverCallChecker,
|
RuntimeAssertionsOnExtensionReceiverCallChecker,
|
||||||
ApiVersionIsAtLeastArgumentsChecker,
|
ApiVersionIsAtLeastArgumentsChecker,
|
||||||
InconsistentOperatorFromJavaCallChecker
|
InconsistentOperatorFromJavaCallChecker
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.resolve.checkers.*
|
|||||||
import org.jetbrains.kotlin.resolve.lazy.DelegationFilter
|
import org.jetbrains.kotlin.resolve.lazy.DelegationFilter
|
||||||
import org.jetbrains.kotlin.types.DynamicTypesSettings
|
import org.jetbrains.kotlin.types.DynamicTypesSettings
|
||||||
|
|
||||||
|
|
||||||
private val DEFAULT_DECLARATION_CHECKERS = listOf(
|
private val DEFAULT_DECLARATION_CHECKERS = listOf(
|
||||||
DataClassDeclarationChecker(),
|
DataClassDeclarationChecker(),
|
||||||
ConstModifierChecker,
|
ConstModifierChecker,
|
||||||
@@ -46,7 +45,7 @@ private val DEFAULT_CALL_CHECKERS = listOf(
|
|||||||
UnderscoreUsageChecker, AssigningNamedArgumentToVarargChecker(),
|
UnderscoreUsageChecker, AssigningNamedArgumentToVarargChecker(),
|
||||||
PrimitiveNumericComparisonCallChecker, LambdaWithSuspendModifierCallChecker,
|
PrimitiveNumericComparisonCallChecker, LambdaWithSuspendModifierCallChecker,
|
||||||
UselessElvisCallChecker(), ResultTypeWithNullableOperatorsChecker(), NullableVarargArgumentCallChecker,
|
UselessElvisCallChecker(), ResultTypeWithNullableOperatorsChecker(), NullableVarargArgumentCallChecker,
|
||||||
NamedFunAsExpressionChecker, ContractNotAllowedCallChecker
|
NamedFunAsExpressionChecker, ContractNotAllowedCallChecker, ReifiedTypeParameterSubstitutionChecker()
|
||||||
)
|
)
|
||||||
private val DEFAULT_TYPE_CHECKERS = emptyList<AdditionalTypeChecker>()
|
private val DEFAULT_TYPE_CHECKERS = emptyList<AdditionalTypeChecker>()
|
||||||
private val DEFAULT_CLASSIFIER_USAGE_CHECKERS = listOf(
|
private val DEFAULT_CLASSIFIER_USAGE_CHECKERS = listOf(
|
||||||
|
|||||||
@@ -26,8 +26,7 @@ import org.jetbrains.kotlin.js.resolve.diagnostics.*
|
|||||||
import org.jetbrains.kotlin.resolve.DeclarationReturnTypeSanitizer
|
import org.jetbrains.kotlin.resolve.DeclarationReturnTypeSanitizer
|
||||||
import org.jetbrains.kotlin.resolve.OverloadFilter
|
import org.jetbrains.kotlin.resolve.OverloadFilter
|
||||||
import org.jetbrains.kotlin.resolve.OverridesBackwardCompatibilityHelper
|
import org.jetbrains.kotlin.resolve.OverridesBackwardCompatibilityHelper
|
||||||
import org.jetbrains.kotlin.resolve.*
|
import org.jetbrains.kotlin.resolve.PlatformConfiguratorBase
|
||||||
import org.jetbrains.kotlin.resolve.calls.checkers.ReifiedTypeParameterSubstitutionChecker
|
|
||||||
import org.jetbrains.kotlin.resolve.calls.components.SamConversionTransformer
|
import org.jetbrains.kotlin.resolve.calls.components.SamConversionTransformer
|
||||||
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
|
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
|
||||||
import org.jetbrains.kotlin.resolve.deprecation.CoroutineCompatibilitySupport
|
import org.jetbrains.kotlin.resolve.deprecation.CoroutineCompatibilitySupport
|
||||||
@@ -46,7 +45,6 @@ object JsPlatformConfigurator : PlatformConfiguratorBase(
|
|||||||
ExpectedActualDeclarationChecker()
|
ExpectedActualDeclarationChecker()
|
||||||
),
|
),
|
||||||
additionalCallCheckers = listOf(
|
additionalCallCheckers = listOf(
|
||||||
ReifiedTypeParameterSubstitutionChecker(),
|
|
||||||
JsModuleCallChecker,
|
JsModuleCallChecker,
|
||||||
JsDynamicCallChecker,
|
JsDynamicCallChecker,
|
||||||
JsDefinedExternallyCallChecker
|
JsDefinedExternallyCallChecker
|
||||||
|
|||||||
+2
-5
@@ -9,10 +9,10 @@ import org.jetbrains.kotlin.builtins.PlatformToKotlinClassMap
|
|||||||
import org.jetbrains.kotlin.container.StorageComponentContainer
|
import org.jetbrains.kotlin.container.StorageComponentContainer
|
||||||
import org.jetbrains.kotlin.container.useInstance
|
import org.jetbrains.kotlin.container.useInstance
|
||||||
import org.jetbrains.kotlin.resolve.*
|
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.components.SamConversionTransformer
|
||||||
import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator
|
import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator
|
||||||
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
|
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.lazy.DelegationFilter
|
||||||
import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes
|
import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes
|
||||||
import org.jetbrains.kotlin.types.DynamicTypesSettings
|
import org.jetbrains.kotlin.types.DynamicTypesSettings
|
||||||
@@ -20,10 +20,7 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings
|
|||||||
object KonanPlatformConfigurator : PlatformConfiguratorBase(
|
object KonanPlatformConfigurator : PlatformConfiguratorBase(
|
||||||
DynamicTypesSettings(),
|
DynamicTypesSettings(),
|
||||||
additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker()),
|
additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker()),
|
||||||
additionalCallCheckers = listOf(
|
additionalCallCheckers = listOf(SuperCallWithDefaultArgumentsChecker()),
|
||||||
org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker(),
|
|
||||||
ReifiedTypeParameterSubstitutionChecker()
|
|
||||||
),
|
|
||||||
additionalTypeCheckers = listOf(),
|
additionalTypeCheckers = listOf(),
|
||||||
additionalClassifierUsageCheckers = listOf(),
|
additionalClassifierUsageCheckers = listOf(),
|
||||||
additionalAnnotationCheckers = listOf(),
|
additionalAnnotationCheckers = listOf(),
|
||||||
|
|||||||
Reference in New Issue
Block a user