Don't override graph extension factories' default functions (#946)

Author: ZacSweers

CHANGELOG.md

@@ -4,6 +4,9 @@ Changelog
 **Unreleased**
 --------------
 
+* **Fix**: Don't override graph extension factories' default functions.
+* **Fix**: Fix Kotlin internal error overriding Metro error when there's a missing factory for a Java `@Inject` class.
+
 0.6.0
 -----
 

compiler-tests/src/test/data/box/dependencygraph/extensions/OverloadedFactoryFunctions.kt

@@ -0,0 +1,33 @@
+// https://github.com/ZacSweers/metro/issues/940
+@DependencyGraph(AppScope::class)
+interface AppGraph
+
+@GraphExtension
+interface ExtGraph {
+  val value: Int
+
+  @GraphExtension.Factory
+  @ContributesTo(AppScope::class)
+  fun interface Factory : BaseFactory {
+    fun create(@Provides value: Int): ExtGraph
+
+    override fun create(
+      name: String,
+      value: Int
+    ): ExtGraph {
+      println(name)
+      return create(value)
+    }
+  }
+}
+
+interface BaseFactory {
+  fun create(name: String, value: Int): ExtGraph
+}
+
+fun box(): String {
+  val graph = createGraph<AppGraph>()
+  val extGraph = graph.create("Hello", 3)
+  assertEquals(3, extGraph.value)
+  return "OK"
+}

compiler-tests/src/test/java/dev/zacsweers/metro/compiler/BoxTestGenerated.java

@@ -302,7 +302,8 @@ internal class DependencyGraphNodeCache(
 
               if (isGraphExtensionFactory) {
                 isGraphExtension = true
-                break
+                // Only continue because we may ignore this if it has a default body in a parent
+                continue
               }
 
               // Check if return type is a @GraphExtension itself (i.e. no factory)
@@ -315,7 +316,8 @@ internal class DependencyGraphNodeCache(
                   )
                 if (returnsExtensionOrExtensionFactory) {
                   isGraphExtension = true
-                  break
+                  // Only continue because we may ignore this if it has a default body in a parent
+                  continue
                 }
               }
             }
@@ -586,7 +588,7 @@ internal class DependencyGraphNodeCache(
       if (overlapErrors.isNotEmpty()) {
         val message = buildString {
           appendLine(
-            "Graph extension '${dependencyGraphNode.sourceGraph.sourceGraphIfMetroGraph.kotlinFqName}' has overlapping scope annotations with ancestor graphs':",
+            "Graph extension '${dependencyGraphNode.sourceGraph.sourceGraphIfMetroGraph.kotlinFqName}' has overlapping scope annotations with ancestor graphs':"
           )
           for (overlap in overlapErrors) {
             appendLine(overlap)
@@ -595,14 +597,13 @@ internal class DependencyGraphNodeCache(
 
         // TODO in 2.2.20 use just diagnostic reporter
         if (graphDeclaration.origin === Origins.GeneratedGraphExtension) {
-          messageCollector.report(CompilerMessageSeverity.ERROR, message, graphDeclaration.locationOrNull())
+          messageCollector.report(
+            CompilerMessageSeverity.ERROR,
+            message,
+            graphDeclaration.locationOrNull(),
+          )
         } else {
-          diagnosticReporter
-            .at(graphDeclaration)
-            .report(
-              MetroIrErrors.METRO_ERROR,
-              message,
-            )
+          diagnosticReporter.at(graphDeclaration).report(MetroIrErrors.METRO_ERROR, message)
         }
         exitProcessing()
       }