[Injection] Annotate default services with @DefaultImplementation

compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonPlatform.kt

@@ -6,28 +6,12 @@
 package org.jetbrains.kotlin.analyzer.common
 
 import org.jetbrains.kotlin.analyzer.ModuleInfo
-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.components.SamConversionTransformer
-import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator
-import org.jetbrains.kotlin.resolve.lazy.DelegationFilter
-import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes
 import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.kotlin.types.DynamicTypesSettings
 
-private object CommonPlatformConfigurator : PlatformConfiguratorBase(
-    DynamicTypesSettings(), listOf(), listOf(), listOf(), listOf(), listOf(),
-    IdentifierChecker.Default, OverloadFilter.Default, PlatformToKotlinClassMap.EMPTY, DelegationFilter.Default,
-    OverridesBackwardCompatibilityHelper.Default,
-    DeclarationReturnTypeSanitizer.Default
-) {
-    override fun configureModuleComponents(container: StorageComponentContainer) {
-        container.useInstance(SyntheticScopes.Empty)
-        container.useInstance(SamConversionTransformer.Empty)
-        container.useInstance(TypeSpecificityComparator.NONE)
-    }
+private object CommonPlatformConfigurator : PlatformConfiguratorBase() {
+    override fun configureModuleComponents(container: StorageComponentContainer) {}
 }
 
 object CommonPlatformCompilerServices : PlatformDependentCompilerServices() {

compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationReturnTypeSanitizer.kt

@@ -17,10 +17,12 @@
 package org.jetbrains.kotlin.resolve
 
 import org.jetbrains.kotlin.config.LanguageVersionSettings
+import org.jetbrains.kotlin.container.DefaultImplementation
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.UnwrappedType
 import org.jetbrains.kotlin.types.WrappedTypeFactory
 
+@DefaultImplementation(impl = DeclarationReturnTypeSanitizer.Default::class)
 interface DeclarationReturnTypeSanitizer {
     fun sanitizeReturnType(
         inferred: UnwrappedType,

compiler/frontend/src/org/jetbrains/kotlin/resolve/IdentifierChecker.kt

@@ -16,10 +16,12 @@
 
 package org.jetbrains.kotlin.resolve
 
+import org.jetbrains.kotlin.container.DefaultImplementation
 import org.jetbrains.kotlin.diagnostics.DiagnosticSink
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtSimpleNameExpression
 
+@DefaultImplementation(impl = IdentifierChecker.Default::class)
 interface IdentifierChecker {
     fun checkIdentifier(simpleNameExpression: KtSimpleNameExpression, diagnosticHolder: DiagnosticSink)
     fun checkDeclaration(declaration: KtDeclaration, diagnosticHolder: DiagnosticSink)

compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadFilter.kt

@@ -16,9 +16,10 @@
 
 package org.jetbrains.kotlin.resolve
 
+import org.jetbrains.kotlin.container.DefaultImplementation
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptorNonRoot
 
-
+@DefaultImplementation(impl = OverloadFilter.Default::class)
 interface OverloadFilter {
     fun filterPackageMemberOverloads(overloads: Collection<DeclarationDescriptorNonRoot>): Collection<DeclarationDescriptorNonRoot>
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/OverridesBackwardCompatibilityHelper.kt

@@ -16,8 +16,10 @@
 
 package org.jetbrains.kotlin.resolve
 
+import org.jetbrains.kotlin.container.DefaultImplementation
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 
+@DefaultImplementation(impl = OverridesBackwardCompatibilityHelper.Default::class)
 interface OverridesBackwardCompatibilityHelper {
     fun overrideCanBeOmitted(overridingDescriptor: CallableMemberDescriptor): Boolean
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt

@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.container.composeContainer
 import org.jetbrains.kotlin.container.useImpl
 import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.resolve.calls.checkers.*
+import org.jetbrains.kotlin.container.*
 import org.jetbrains.kotlin.resolve.checkers.*
 import org.jetbrains.kotlin.resolve.lazy.DelegationFilter
 import org.jetbrains.kotlin.types.DynamicTypesSettings
@@ -56,18 +57,18 @@ private val DEFAULT_ANNOTATION_CHECKERS = listOf<AdditionalAnnotationChecker>()
 
 
 abstract class PlatformConfiguratorBase(
-    private val dynamicTypesSettings: DynamicTypesSettings,
-    additionalDeclarationCheckers: List<DeclarationChecker>,
-    additionalCallCheckers: List<CallChecker>,
-    additionalTypeCheckers: List<AdditionalTypeChecker>,
-    additionalClassifierUsageCheckers: List<ClassifierUsageChecker>,
-    additionalAnnotationCheckers: List<AdditionalAnnotationChecker>,
-    private val identifierChecker: IdentifierChecker,
-    private val overloadFilter: OverloadFilter,
-    private val platformToKotlinClassMap: PlatformToKotlinClassMap,
-    private val delegationFilter: DelegationFilter,
-    private val overridesBackwardCompatibilityHelper: OverridesBackwardCompatibilityHelper,
-    private val declarationReturnTypeSanitizer: DeclarationReturnTypeSanitizer
+    private val dynamicTypesSettings: DynamicTypesSettings? = null,
+    additionalDeclarationCheckers: List<DeclarationChecker> = emptyList(),
+    additionalCallCheckers: List<CallChecker> = emptyList(),
+    additionalTypeCheckers: List<AdditionalTypeChecker> = emptyList(),
+    additionalClassifierUsageCheckers: List<ClassifierUsageChecker> = emptyList(),
+    additionalAnnotationCheckers: List<AdditionalAnnotationChecker> = emptyList(),
+    private val identifierChecker: IdentifierChecker? = null,
+    private val overloadFilter: OverloadFilter? = null,
+    private val platformToKotlinClassMap: PlatformToKotlinClassMap? = null,
+    private val delegationFilter: DelegationFilter? = null,
+    private val overridesBackwardCompatibilityHelper: OverridesBackwardCompatibilityHelper? = null,
+    private val declarationReturnTypeSanitizer: DeclarationReturnTypeSanitizer? = null
 ) : PlatformConfigurator {
     private val declarationCheckers: List<DeclarationChecker> = DEFAULT_DECLARATION_CHECKERS + additionalDeclarationCheckers
     private val callCheckers: List<CallChecker> = DEFAULT_CALL_CHECKERS + additionalCallCheckers
@@ -77,18 +78,18 @@ abstract class PlatformConfiguratorBase(
     private val annotationCheckers: List<AdditionalAnnotationChecker> = DEFAULT_ANNOTATION_CHECKERS + additionalAnnotationCheckers
 
     override val platformSpecificContainer = composeContainer(this::class.java.simpleName) {
-        useInstance(dynamicTypesSettings)
+        useInstanceIfNotNull(dynamicTypesSettings)
         declarationCheckers.forEach { useInstance(it) }
         callCheckers.forEach { useInstance(it) }
         typeCheckers.forEach { useInstance(it) }
         classifierUsageCheckers.forEach { useInstance(it) }
         annotationCheckers.forEach { useInstance(it) }
-        useInstance(identifierChecker)
-        useInstance(overloadFilter)
-        useInstance(platformToKotlinClassMap)
-        useInstance(delegationFilter)
-        useInstance(overridesBackwardCompatibilityHelper)
-        useInstance(declarationReturnTypeSanitizer)
+        useInstanceIfNotNull(identifierChecker)
+        useInstanceIfNotNull(overloadFilter)
+        useInstanceIfNotNull(platformToKotlinClassMap)
+        useInstanceIfNotNull(delegationFilter)
+        useInstanceIfNotNull(overridesBackwardCompatibilityHelper)
+        useInstanceIfNotNull(declarationReturnTypeSanitizer)
     }
 
     override fun configureModuleDependentCheckers(container: StorageComponentContainer) {

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DelegationFilter.kt

@@ -17,8 +17,10 @@
 package org.jetbrains.kotlin.resolve.lazy
 
 import org.jetbrains.kotlin.config.LanguageVersionSettings
+import org.jetbrains.kotlin.container.DefaultImplementation
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 
+@DefaultImplementation(impl = DelegationFilter.Default::class)
 interface DelegationFilter {
 
     fun filter(interfaceMember: CallableMemberDescriptor, languageVersionSettings: LanguageVersionSettings): Boolean