Support map keys on contributed generic types and default bindings

compiler-tests/src/test/data/box/aggregation/ContributesIntoMap_DefaultBindingImplicitMapKeyMultiModule.kt

@@ -0,0 +1,59 @@
+import kotlin.reflect.KClass
+
+// MODULE: api
+interface RouteKey
+
+@MapKey(implicitClassKey = true)
+@Target(
+  AnnotationTarget.CLASS,
+  AnnotationTarget.FUNCTION,
+  AnnotationTarget.TYPE,
+  AnnotationTarget.TYPE_PARAMETER,
+)
+annotation class RouteMapKey(val value: KClass<out RouteKey> = Nothing::class)
+
+@DefaultBinding<RouteScreen<*>>
+interface RouteScreen<@RouteMapKey T : RouteKey>
+
+// MODULE: impl(api)
+class HomeKey : RouteKey
+
+@ContributesIntoMap(AppScope::class)
+@Inject
+class HomeScreen : RouteScreen<HomeKey>
+
+class OverrideHomeKey : RouteKey
+
+class AlternateHomeKey : RouteKey
+
+@ContributesIntoMap(AppScope::class)
+@Inject
+class OverrideHomeScreen : RouteScreen<@RouteMapKey(AlternateHomeKey::class) OverrideHomeKey>
+
+class ClassOverrideHomeKey : RouteKey
+
+class ClassAlternateHomeKey : RouteKey
+
+@RouteMapKey(ClassAlternateHomeKey::class)
+@ContributesIntoMap(AppScope::class)
+@Inject
+class ClassOverrideHomeScreen : RouteScreen<ClassOverrideHomeKey>
+
+// MODULE: main(api, impl)
+import kotlin.reflect.KClass
+
+@DependencyGraph(AppScope::class)
+interface RouteGraph {
+  val screens: Map<KClass<out RouteKey>, RouteScreen<*>>
+}
+
+fun box(): String {
+  val graph = createGraph<RouteGraph>()
+  assertEquals(3, graph.screens.size)
+  assertIs<HomeScreen>(graph.screens.getValue(HomeKey::class))
+  assertIs<OverrideHomeScreen>(graph.screens.getValue(AlternateHomeKey::class))
+  assertIs<ClassOverrideHomeScreen>(graph.screens.getValue(ClassAlternateHomeKey::class))
+  assertFalse(graph.screens.containsKey(OverrideHomeKey::class))
+  assertFalse(graph.screens.containsKey(ClassOverrideHomeKey::class))
+  return "OK"
+}

compiler-tests/src/test/data/box/aggregation/ContributesIntoMap_ImplicitMapKeyOnTypeArgument.kt

@@ -0,0 +1,23 @@
+import kotlin.reflect.KClass
+
+interface DirectRouteKey
+
+interface DirectRouteScreen<T : DirectRouteKey>
+
+class DirectHomeKey : DirectRouteKey
+
+@ContributesIntoMap(AppScope::class)
+@Inject
+class DirectHomeScreen : DirectRouteScreen<@ClassKey DirectHomeKey>
+
+@DependencyGraph(AppScope::class)
+interface DirectRouteGraph {
+  val screens: Map<KClass<*>, DirectRouteScreen<DirectHomeKey>>
+}
+
+fun box(): String {
+  val graph = createGraph<DirectRouteGraph>()
+  assertEquals(1, graph.screens.size)
+  assertIs<DirectHomeScreen>(graph.screens.getValue(DirectHomeKey::class))
+  return "OK"
+}

compiler-tests/src/test/data/diagnostic/aggregation/DefaultBinding_InvalidTypeArg.kt

@@ -11,3 +11,11 @@ interface Base1
 // Valid usage for comparison
 @DefaultBinding<Base3>
 interface Base3
+
+@MapKey
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE_PARAMETER)
+annotation class TypeParameterKey(val value: String)
+
+// Only one map key is allowed on type parameters
+<!DEFAULT_BINDING_ERROR!>@DefaultBinding<KeyedBase<*, *>><!>
+interface KeyedBase<@ClassKey @TypeParameterKey("key") A, B>