delay @ContributesSubcomponent generation until the last analysis rounds
#946
Conversation
…ounds
The `ContributesSubcomponentHandlerGenerator` is responsible for generating these:
```kotlin
@MergeSubcomponent(scope = Any::class)
public interface SubcomponentInterfaceA : SubcomponentInterface {
// ...
}
```
It used to generate those interfaces as soon as it scanned the triggers,
but that can cause problems if another `@ContributesSubcomponent` interface is
being generated, and that intends to replace a human-written one.
Now, the handler is a `PrivateCodeGenerator` and it doesn't start parsing/generating until all the "public" code generation is done. This means it gets the full picture of the possible graph, but it still finishes generating before any IR merging happens.
RBusarow
force-pushed
the
rick/ContributesSubcomponentHandlerGenerator-private
branch
from
e036426
to
4bc2151
Compare
| @@ -118,10 +118,8 @@ internal class CodeGenerationExtension( | |||
| anvilModule.addFiles(files) | |||
|
|
|||
| val generatedFiles = generateCode( | |||
| codeGenerators = codeGenerators, | |||
There was a problem hiding this comment.
This is just class-level, so no need to pass the variable around internally.
There was a problem hiding this comment.
lgtm though I don't think this fixes the issue @gabrielittner was reporting as his was KSP-specific
RBusarow
deleted the
rick/ContributesSubcomponentHandlerGenerator-private
branch
Yes, it's still happening with this change. The issue is that since there is no KSP implementation of |
|
@RBusarow This change seems to break custom code generators in embedded mode. https://github.com/freeletics/khonshu on branch |
| // parsed files until no new files are generated. | ||
| newFiles = nonPrivateCodeGenerators.generateCode(newFiles) | ||
| fun List<CodeGenerator>.loopGeneration() { | ||
| var newFiles = generateAndCache(anvilModule.allFiles.toList()) |
There was a problem hiding this comment.
Previously generateAndCache (which was called generateCode before) was called once with files (like 258 of the removed code var newFiles = nonPrivateCodeGenerators.generateCode(files)). Always using anvilModule.allFiles.toList() can break custom code generators that use topLevelFunctionReferences or topLevelPropertyReferences because it won't contain any KtFile that doesn't contain a KtClassOrObject. So a KtFile that only contains top level functions and/or properties will not be passed to code generators anymore and because of that topLevel*References won't include functions/properties from those files.
The
ContributesSubcomponentHandlerGeneratoris responsible for generating these:It used to generate those interfaces as soon as it scanned the triggers, but that can cause problems if another
@ContributesSubcomponentinterface is being generated, and that intends to replace a human-written one.Now, the handler is a
PrivateCodeGeneratorand it doesn't start parsing/generating until all the "public" code generation is done. This means it gets the full picture of the possible graph, but it still finishes generating before any IR merging happens.