kapt: Fix compilation in 'compile' running mode (KT-33800)

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/extensions/PartialAnalysisHandlerExtension.kt

@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope
 
 open class PartialAnalysisHandlerExtension : AnalysisHandlerExtension {
-    protected open val analyzePartially: Boolean
+    open val analyzePartially: Boolean
         get() = true
 
     override fun doAnalysis(

plugins/kapt3/kapt3-cli/test/org/jetbrains/kotlin/kapt/cli/test/KaptToolIntegrationTestGenerated.java

@@ -54,6 +54,11 @@ public class KaptToolIntegrationTestGenerated extends AbstractKaptToolIntegratio
         runTest("plugins/kapt3/kapt3-cli/testData/integration/kotlinFileGenerationDefaultOutput/");
     }
 
+    @TestMetadata("kt33800")
+    public void testKt33800() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration/kt33800/");
+    }
+
     @TestMetadata("separateStubAptCompilation")
     public void testSeparateStubAptCompilation() throws Exception {
         runTest("plugins/kapt3/kapt3-cli/testData/integration/separateStubAptCompilation/");

plugins/kapt3/kapt3-cli/testData/integration/kt33800/Test.kt

@@ -0,0 +1,19 @@
+package test
+
+import apt.Anno
+import generated.Example as ExampleGenerated
+
+@Anno
+class Example() {
+    private val callback = object : Any() {
+        val obj = Object()
+    }
+
+    fun call() {
+        callback.obj
+    }
+}
+
+fun main() {
+    println("Generated class: " + ExampleGenerated::class.java.name)
+}

plugins/kapt3/kapt3-cli/testData/integration/kt33800/build.txt

@@ -0,0 +1,41 @@
+# copy
+../simple/ap
+ap
+
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/Processor.kt
+
+# copy
+../simple/ap/META-INF/services/javax.annotation.processing.Processor
+output/ap/META-INF/services/javax.annotation.processing.Processor
+
+# kapt
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# javac
+-cp output/ap
+-d output/javaClasses
+-proc:none
+output/sources/generated/Example.java
+
+# java
+-cp output/classes:output/javaClasses:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Example

plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt

@@ -47,6 +47,7 @@ import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.jvm.isJvm
 import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
+import org.jetbrains.kotlin.resolve.jvm.extensions.PartialAnalysisHandlerExtension
 import org.jetbrains.kotlin.utils.decodePluginOptions
 import java.io.ByteArrayInputStream
 import java.io.File
@@ -186,7 +187,7 @@ class Kapt3ComponentRegistrar : ComponentRegistrar {
         val kapt3AnalysisCompletedHandlerExtension = ClasspathBasedKapt3Extension(options, logger, configuration)
 
         AnalysisHandlerExtension.registerExtension(project, kapt3AnalysisCompletedHandlerExtension)
-        StorageComponentContainerContributor.registerExtension(project, KaptComponentContributor())
+        StorageComponentContainerContributor.registerExtension(project, KaptComponentContributor(kapt3AnalysisCompletedHandlerExtension))
     }
 
     private fun KaptOptions.Builder.checkOptions(project: MockProject, logger: KaptLogger, configuration: CompilerConfiguration): Boolean {
@@ -235,14 +236,14 @@ class Kapt3ComponentRegistrar : ComponentRegistrar {
         return true
     }
 
-    class KaptComponentContributor : StorageComponentContainerContributor {
+    class KaptComponentContributor(private val analysisExtension: PartialAnalysisHandlerExtension) : StorageComponentContainerContributor {
         override fun registerModuleComponents(
             container: StorageComponentContainer,
             platform: TargetPlatform,
             moduleDescriptor: ModuleDescriptor
         ) {
             if (!platform.isJvm()) return
-            container.useInstance(KaptAnonymousTypeTransformer())
+            container.useInstance(KaptAnonymousTypeTransformer(analysisExtension))
         }
     }
 

plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/KaptAnonymousTypeTransformer.kt

@@ -11,15 +11,23 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility
 import org.jetbrains.kotlin.resolve.DeclarationSignatureAnonymousTypeTransformer
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.DescriptorUtils.*
+import org.jetbrains.kotlin.resolve.jvm.extensions.PartialAnalysisHandlerExtension
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeProjectionImpl
 import org.jetbrains.kotlin.types.replace
 import org.jetbrains.kotlin.types.typeUtil.builtIns
 
-class KaptAnonymousTypeTransformer : DeclarationSignatureAnonymousTypeTransformer {
+class KaptAnonymousTypeTransformer(
+    private val analysisExtension: PartialAnalysisHandlerExtension
+) : DeclarationSignatureAnonymousTypeTransformer {
     override fun transformAnonymousType(descriptor: DeclarationDescriptorWithVisibility, type: KotlinType): KotlinType? {
-        if (isLocal(descriptor))
+        if (!analysisExtension.analyzePartially) {
+            return null
+        }
+
+        if (isLocal(descriptor)) {
             return type
+        }
 
         return convertPossiblyAnonymousType(type)
     }

plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt

@@ -113,8 +113,9 @@ abstract class AbstractKotlinKapt3Test : CodegenTestCase() {
 
         // Use light analysis mode in tests
         val project = myEnvironment.project
-        AnalysisHandlerExtension.registerExtension(project, PartialAnalysisHandlerExtension())
-        StorageComponentContainerContributor.registerExtension(project, KaptComponentContributor())
+        val analysisExtension = PartialAnalysisHandlerExtension()
+        AnalysisHandlerExtension.registerExtension(project, analysisExtension)
+        StorageComponentContainerContributor.registerExtension(project, KaptComponentContributor(analysisExtension))
 
         loadMultiFiles(files)