Stub generation infrastructure (except for metadata generation) for KAPT+K2

This commit includes the basic Java stubs generation infrastructure and
the corresponding tests. The main entry point is called
Kapt4StubGenerator. Calls to it from production code will be added in a
separate commit.

 #KT-51982

analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISession.kt

@@ -9,13 +9,16 @@ import com.intellij.core.CoreApplicationEnvironment
 import com.intellij.mock.MockProject
 import com.intellij.openapi.application.Application
 import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiFile
 import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.kotlin.analysis.project.structure.KtModule
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreProjectEnvironment
 import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
 
 public class StandaloneAnalysisAPISession internal constructor(
     kotlinCoreProjectEnvironment: KotlinCoreProjectEnvironment,
     public val createPackagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
+    modulesWithFilesProvider: () -> Map<KtModule, List<PsiFile>>
 ) {
     // TODO: better to limit exposure? Current usages are: addExtension, jarFileSystem
     public val coreApplicationEnvironment: CoreApplicationEnvironment = kotlinCoreProjectEnvironment.environment
@@ -29,4 +32,6 @@ public class StandaloneAnalysisAPISession internal constructor(
         ReplaceWith("project")
     )
     public val mockProject: MockProject = kotlinCoreProjectEnvironment.project
+
+    public val modulesWithFiles: Map<KtModule, List<PsiFile>> by lazy(modulesWithFilesProvider)
 }

analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISessionBuilder.kt

@@ -11,12 +11,14 @@ import com.intellij.openapi.application.Application
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
+import com.intellij.psi.PsiFile
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
 import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.FirStandaloneServiceRegistrar
 import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtStaticProjectStructureProvider
 import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.StandaloneProjectFactory
 import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.FirSealedClassInheritorsProcessorFactory
+import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.JvmFirDeserializedSymbolProviderFactory
 import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProvider
 import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProviderImpl
 import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleProviderBuilder
@@ -150,6 +152,8 @@ public class StandaloneAnalysisAPISessionBuilder(
                 PackagePartProviderFactory::class.java,
                 KotlinStaticPackagePartProviderFactory(packagePartProvider)
             )
+
+            registerService(JvmFirDeserializedSymbolProviderFactory::class.java, JvmFirDeserializedSymbolProviderFactory::class.java)
         }
     }
 
@@ -208,7 +212,12 @@ public class StandaloneAnalysisAPISessionBuilder(
         return StandaloneAnalysisAPISession(
             kotlinCoreProjectEnvironment,
             createPackagePartProvider,
-        )
+        ) {
+            projectStructureProvider.allSourceFiles
+                .asSequence()
+                .filterIsInstance<PsiFile>()
+                .groupBy { projectStructureProvider.getModule(it.originalElement, null) }
+        }
     }
 }
 

build.gradle.kts

@@ -374,7 +374,8 @@ val projectsWithEnabledContextReceivers by extra {
         ":kotlin-lombok-compiler-plugin.k1",
         ":kotlinx-serialization-compiler-plugin.k2",
         ":plugins:parcelize:parcelize-compiler:parcelize.k2",
-        ":plugins:fir-plugin-prototype"
+        ":plugins:fir-plugin-prototype",
+        ":plugins:kapt4",
     )
 }
 

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.kapt3.test.runners.AbstractClassFileToSourceStubConv
 import org.jetbrains.kotlin.kapt3.test.runners.AbstractIrClassFileToSourceStubConverterTest
 import org.jetbrains.kotlin.kapt3.test.runners.AbstractIrKotlinKaptContextTest
 import org.jetbrains.kotlin.kapt3.test.runners.AbstractKotlinKaptContextTest
+import org.jetbrains.kotlin.kapt4.AbstractKotlinKapt4ContextTest
 import org.jetbrains.kotlin.lombok.*
 import org.jetbrains.kotlin.noarg.*
 import org.jetbrains.kotlin.parcelize.test.runners.*
@@ -385,6 +386,11 @@ fun main(args: Array<String>) {
                 model("converter")
             }
         }
+        testGroup("plugins/kapt4/tests-gen", "plugins/kapt4/") {
+            testClass<AbstractKotlinKapt4ContextTest> {
+                model("../kapt3/kapt3-compiler/testData/converter")
+            }
+        }
 
         testGroup("plugins/assign-plugin/tests-gen", "plugins/assign-plugin/testData") {
             testClass<AbstractAssignmentPluginDiagnosticTest> {

plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.fir.txt

@@ -0,0 +1,120 @@
+@kotlin.Metadata()
+public enum E {
+    /*public static final*/ X /* = new E() */,
+    /*public static final*/ Y /* = new E() */;
+
+    E() {
+    }
+
+    public abstract void a();
+
+    public final void b() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<E> getEntries() {
+        return null;
+    }
+
+    @kotlin.Metadata()
+    public static final class Obj {
+        @org.jetbrains.annotations.NotNull()
+        public static final E.Obj INSTANCE = null;
+
+        private Obj() {
+            super();
+        }
+    }
+
+    @kotlin.Metadata()
+    public static final class NestedClass {
+
+        public NestedClass() {
+            super();
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum E2 {
+    /*public static final*/ X /* = new E2() */,
+    /*public static final*/ Y /* = new E2() */;
+
+    E2(int n) {
+    }
+
+    E2(java.lang.String s) {
+    }
+
+    public abstract void a();
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<E2> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum E3 {
+    /*public static final*/ X /* = new E3() */,
+    /*public static final*/ Y /* = new E3() */;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = null;
+
+    E3(java.lang.String a) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<E3> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum E4 {
+    /*public static final*/ X /* = new E4() */;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = null;
+    private final int b = 0;
+    private final long c = 0L;
+    private final boolean d = false;
+
+    E4(java.lang.String a, int b, long c, boolean d) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+
+    public final int getB() {
+        return 0;
+    }
+
+    public final long getC() {
+        return 0L;
+    }
+
+    public final boolean getD() {
+        return false;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<E4> getEntries() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.fir.txt

@@ -0,0 +1,88 @@
+import a.b.ABC;
+
+@kotlin.Metadata()
+public final class Test {
+    public Test.MyDate date;
+    public java.util.concurrent.TimeUnit timeUnit;
+    public a.b.ABC abc;
+    public bcd bcd;
+
+    public Test() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final Test.MyDate getDate() {
+        return null;
+    }
+
+    public final void setDate(@org.jetbrains.annotations.NotNull()
+    Test.MyDate p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.concurrent.TimeUnit getTimeUnit() {
+        return null;
+    }
+
+    public final void setTimeUnit(@org.jetbrains.annotations.NotNull()
+    java.util.concurrent.TimeUnit p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final a.b.ABC getAbc() {
+        return null;
+    }
+
+    public final void setAbc(@org.jetbrains.annotations.NotNull()
+    a.b.ABC p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final bcd getBcd() {
+        return null;
+    }
+
+    public final void setBcd(@org.jetbrains.annotations.NotNull()
+    bcd p0) {
+    }
+
+    @kotlin.Metadata()
+    public static final class MyDate {
+        public Test.MyDate date2;
+
+        public MyDate() {
+            super();
+        }
+
+        @org.jetbrains.annotations.NotNull()
+        public final Test.MyDate getDate2() {
+            return null;
+        }
+
+        public final void setDate2(@org.jetbrains.annotations.NotNull()
+        Test.MyDate p0) {
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test2 {
+    public java.util.Date date;
+
+    public Test2() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.Date getDate() {
+        return null;
+    }
+
+    public final void setDate(@org.jetbrains.annotations.NotNull()
+    java.util.Date p0) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.kt

@@ -1,8 +1,7 @@
-// IGNORE_BACKEND: JVM_IR
 // CORRECT_ERROR_TYPES
 // NO_VALIDATION
 
-@file:Suppress("ENUM_ENTRY_AS_TYPE", "UNRESOLVED_REFERENCE")
+@file:Suppress("UNRESOLVED_REFERENCE")
 import java.util.Date as MyDate
 import java.util.concurrent.TimeUnit as MyTimeUnit
 import java.util.concurrent.TimeUnit.*
@@ -14,7 +13,6 @@ import bcd as MyBCD
 class Test {
     lateinit var date: MyDate
     lateinit var timeUnit: MyTimeUnit
-    lateinit var microseconds: MyMicroseconds
 
     lateinit var abc: MyABC
     lateinit var bcd: MyBCD

plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt

@@ -6,7 +6,6 @@ import a.b.ABC;
 public final class Test {
     public Test.MyDate date;
     public java.util.concurrent.TimeUnit timeUnit;
-    public java.util.concurrent.TimeUnit microseconds;
     public a.b.ABC abc;
     public bcd bcd;
 
@@ -32,15 +31,6 @@ public final class Test {
     java.util.concurrent.TimeUnit p0) {
     }
 
-    @org.jetbrains.annotations.NotNull()
-    public final java.util.concurrent.TimeUnit getMicroseconds() {
-        return null;
-    }
-
-    public final void setMicroseconds(@org.jetbrains.annotations.NotNull()
-    java.util.concurrent.TimeUnit p0) {
-    }
-
     @org.jetbrains.annotations.NotNull()
     public final a.b.ABC getAbc() {
         return null;

plugins/kapt3/kapt3-compiler/testData/converter/annotationWithFqNames.fir.txt

@@ -0,0 +1,61 @@
+package lib;
+
+public @interface Anno {
+
+    Class<?>[] impls() default {};
+}
+
+////////////////////
+
+package lib.impl;
+
+public class Impl {
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@lib.Anno(impls = {lib.impl.Impl.class, ABC.class})
+public final class Bar {
+
+    public Bar() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@lib.Anno(impls = {lib.impl.Impl.class})
+public final class Boo {
+
+    public Boo() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@lib.Anno(impls = {lib.impl.Impl.class})
+public final class Foo {
+
+    public Foo() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE", "ANNOTATION_ARGUMENT_MUST_BE_CONST", "NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION"})
+public final class TestKt {
+}

plugins/kapt3/kapt3-compiler/testData/converter/annotations.fir.txt

@@ -0,0 +1,128 @@
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno1 {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno2 {
+
+    public abstract int i() default 5;
+
+    public abstract java.lang.String s() default "ABC";
+
+    public abstract int[] ii() default {1, 2, 3};
+
+    public abstract java.lang.String[] ss() default {"A", "B"};
+
+    public abstract Anno1 a();
+
+    public abstract Colors color() default Colors.BLACK;
+
+    public abstract Colors[] colors() default {Colors.BLACK, Colors.WHITE};
+
+    public abstract java.lang.Class<?> clazz();
+
+    public abstract java.lang.Class<?>[] classes();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno3 {
+
+    public abstract java.lang.String value();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum Colors {
+    /*public static final*/ WHITE /* = new Colors() */,
+    /*public static final*/ BLACK /* = new Colors() */;
+
+    Colors() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Colors> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum Enum1 {
+    /*public static final*/ BLACK /* = new Enum1() */,
+    @Anno1()
+    /*public static final*/ WHITE /* = new Enum1() */;
+
+    Enum1() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Enum1> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@Anno1()
+@Anno2(a = @Anno1(), clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class})
+@Anno3(value = "value")
+public final class TestAnno {
+
+    public TestAnno() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@Anno3(value = "value")
+@Anno2(i = 6, s = "BCD", ii = {4, 5, 6}, ss = {"Z", "X"}, a = @Anno1(), color = Colors.WHITE, colors = {Colors.WHITE}, clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class})
+public final class TestAnno2 {
+    @Anno3(value = "field")
+    @org.jetbrains.annotations.NotNull()
+    private java.lang.String b = "property initializer";
+
+    public TestAnno2() {
+        super();
+    }
+
+    @Anno1()
+    public final void a(@Anno3(value = "param-pam-pam")
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String param) {
+    }
+
+    @Anno3(value = "getter")
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getB() {
+        return null;
+    }
+
+    @Anno3(value = "property")
+    @java.lang.Deprecated()
+    public static void getB$annotations() {
+    }
+
+    @Anno3(value = "setter")
+    public final void setB(@Anno3(value = "setparam")
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/annotations2.fir.txt

@@ -0,0 +1,114 @@
+package test;
+
+@kotlin.Metadata()
+@Anno(value = "anno-class")
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+
+    public abstract java.lang.String value();
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@kotlin.jvm.JvmName(name = "AnnotationsTest")
+public final class AnnotationsTest {
+
+    public AnnotationsTest() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
+    int $this$topLevelVal) {
+        return null;
+    }
+
+    @Anno(value = "top-level-val")
+    @java.lang.Deprecated()
+    public static void getTopLevelVal$annotations(int p0) {
+    }
+
+    @Anno(value = "top-level-fun")
+    public static final void topLevelFun(@Anno(value = "top-level-fun-receiver")
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String $this$topLevelFun) {
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@Anno(value = "enum")
+public enum Enum {
+    @Anno(value = "white")
+    /*public static final*/ WHITE /* = new Enum() */,
+    @Anno(value = "black")
+    /*public static final*/ BLACK /* = new Enum() */;
+    private final int x = 0;
+
+    @Anno(value = "enum-constructor")
+    Enum(@Anno(value = "x")
+    int x) {
+    }
+
+    public final int getX() {
+        return 0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<test.Enum> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@Anno(value = "clazz")
+public abstract class Test {
+    @org.jetbrains.annotations.NotNull()
+    private java.lang.String v;
+
+    @Anno(value = "test-constructor")
+    protected Test(@Anno(value = "v-param")
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String v) {
+        super();
+    }
+
+    @Anno(value = "v-get")
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getV() {
+        return null;
+    }
+
+    @Anno(value = "v-property")
+    @java.lang.Deprecated()
+    public static void getV$annotations() {
+    }
+
+    @Anno(value = "v-set")
+    public final void setV(@Anno(value = "v-setparam")
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
+    }
+
+    @Anno(value = "abstract-method")
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.lang.String abstractMethod();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.lang.String getAbstractVal();
+
+    @Anno(value = "abstract-val")
+    @java.lang.Deprecated()
+    public static void getAbstractVal$annotations() {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/annotations3.fir.txt

@@ -0,0 +1,88 @@
+@kotlin.Metadata()
+public final class B {
+
+    public B() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class BParceler implements Parceler<B> {
+    @org.jetbrains.annotations.NotNull()
+    public static final BParceler INSTANCE = null;
+
+    private BParceler() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class C {
+
+    public C() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class CParceler implements Parceler<C> {
+    @org.jetbrains.annotations.NotNull()
+    public static final CParceler INSTANCE = null;
+
+    private CParceler() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public abstract interface Parceler<T extends java.lang.Object> {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@TypeParceler()
+@TypeParceler()
+public final class Test {
+
+    public Test() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
+@kotlin.annotation.Repeatable()
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.PROPERTY})
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
+@java.lang.annotation.Repeatable(value = TypeParceler.Container.class)
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE})
+public abstract @interface TypeParceler<T extends java.lang.Object, P extends Parceler<? super T>> {
+
+    @kotlin.Metadata()
+    @kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
+    @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.PROPERTY})
+    @kotlin.jvm.internal.RepeatableContainer()
+    @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
+    @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE})
+    public static abstract @interface Container {
+
+        public abstract TypeParceler[] value();
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.fir.txt

@@ -0,0 +1,367 @@
+package app;
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+
+    public abstract boolean a1();
+
+    public abstract byte a2();
+
+    public abstract int a3();
+
+    public abstract short a4();
+
+    public abstract long a5();
+
+    public abstract char a6();
+
+    public abstract float a7();
+
+    public abstract double a8();
+
+    public abstract java.lang.String a9();
+}
+
+////////////////////
+
+package app;
+
+public class B {
+
+    public B() {
+        super();
+    }
+
+    public static class id {
+
+        public id() {
+            super();
+        }
+        public static final int textView = 200;
+    }
+    public static final boolean a1 = false;
+    public static final byte a2 = 1;
+    public static final int a3 = 2;
+    public static final short a4 = 3;
+    public static final long a5 = 4L;
+    public static final char a6 = '5';
+    public static final float a7 = 6.0F;
+    public static final double a8 = 7.0;
+    public static final String a9 = "A";
+}
+
+////////////////////
+
+package app;
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Bind {
+
+    public abstract int id();
+}
+
+////////////////////
+
+package app;
+
+@kotlin.Metadata()
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.FIELD})
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.FIELD})
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface BindField {
+
+    public abstract int id();
+}
+
+////////////////////
+
+package app;
+
+@kotlin.Metadata()
+public final class JJ {
+    @org.jetbrains.annotations.NotNull()
+    public static final app.JJ INSTANCE = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String b = null;
+
+    private JJ() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getB() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String c() {
+        return null;
+    }
+}
+
+////////////////////
+
+package app;
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface MultiValue {
+
+    public abstract int[] ids();
+}
+
+////////////////////
+
+package app;
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface MultiValueByte {
+
+    public abstract byte[] ids();
+}
+
+////////////////////
+
+package app;
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface MultiValueString {
+
+    public abstract java.lang.String[] ids();
+}
+
+////////////////////
+
+package app;
+
+@kotlin.Metadata()
+public final class MyActivity {
+    @BindField(id = 100)
+    private final int a = 0;
+    @BindField(id = 100)
+    private final int b = 0;
+    @BindField(id = 100)
+    private final int c = 0;
+    @BindField(id = 100)
+    private final int d = 0;
+    @BindField(id = 100)
+    private final int e = 0;
+    @BindField(id = 200)
+    private final int f = 0;
+    public final int propA = 200;
+    private final int propB = 200;
+    private int propC = 200;
+    @kotlin.jvm.JvmField()
+    public final int propD = 200;
+    @kotlin.jvm.JvmField()
+    public int propE = 200;
+    private final int propF = 0;
+
+    public MyActivity() {
+        super();
+    }
+
+    public final int getA() {
+        return 0;
+    }
+
+    @Bind(id = 100)
+    @java.lang.Deprecated()
+    public static void getA$annotations() {
+    }
+
+    public final int getB() {
+        return 0;
+    }
+
+    @Bind(id = 100)
+    @java.lang.Deprecated()
+    public static void getB$annotations() {
+    }
+
+    public final int getC() {
+        return 0;
+    }
+
+    @Bind(id = 100)
+    @java.lang.Deprecated()
+    public static void getC$annotations() {
+    }
+
+    public final int getD() {
+        return 0;
+    }
+
+    @Bind(id = 100)
+    @java.lang.Deprecated()
+    public static void getD$annotations() {
+    }
+
+    public final int getE() {
+        return 0;
+    }
+
+    @Bind(id = 100)
+    @Anno(a1 = false, a2 = 1, a3 = 2, a4 = 3, a5 = 4L, a6 = '5', a7 = 6.0F, a8 = 7.0, a9 = "A")
+    @java.lang.Deprecated()
+    public static void getE$annotations() {
+    }
+
+    public final int getF() {
+        return 0;
+    }
+
+    @Bind(id = 200)
+    @java.lang.Deprecated()
+    public static void getF$annotations() {
+    }
+
+    @Bind(id = 100)
+    public final void foo() {
+    }
+
+    @Bind(id = 100)
+    public final void foo2() {
+    }
+
+    @Bind(id = 100)
+    public final void foo3() {
+    }
+
+    @Bind(id = 100)
+    public final void foo4() {
+    }
+
+    @Bind(id = 100)
+    @Anno(a1 = false, a2 = 1, a3 = 2, a4 = 3, a5 = 4L, a6 = '5', a7 = 6.0F, a8 = 7.0, a9 = "A")
+    public final void foo5() {
+    }
+
+    @Bind(id = 200)
+    public final void plainIntConstant() {
+    }
+
+    @MultiValue(ids = {})
+    public final void multi0() {
+    }
+
+    @MultiValue(ids = {200})
+    public final void multi1() {
+    }
+
+    @MultiValue(ids = {200, 2})
+    public final void multi2() {
+    }
+
+    @MultiValue(ids = {200, 2})
+    public final void multi3() {
+    }
+
+    @MultiValueString(ids = {"A"})
+    public final void multi4() {
+    }
+
+    @MultiValueByte(ids = {1})
+    public final void multi5() {
+    }
+
+    @lib.OnClick(value = {200})
+    public final void multiJava1() {
+    }
+
+    @lib.OnClick(value = {200, 100})
+    public final void multiJava2() {
+    }
+
+    public final int getPropB() {
+        return 0;
+    }
+
+    public final int getPropC() {
+        return 0;
+    }
+
+    public final void setPropC(int p0) {
+    }
+
+    public final int getPropF() {
+        return 0;
+    }
+}
+
+////////////////////
+
+package app;
+
+public class R {
+
+    public R() {
+        super();
+    }
+
+    public static class layout {
+
+        public layout() {
+            super();
+        }
+        public static final int mainActivity = 100;
+    }
+}
+
+////////////////////
+
+package app;
+
+public class R2 {
+
+    public R2() {
+        super();
+    }
+
+    public static class layout {
+
+        public layout() {
+            super();
+        }
+        public static final int mainActivity = 100;
+    }
+}
+
+////////////////////
+
+package lib;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(value = ElementType.METHOD)
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface OnClick {
+
+    int[] value() default {};
+}
+
+////////////////////
+
+package lib;
+
+public class R {
+
+    public R() {
+        super();
+    }
+
+    public static class id {
+
+        public id() {
+            super();
+        }
+        public static final int textView = 100;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.fir.txt

@@ -0,0 +1,106 @@
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Bar {
+    @FieldAnno()
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = "";
+
+    public Bar() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+
+    @PropertyAnno()
+    @Anno()
+    @java.lang.Deprecated()
+    public static void getA$annotations() {
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Baz {
+    @FieldAnno()
+    @kotlin.jvm.JvmField()
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String a = "";
+
+    public Baz() {
+        super();
+    }
+
+    @Anno()
+    @java.lang.Deprecated()
+    public static void getA$annotations() {
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.FIELD})
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.FIELD})
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface FieldAnno {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Foo {
+    @FieldAnno()
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = null;
+
+    public Foo(@ParameterAnno()
+    @Anno()
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+
+    @PropertyAnno()
+    @java.lang.Deprecated()
+    public static void getA$annotations() {
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.VALUE_PARAMETER})
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.PARAMETER})
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface ParameterAnno {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY})
+@java.lang.annotation.Target(value = {})
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface PropertyAnno {
+}

plugins/kapt3/kapt3-compiler/testData/converter/anonymousDelegate.fir.txt

@@ -0,0 +1,80 @@
+@kotlin.Metadata()
+public final class AnonymousDelegateKt {
+
+    public AnonymousDelegateKt() {
+        super();
+    }
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.Object delegate$delegate = null;
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.Object getDelegate() {
+        return null;
+    }
+
+    public static final void setDelegate(@org.jetbrains.annotations.NotNull()
+    java.lang.Object delegate) {
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class ConcreteDelegate {
+
+    public ConcreteDelegate() {
+        super();
+    }
+
+    public final int getValue(@org.jetbrains.annotations.Nullable()
+    java.lang.Object t, @org.jetbrains.annotations.NotNull()
+    kotlin.reflect.KProperty<?> p) {
+        return 0;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.Object broken$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final java.io.Serializable overridden$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Lazy<java.lang.Runnable> lazyProp$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final ConcreteDelegate concreteDelegate$delegate = null;
+
+    public Test() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.Object getBroken() {
+        return null;
+    }
+
+    public final void setBroken(@org.jetbrains.annotations.NotNull()
+    java.lang.Object broken) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.Object getOverridden() {
+        return null;
+    }
+
+    public final void setOverridden(@org.jetbrains.annotations.NotNull()
+    java.lang.Object overridden) {
+    }
+
+    private final java.lang.Runnable getLazyProp() {
+        return null;
+    }
+
+    public final int getConcreteDelegate() {
+        return 0;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/comments.fir.txt

@@ -0,0 +1,188 @@
+@kotlin.Metadata()
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY})
+@java.lang.annotation.Target(value = {})
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum EnumError {
+    /*public static final*/ One /* = new EnumError() */,
+    /*public static final*/ Two /* = new EnumError() */;
+
+    EnumError() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.lang.String doIt();
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<EnumError> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+/**
+ * Obj.
+ */
+@kotlin.Metadata()
+public final class Obj {
+    @org.jetbrains.annotations.NotNull()
+    public static final Obj INSTANCE = null;
+
+    private Obj() {
+        super();
+    }
+}
+
+////////////////////
+
+
+/**
+ * Test.
+ */
+@kotlin.Metadata()
+public final class Test {
+
+    /**
+     * prop.
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String prop = "";
+
+    /**
+     * prop2.
+     */
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String prop2 = "";
+
+    public Test() {
+        super();
+    }
+
+    /**
+     * method().
+     */
+    public final void method() {
+    }
+
+    /**
+     * method(int).
+     */
+    public final void method(int a) {
+    }
+
+    /**
+     * method(String).
+     */
+    public final void method(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
+    }
+
+    /**
+     * prop2.
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getProp2() {
+        return null;
+    }
+
+    /**
+     * prop2.
+     */
+    @Anno()
+    @java.lang.Deprecated()
+    public static void getProp2$annotations() {
+    }
+
+    /**
+     * get.
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getProp3() {
+        return null;
+    }
+
+    /**
+     * set.
+     */
+    public final void setProp3(@org.jetbrains.annotations.NotNull()
+    java.lang.String v) {
+    }
+}
+
+////////////////////
+
+
+/**
+ * Test2
+ * Multiline
+ * documentation.
+ */
+@kotlin.Metadata()
+public final class Test2 {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = null;
+
+    public Test2(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+/**
+ * constructor.
+ */
+@kotlin.Metadata()
+public final class Test3 {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = null;
+
+    protected Test3(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test4 {
+
+    public Test4() {
+        super();
+    }
+
+    public final void method() {
+    }
+}
+
+////////////////////
+
+
+/**
+ * `/ * Failure * /`
+ */
+@kotlin.Metadata()
+public abstract interface TestComponent {
+}

plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.fir.txt

@@ -0,0 +1,142 @@
+@kotlin.Metadata()
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY})
+@java.lang.annotation.Target(value = {})
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum EnumError {
+    /*public static final*/ One /* = new EnumError() */,
+    /*public static final*/ Two /* = new EnumError() */;
+
+    EnumError() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.lang.String doIt();
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<EnumError> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Obj {
+    @org.jetbrains.annotations.NotNull()
+    public static final Obj INSTANCE = null;
+
+    private Obj() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test {
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String prop = "";
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String prop2 = "";
+
+    public Test() {
+        super();
+    }
+
+    public final void method() {
+    }
+
+    public final void method(int a) {
+    }
+
+    public final void method(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getProp2() {
+        return null;
+    }
+
+    @Anno()
+    @java.lang.Deprecated()
+    public static void getProp2$annotations() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getProp3() {
+        return null;
+    }
+
+    public final void setProp3(@org.jetbrains.annotations.NotNull()
+    java.lang.String v) {
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test2 {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = null;
+
+    public Test2(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test3 {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = null;
+
+    protected Test3(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test4 {
+
+    public Test4() {
+        super();
+    }
+
+    public final void method() {
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public abstract interface TestComponent {
+}

plugins/kapt3/kapt3-compiler/testData/converter/dataClass.fir.txt

@@ -0,0 +1,66 @@
+@kotlin.Metadata()
+public final class User {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String firstName = null;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String secondName = null;
+    private final int age = 0;
+
+    @org.jetbrains.annotations.NotNull()
+    public final User copy(@org.jetbrains.annotations.NotNull()
+    java.lang.String firstName, @org.jetbrains.annotations.NotNull()
+    java.lang.String secondName, int age) {
+        return null;
+    }
+
+    public boolean equals(@org.jetbrains.annotations.Nullable()
+    java.lang.Object other) {
+        return false;
+    }
+
+    public int hashCode() {
+        return 0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public java.lang.String toString() {
+        return null;
+    }
+
+    public User(@org.jetbrains.annotations.NotNull()
+    java.lang.String firstName, @org.jetbrains.annotations.NotNull()
+    java.lang.String secondName, int age) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String component1() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getFirstName() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String component2() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getSecondName() {
+        return null;
+    }
+
+    public final int component3() {
+        return 0;
+    }
+
+    public final int getAge() {
+        return 0;
+    }
+
+    public final void procedure() {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.fir.txt

@@ -0,0 +1,41 @@
+@kotlin.Metadata()
+public abstract interface Intf {
+    @org.jetbrains.annotations.NotNull()
+    public static final Intf.Companion Companion = null;
+    public static final int WHITE = 2;
+
+    public default int getColor() {
+        return 0;
+    }
+
+    @kotlin.Metadata()
+    public static final class Companion {
+        private static final int BLACK = 1;
+        public static final int WHITE = 2;
+
+        private Companion() {
+            super();
+        }
+
+        public final int getBLACK() {
+            return 0;
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public abstract interface IntfWithDefaultImpls {
+
+    public default void a() {
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public abstract interface IntfWithoutDefaultImpls {
+}

plugins/kapt3/kapt3-compiler/testData/converter/defaultImplsWithTypeParameters.fir.txt

@@ -0,0 +1,10 @@
+@kotlin.Metadata()
+public abstract interface Foo<X extends java.lang.Object, Y extends java.lang.Object> {
+
+    public default <Z extends java.lang.Object>void foo(X x, Y y, Z z) {
+    }
+
+    public default int getX() {
+        return 0;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/defaultPackage.fir.txt

@@ -0,0 +1,64 @@
+@kotlin.Metadata()
+public final class AnotherRootClass {
+
+    public AnotherRootClass() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class RootClass {
+
+    public RootClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@Target(value = {ElementType.TYPE, ElementType.METHOD})
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface ClassRefAnnotation {
+
+    Class<?>[] value();
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public abstract interface PackedClass {
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract RootClass someMethod();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.lang.Number otherMethod();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract AnotherRootClass oneMoreMethod();
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@ClassRefAnnotation(value = {RootClass.class})
+public final class PackedWithAnnotation {
+
+    public PackedWithAnnotation() {
+        super();
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/defaultPackageCorrectErrorTypes.fir.txt

@@ -0,0 +1,64 @@
+@kotlin.Metadata()
+public final class AnotherRootClass {
+
+    public AnotherRootClass() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class RootClass {
+
+    public RootClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@Target(value = {ElementType.TYPE, ElementType.METHOD})
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface ClassRefAnnotation {
+
+    Class<?>[] value();
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public abstract interface PackedClass {
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract RootClass someMethod();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.lang.Number otherMethod();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract AnotherRootClass oneMoreMethod();
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@ClassRefAnnotation(value = {RootClass.class})
+public final class PackedWithAnnotation {
+
+    public PackedWithAnnotation() {
+        super();
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.fir.txt

@@ -0,0 +1,148 @@
+@kotlin.Metadata()
+public enum Em {
+    /*public static final*/ FOO /* = new Em() */,
+    /*public static final*/ BAR /* = new Em() */;
+
+    Em() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Em> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Foo {
+    private final boolean z = false;
+    private final byte b = 0;
+    private final char c = '\u0000';
+    private final char c2 = '\u0000';
+    private final short sh = 0;
+    private final int i = 0;
+    private final long l = 0L;
+    private final float f = 0.0F;
+    private final double d = 0.0;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String s = null;
+    @org.jetbrains.annotations.NotNull()
+    private final int[] iarr = null;
+    @org.jetbrains.annotations.NotNull()
+    private final long[] larr = null;
+    @org.jetbrains.annotations.NotNull()
+    private final double[] darr = null;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String[] sarr = null;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.Class<?> cl = null;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.Class<?>[] clarr = null;
+    @org.jetbrains.annotations.NotNull()
+    private final Em em = null;
+    @org.jetbrains.annotations.NotNull()
+    private final Em[] emarr = null;
+
+    public Foo() {
+        super();
+    }
+
+    public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull()
+    java.lang.String s, @org.jetbrains.annotations.NotNull()
+    int[] iarr, @org.jetbrains.annotations.NotNull()
+    long[] larr, @org.jetbrains.annotations.NotNull()
+    double[] darr, @org.jetbrains.annotations.NotNull()
+    java.lang.String[] sarr, @org.jetbrains.annotations.NotNull()
+    java.lang.Class<?> cl, @org.jetbrains.annotations.NotNull()
+    java.lang.Class<?>[] clarr, @org.jetbrains.annotations.NotNull()
+    Em em, @org.jetbrains.annotations.NotNull()
+    Em[] emarr) {
+        super();
+    }
+
+    public final boolean getZ() {
+        return false;
+    }
+
+    public final byte getB() {
+        return 0;
+    }
+
+    public final char getC() {
+        return '\u0000';
+    }
+
+    public final char getC2() {
+        return '\u0000';
+    }
+
+    public final short getSh() {
+        return 0;
+    }
+
+    public final int getI() {
+        return 0;
+    }
+
+    public final long getL() {
+        return 0L;
+    }
+
+    public final float getF() {
+        return 0.0F;
+    }
+
+    public final double getD() {
+        return 0.0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getS() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final int[] getIarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final long[] getLarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final double[] getDarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String[] getSarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.Class<?> getCl() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.Class<?>[] getClarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final Em getEm() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final Em[] getEmarr() {
+        return null;
+    }
+
+    public final void foo(int a) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.fir.txt

@@ -0,0 +1,148 @@
+@kotlin.Metadata()
+public enum Em {
+    /*public static final*/ FOO /* = new Em() */,
+    /*public static final*/ BAR /* = new Em() */;
+
+    Em() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Em> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Foo {
+    private final boolean z = true;
+    private final byte b = (byte)0;
+    private final char c = 'c';
+    private final char c2 = '\n';
+    private final short sh = (short)10;
+    private final int i = 10;
+    private final long l = -10L;
+    private final float f = 1.0F;
+    private final double d = -1.0;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String s = "foo";
+    @org.jetbrains.annotations.NotNull()
+    private final int[] iarr = {1, 2, 3};
+    @org.jetbrains.annotations.NotNull()
+    private final long[] larr = {-1L, 0L, 1L};
+    @org.jetbrains.annotations.NotNull()
+    private final double[] darr = {7.3};
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String[] sarr = {"a", "bc"};
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.Class<?> cl = null;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.Class<?>[] clarr = {};
+    @org.jetbrains.annotations.NotNull()
+    private final Em em = Em.BAR;
+    @org.jetbrains.annotations.NotNull()
+    private final Em[] emarr = {Em.FOO, Em.BAR};
+
+    public Foo() {
+        super();
+    }
+
+    public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull()
+    java.lang.String s, @org.jetbrains.annotations.NotNull()
+    int[] iarr, @org.jetbrains.annotations.NotNull()
+    long[] larr, @org.jetbrains.annotations.NotNull()
+    double[] darr, @org.jetbrains.annotations.NotNull()
+    java.lang.String[] sarr, @org.jetbrains.annotations.NotNull()
+    java.lang.Class<?> cl, @org.jetbrains.annotations.NotNull()
+    java.lang.Class<?>[] clarr, @org.jetbrains.annotations.NotNull()
+    Em em, @org.jetbrains.annotations.NotNull()
+    Em[] emarr) {
+        super();
+    }
+
+    public final boolean getZ() {
+        return false;
+    }
+
+    public final byte getB() {
+        return 0;
+    }
+
+    public final char getC() {
+        return '\u0000';
+    }
+
+    public final char getC2() {
+        return '\u0000';
+    }
+
+    public final short getSh() {
+        return 0;
+    }
+
+    public final int getI() {
+        return 0;
+    }
+
+    public final long getL() {
+        return 0L;
+    }
+
+    public final float getF() {
+        return 0.0F;
+    }
+
+    public final double getD() {
+        return 0.0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getS() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final int[] getIarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final long[] getLarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final double[] getDarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String[] getSarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.Class<?> getCl() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.Class<?>[] getClarr() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final Em getEm() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final Em[] getEmarr() {
+        return null;
+    }
+
+    public final void foo(int a) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/delegateToList.kt

@@ -1,3 +1,4 @@
+// FIR_BLOCKED: KT-60480
 class MyList<out T : Any>(
     private val wrappedList: List<T>,
 ) : List<T> by wrappedList

plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.fir.txt

@@ -0,0 +1,66 @@
+package test;
+
+@kotlin.Metadata()
+public final class A {
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Lazy x$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final test.C<java.lang.String> z$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final test.C<java.lang.String> y$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Lazy<test.C<java.lang.String>> a$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Lazy<test.C<java.lang.String>> b$delegate = null;
+
+    public A() {
+        super();
+    }
+
+    public final error.NonExistentClass getX() {
+        return null;
+    }
+
+    @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
+    @java.lang.Deprecated()
+    public static void getX$annotations() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getZ() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getY() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final test.C<java.lang.String> getA() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final test.C<java.lang.String> getB() {
+        return null;
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public class C<T extends java.lang.Object> {
+
+    public C(T v) {
+        super();
+    }
+
+    public final T getValue(@org.jetbrains.annotations.Nullable()
+    java.lang.Object p1, @org.jetbrains.annotations.Nullable()
+    java.lang.Object p2) {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/delegationAndCompanionObject.kt

@@ -1,3 +1,4 @@
+// FIR_BLOCKED: KT-60490
 // CORRECT_ERROR_TYPES
 
 @Suppress("UNRESOLVED_REFERENCE")

plugins/kapt3/kapt3-compiler/testData/converter/deprecated.kt

@@ -1,3 +1,4 @@
+// FIR_BLOCKED: KT-60960
 package deprecated
 
 @Deprecated("Deprecated annotation")

plugins/kapt3/kapt3-compiler/testData/converter/enumImports.fir.txt

@@ -0,0 +1,16 @@
+package kapt;
+
+@kotlin.Metadata()
+public enum Options {
+    /*public static final*/ A /* = new Options() */,
+    /*public static final*/ B /* = new Options() */,
+    /*public static final*/ C /* = new Options() */;
+
+    Options() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<kapt.Options> getEntries() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.fir.txt

@@ -0,0 +1,189 @@
+@kotlin.Metadata()
+public final class Test {
+    @org.jetbrains.annotations.NotNull()
+    private final Test.Companion.Example foo = Test.Companion.Example.FOO;
+    @org.jetbrains.annotations.NotNull()
+    public static final Test.Companion Companion = null;
+
+    public Test() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public static final class Companion {
+
+        private Companion() {
+            super();
+        }
+
+        @kotlin.Metadata()
+        public static enum Example {
+            /*public static final*/ FOO /* = new Example() */;
+
+            Example() {
+            }
+
+            @org.jetbrains.annotations.NotNull()
+            public static kotlin.enums.EnumEntries<Test.Companion.Example> getEntries() {
+                return null;
+            }
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test2 {
+    @org.jetbrains.annotations.NotNull()
+    private final Test2.Amigo.Example foo = Test2.Amigo.Example.FOO;
+    @org.jetbrains.annotations.NotNull()
+    public static final Test2.Amigo Amigo = null;
+
+    public Test2() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public static final class Amigo {
+
+        private Amigo() {
+            super();
+        }
+
+        @kotlin.Metadata()
+        public static enum Example {
+            /*public static final*/ FOO /* = new Example() */;
+
+            Example() {
+            }
+
+            @org.jetbrains.annotations.NotNull()
+            public static kotlin.enums.EnumEntries<Test2.Amigo.Example> getEntries() {
+                return null;
+            }
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test3 {
+    @org.jetbrains.annotations.NotNull()
+    private final Test3.Amigo.Example foo = Test3.Amigo.Example.FOO;
+
+    public Test3() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public static final class Amigo {
+        @org.jetbrains.annotations.NotNull()
+        public static final Test3.Amigo INSTANCE = null;
+
+        private Amigo() {
+            super();
+        }
+
+        @kotlin.Metadata()
+        public static enum Example {
+            /*public static final*/ FOO /* = new Example() */;
+
+            Example() {
+            }
+
+            @org.jetbrains.annotations.NotNull()
+            public static kotlin.enums.EnumEntries<Test3.Amigo.Example> getEntries() {
+                return null;
+            }
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test4 {
+    private final int foo = 1;
+    @org.jetbrains.annotations.NotNull()
+    public static final Test4.Companion Companion = null;
+
+    public Test4() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public static final class Companion {
+
+        private Companion() {
+            super();
+        }
+
+        @kotlin.Metadata()
+        public static final class Foo {
+            @org.jetbrains.annotations.NotNull()
+            public static final Test4.Companion.Foo INSTANCE = null;
+            public static final int constProperty = 1;
+
+            private Foo() {
+                super();
+            }
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test5 {
+    @org.jetbrains.annotations.NotNull()
+    private final Test5.Amigos.Companion.Goo.Example foo = Test5.Amigos.Companion.Goo.Example.FOO;
+
+    public Test5() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public static final class Amigos {
+        @org.jetbrains.annotations.NotNull()
+        public static final Test5.Amigos.Companion Companion = null;
+
+        public Amigos() {
+            super();
+        }
+
+        @kotlin.Metadata()
+        public static final class Companion {
+
+            private Companion() {
+                super();
+            }
+
+            @kotlin.Metadata()
+            public static final class Goo {
+
+                public Goo() {
+                    super();
+                }
+
+                @kotlin.Metadata()
+                public static enum Example {
+                    /*public static final*/ FOO /* = new Example() */;
+
+                    Example() {
+                    }
+
+                    @org.jetbrains.annotations.NotNull()
+                    public static kotlin.enums.EnumEntries<Test5.Amigos.Companion.Goo.Example> getEntries() {
+                        return null;
+                    }
+                }
+            }
+        }
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/enums.fir.txt

@@ -0,0 +1,101 @@
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno1 {
+
+    public abstract java.lang.String value();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum Enum1 {
+    /*public static final*/ BLACK /* = new Enum1() */,
+    /*public static final*/ WHITE /* = new Enum1() */;
+
+    Enum1() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Enum1> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum Enum2 {
+    /*public static final*/ RED /* = new Enum2() */,
+    /*public static final*/ WHITE /* = new Enum2() */;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String col = null;
+    private final int col2 = 0;
+
+    Enum2(@Anno1(value = "first")
+    java.lang.String col, @Anno1(value = "second")
+    int col2) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getCol() {
+        return null;
+    }
+
+    public final int getCol2() {
+        return 0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String color() {
+        return null;
+    }
+
+    private final void privateEnumFun() {
+    }
+
+    public final void publicEnumFun() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Enum2> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public abstract interface I {
+
+    @kotlin.Metadata()
+    public static enum Nested {
+        /*public static final*/ WHITE /* = new Nested() */;
+
+        Nested() {
+        }
+
+        @org.jetbrains.annotations.NotNull()
+        public static kotlin.enums.EnumEntries<I.Nested> getEntries() {
+            return null;
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum Nested1 {
+    /*public static final*/ WHITE /* = new Nested1() */;
+
+    Nested1() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Nested1> getEntries() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/enums.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +EnumEntries
 enum class Enum1 {
     BLACK, WHITE
 }

plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.fir.txt

@@ -0,0 +1,140 @@
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+
+    public abstract java.lang.Class<java.lang.Object> a();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@Anno(a = ABC.class)
+public final class ErrorInAnnotation {
+
+    public ErrorInAnnotation() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class ErrorInConstructorParameter {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = null;
+    @org.jetbrains.annotations.NotNull()
+    private final ABC b = null;
+    @org.jetbrains.annotations.NotNull()
+    private final java.util.List<ABC> c = null;
+
+    public ErrorInConstructorParameter(@org.jetbrains.annotations.NotNull()
+    java.lang.String a, @org.jetbrains.annotations.NotNull()
+    ABC b, @org.jetbrains.annotations.NotNull()
+    java.util.List<? extends ABC> c) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABC getB() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.List<ABC> getC() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class ErrorInDeclarations {
+    public java.lang.String p1;
+    public ABC p2;
+    public BCD<java.lang.String> p3;
+
+    public ErrorInDeclarations() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getP1() {
+        return null;
+    }
+
+    public final void setP1(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABC getP2() {
+        return null;
+    }
+
+    public final void setP2(@org.jetbrains.annotations.NotNull()
+    ABC p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final BCD<java.lang.String> getP3() {
+        return null;
+    }
+
+    public final void setP3(@org.jetbrains.annotations.NotNull()
+    BCD<java.lang.String> p0) {
+    }
+
+    public final void overloads(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
+    }
+
+    public final void overloads(@org.jetbrains.annotations.NotNull()
+    ABC a) {
+    }
+
+    public final void f1(@org.jetbrains.annotations.NotNull()
+    java.lang.String a, @org.jetbrains.annotations.NotNull()
+    ABC<java.util.List<java.lang.String>> b) {
+    }
+
+    public final <T extends java.lang.String>void f2() {
+    }
+
+    public final <T extends java.lang.Object>void f3() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABC f4() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class ErrorInSupertype implements ABC {
+
+    public ErrorInSupertype() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class ErrorInSupertype2 extends ABC<java.lang.String> {
+
+    public ErrorInSupertype2() {
+        super();
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.fir.txt

@@ -0,0 +1,20 @@
+package test;
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@Anno()
+@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
+public final class ClassWithParent extends Foo implements Bar, Baz, java.lang.CharSequence {
+
+    public ClassWithParent() {
+        super();
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.kt

@@ -1,3 +1,5 @@
+// EXPECTED_ERROR_K2: (kotlin:7:1) cannot find symbol
+
 package test
 
 internal annotation class Anno

plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.fir.txt

@@ -0,0 +1,262 @@
+package test;
+
+@kotlin.Metadata()
+public final class Child extends kotlin.collections.AbstractList<java.lang.String> implements test.Parent<java.lang.String, java.lang.Integer>, java.util.List<java.lang.String>, kotlin.jvm.internal.markers.KMappedMarker {
+
+    public Child() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public class Cl {
+
+    public Cl() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class Generics1 extends Foo<java.lang.String> {
+
+    public Generics1() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class Generics2 implements Foo<java.lang.String> {
+
+    public Generics2() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class Generics3 implements Foo<Bar, Baz, Boo<Baz, java.util.List<?>>, java.lang.String> {
+
+    public Generics3() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public abstract interface Intf {
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class MappedList<R extends java.lang.Object> extends kotlin.collections.AbstractList<R> implements java.util.List<R>, kotlin.jvm.internal.markers.KMappedMarker {
+
+    public MappedList() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    @java.lang.Override()
+    public java.lang.Void get(int index) {
+        return null;
+    }
+
+    @java.lang.Override()
+    public int getSize() {
+        return 0;
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public abstract interface Parent<A extends java.lang.CharSequence, B extends java.lang.Object> {
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TBarBazCl extends test.Cl implements Bar, Baz {
+
+    public TBarBazCl() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TClBarBaz extends test.Cl implements Bar, Baz {
+
+    public TClBarBaz() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TFooBar extends Foo implements Bar, test.Intf {
+    @org.jetbrains.annotations.NotNull()
+    private final X a = null;
+
+    public TFooBar(@org.jetbrains.annotations.NotNull()
+    X a) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final X getA() {
+        return null;
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TFooBar2 implements Foo, Bar {
+    @org.jetbrains.annotations.NotNull()
+    private final X a = null;
+
+    public TFooBar2(@org.jetbrains.annotations.NotNull()
+    X a) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final X getA() {
+        return null;
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TFooBarBaz extends Foo implements Bar, Baz {
+
+    public TFooBarBaz() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TFooBarBaz2 extends Foo implements Baz, test.Intf {
+
+    public TFooBarBaz2() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TFooBarBaz3 implements Foo, Bar, Baz {
+
+    public TFooBarBaz3() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TFooBarBaz4 implements Foo, Bar, Baz {
+
+    public TFooBarBaz4() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TFooBarBaz5 implements Foo, Bar, Baz {
+
+    public TFooBarBaz5() {
+        super();
+    }
+
+    public TFooBarBaz5(@org.jetbrains.annotations.NotNull()
+    java.lang.String s) {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TFooBarBaz6 implements Foo, Bar, Baz {
+
+    public TFooBarBaz6(@org.jetbrains.annotations.NotNull()
+    java.lang.String s) {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TxFooxBarxBaz extends x.Foo implements x.Bar, x.Baz, test.Intf {
+
+    public TxFooxBarxBaz() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TxFooxBarxBaz2 extends x.Foo implements x.Bar {
+
+    public TxFooxBarxBaz2() {
+        super();
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.fir.txt

@@ -0,0 +1,28 @@
+@kotlin.Metadata()
+public final class MappedList<T extends java.lang.Object, R extends java.lang.Object> extends kotlin.collections.AbstractList<R> implements java.util.List<R>, kotlin.jvm.internal.markers.KMappedMarker {
+    @org.jetbrains.annotations.NotNull()
+    private final java.util.List<T> list = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.jvm.functions.Function1<T, R> function = null;
+
+    public MappedList(@org.jetbrains.annotations.NotNull()
+    java.util.List<? extends T> list, @org.jetbrains.annotations.NotNull()
+    kotlin.jvm.functions.Function1<? super T, ? extends R> function) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.List<T> getList() {
+        return null;
+    }
+
+    @java.lang.Override()
+    public R get(int index) {
+        return null;
+    }
+
+    @java.lang.Override()
+    public int getSize() {
+        return 0;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.fir.txt

@@ -15,8 +15,6 @@ public abstract class Prop<T> {
 
 package test;
 
-import java.lang.System;
-
 @kotlin.Metadata()
 public final class Cl {
     @org.jetbrains.annotations.NotNull()
@@ -41,8 +39,6 @@ public final class Cl {
 
 package test;
 
-import java.lang.System;
-
 @kotlin.Metadata()
 public final class TestKt {
 

plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.fir.txt

@@ -0,0 +1,12 @@
+@kotlin.Metadata()
+public final class ImportsForErrorTypesKt {
+
+    public ImportsForErrorTypesKt() {
+        super();
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public static final java.lang.Object test() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.fir.txt

@@ -0,0 +1,76 @@
+package lib;
+
+public class File {
+
+    public File() {
+        super();
+    }
+}
+
+////////////////////
+
+package lib;
+
+public class IOException {
+
+    public IOException() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class TestA {
+
+    public TestA() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public abstract interface TestB {
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.io.File a();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract lib.File b();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.io.IOException c();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract lib.IOException d();
+}
+
+////////////////////
+
+package test;
+
+import lib.FooBar;
+
+@kotlin.Metadata()
+public abstract interface TestC {
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.io.File a();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract lib.File b();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.io.IOException c();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract lib.IOException d();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract lib.FooBar e();
+}

plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.kt

@@ -1,7 +1,6 @@
 // CORRECT_ERROR_TYPES
 
-// EXPECTED_ERROR: (kotlin:16:5) cannot find symbol
-
+// EXPECTED_ERROR: (kotlin:15:5) cannot find symbol
 // FILE: a.kt
 package test
 

plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.fir.txt

@@ -0,0 +1,50 @@
+@kotlin.Metadata()
+public final class GroupedNewsListDelegateAdapter {
+
+    public GroupedNewsListDelegateAdapter(@org.jetbrains.annotations.NotNull()
+    kotlin.jvm.functions.Function0<kotlin.Unit> onWiFiClickListener) {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class HomeFragment {
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Unit categoryNewsListPresenter$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Lazy<GroupedNewsListDelegateAdapter> groupedNewsListAdapter$delegate = null;
+
+    public HomeFragment() {
+        super();
+    }
+
+    private final error.NonExistentClass getCategoryNewsListPresenter() {
+        return null;
+    }
+
+    @kotlin.Suppress(names = {"TOO_MANY_ARGUMENTS", "DELEGATE_SPECIAL_FUNCTION_MISSING"})
+    @java.lang.Deprecated()
+    private static void getCategoryNewsListPresenter$annotations() {
+    }
+
+    private final GroupedNewsListDelegateAdapter getGroupedNewsListAdapter() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class IncorrectDelegateKt {
+
+    public IncorrectDelegateKt() {
+        super();
+    }
+
+    public static final void moxyPresenter() {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.kt

@@ -1,3 +1,5 @@
+// WITH_STDLIB
+
 class HomeFragment {
     @Suppress("TOO_MANY_ARGUMENTS", "DELEGATE_SPECIAL_FUNCTION_MISSING")
     private val categoryNewsListPresenter by moxyPresenter {

plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.fir.txt

@@ -0,0 +1,53 @@
+@kotlin.Metadata()
+public abstract class BaseClass {
+
+    public BaseClass(@org.jetbrains.annotations.NotNull()
+    Context context, int num, boolean bool) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract Result doJob();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public abstract interface Context {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Inheritor extends BaseClass {
+
+    public Inheritor(@org.jetbrains.annotations.NotNull()
+    Context context) {
+        super(null, 0, false);
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    @java.lang.Override()
+    public Result doJob() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum Result {
+    /*public static final*/ SUCCESS /* = new Result() */,
+    /*public static final*/ ERROR /* = new Result() */;
+
+    Result() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Result> getEntries() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.fir.txt

@@ -0,0 +1,14 @@
+@kotlin.Metadata()
+public final class Cl {
+
+    public Cl() {
+        super();
+    }
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = null;
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.fir.txt

@@ -0,0 +1,67 @@
+@kotlin.Metadata()
+public final class Test {
+    @org.jetbrains.annotations.NotNull()
+    private Test.FilterValueDelegate<java.lang.Float> a;
+
+    public Test() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    private final class FilterValueDelegate<T extends java.lang.Object> {
+
+        public FilterValueDelegate() {
+            super();
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test2 {
+
+    public Test2() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public final class FilterValueDelegate<T extends java.lang.Object> {
+        @org.jetbrains.annotations.NotNull()
+        private Test2.FilterValueDelegate<T>.Filter2<java.lang.String> a;
+
+        public FilterValueDelegate() {
+            super();
+        }
+
+        @kotlin.Metadata()
+        public final class Filter2<X extends java.lang.Object> {
+
+            public Filter2() {
+                super();
+            }
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test3 {
+    @org.jetbrains.annotations.NotNull()
+    private Test3.FilterValueDelegate<java.lang.Float> a;
+
+    public Test3() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    private static final class FilterValueDelegate<T extends java.lang.Object> {
+
+        public FilterValueDelegate() {
+            super();
+        }
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.fir.txt

@@ -0,0 +1,30 @@
+@kotlin.Metadata()
+public abstract interface Named {
+
+    @org.jetbrains.annotations.Nullable()
+    public abstract java.lang.String getName();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Product2 implements Named {
+    @org.jetbrains.annotations.Nullable()
+    private java.lang.String name = null;
+
+    @org.jetbrains.annotations.Nullable()
+    @java.lang.Override()
+    public java.lang.String getName() {
+        return null;
+    }
+
+    public void setName(@org.jetbrains.annotations.Nullable()
+    java.lang.String p0) {
+    }
+
+    public Product2(@org.jetbrains.annotations.NotNull()
+    java.lang.String otherName) {
+        super();
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt

@@ -1,3 +1,4 @@
+// FIR_BLOCKED: LC don't support illegal java identifiers
 enum class Color {
     BLACK, `WHI-TE`
 }
@@ -5,5 +6,5 @@ enum class Color {
 @Anno(Color.`WHI-TE`)
 annotation class Anno(val color: Color)
 
-// EXPECTED_ERROR: (kotlin:5:1) an enum annotation value must be an enum constant
+// EXPECTED_ERROR: (kotlin:6:1) an enum annotation value must be an enum constant
 // EXPECTED_ERROR: (other:-1:-1) 'WHI-TE' is an invalid Java enum value name

plugins/kapt3/kapt3-compiler/testData/converter/javadoc.fir.txt

@@ -0,0 +1,169 @@
+package javadoc;
+
+/**
+ * Simple
+ */
+@kotlin.Metadata()
+public final class A {
+
+    public A() {
+        super();
+    }
+}
+
+////////////////////
+
+package javadoc;
+
+/**
+ * Multi
+ * line
+ * comment.
+ */
+@kotlin.Metadata()
+public final class B {
+
+    /**
+     * Nested
+     * member
+     * comment.
+     */
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String a = "";
+
+    /**
+     * Mixed
+     * tabs/spaces
+     */
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String b = "";
+
+    /**
+     * List:
+     * * first item
+     * * second item
+     */
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String c = "";
+
+    /**
+     * Without
+     * stars
+     */
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String d = "";
+
+    /**
+     * A mutable property
+     */
+    @org.jetbrains.annotations.NotNull()
+    private java.lang.String e = "";
+
+    /**
+     * A property with a backing field and an explicit setter
+     */
+    @org.jetbrains.annotations.NotNull()
+    private java.lang.String g;
+
+    public B() {
+        super();
+    }
+
+    /**
+     * Nested
+     * member
+     * comment.
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
+
+    /**
+     * Mixed
+     * tabs/spaces
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getB() {
+        return null;
+    }
+
+    /**
+     * List:
+     * * first item
+     * * second item
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getC() {
+        return null;
+    }
+
+    /**
+     * Without
+     * stars
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getD() {
+        return null;
+    }
+
+    /**
+     * A mutable property
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getE() {
+        return null;
+    }
+
+    /**
+     * A mutable property
+     */
+    public final void setE(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
+    }
+
+    /**
+     * A property without a backing field
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getF() {
+        return null;
+    }
+
+    /**
+     * A property without a backing field
+     */
+    public final void setF(@org.jetbrains.annotations.NotNull()
+    java.lang.String value) {
+    }
+
+    /**
+     * A property with a backing field and an explicit setter
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getG() {
+        return null;
+    }
+
+    /**
+     * A property with a backing field and an explicit setter
+     */
+    public final void setG(@org.jetbrains.annotations.NotNull()
+    java.lang.String value) {
+    }
+
+    /**
+     * It's a getter
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getH() {
+        return null;
+    }
+
+    /**
+     * A property with documentation for an accessor
+     */
+    public final void setH(@org.jetbrains.annotations.NotNull()
+    java.lang.String value) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/javadoc.ir.txt

@@ -53,6 +53,18 @@ public final class B {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String d = "";
 
+    /**
+     * A mutable property
+     */
+    @org.jetbrains.annotations.NotNull()
+    private java.lang.String e = "";
+
+    /**
+     * A property with a backing field and an explicit setter
+     */
+    @org.jetbrains.annotations.NotNull()
+    private java.lang.String g;
+
     public B() {
         super();
     }
@@ -94,4 +106,52 @@ public final class B {
     public final java.lang.String getD() {
         return null;
     }
+
+    /**
+     * A mutable property
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getE() {
+        return null;
+    }
+
+    /**
+     * A mutable property
+     */
+    public final void setE(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getF() {
+        return null;
+    }
+
+    public final void setF(@org.jetbrains.annotations.NotNull()
+    java.lang.String value) {
+    }
+
+    /**
+     * A property with a backing field and an explicit setter
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getG() {
+        return null;
+    }
+
+    public final void setG(@org.jetbrains.annotations.NotNull()
+    java.lang.String value) {
+    }
+
+    /**
+     * It's a getter
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getH() {
+        return null;
+    }
+
+    public final void setH(@org.jetbrains.annotations.NotNull()
+    java.lang.String value) {
+    }
 }

plugins/kapt3/kapt3-compiler/testData/converter/javadoc.kt

@@ -14,10 +14,10 @@ class B {
      * comment. */
     val a = ""
 
-	/**
-	 * Mixed
-	 * tabs/spaces
-	 */
+    /**
+     * Mixed
+     * tabs/spaces
+     */
     val b = ""
 
     /**
@@ -28,8 +28,36 @@ class B {
     val c = ""
 
     /**
-     Without
-     stars
+    Without
+    stars
      */
     val d = ""
+
+    /**
+     * A mutable property
+     */
+    var e = ""
+
+    /**
+     * A property without a backing field
+     */
+    var f: String
+        get() = ""
+        set(value) {}
+
+    /**
+     * A property with a backing field and an explicit setter
+     */
+    var g: String
+        set(value) {}
+
+    /**
+     * A property with documentation for an accessor
+     */
+    var h: String
+        /**
+         * It's a getter
+         */
+        get() = ""
+        set(value) {}
 }

plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt

@@ -53,6 +53,18 @@ public final class B {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String d = "";
 
+    /**
+     * A mutable property
+     */
+    @org.jetbrains.annotations.NotNull()
+    private java.lang.String e = "";
+
+    /**
+     * A property with a backing field and an explicit setter
+     */
+    @org.jetbrains.annotations.NotNull()
+    private java.lang.String g;
+
     public B() {
         super();
     }
@@ -76,4 +88,43 @@ public final class B {
     public final java.lang.String getD() {
         return null;
     }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getE() {
+        return null;
+    }
+
+    public final void setE(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getF() {
+        return null;
+    }
+
+    public final void setF(@org.jetbrains.annotations.NotNull()
+    java.lang.String value) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getG() {
+        return null;
+    }
+
+    public final void setG(@org.jetbrains.annotations.NotNull()
+    java.lang.String value) {
+    }
+
+    /**
+     * It's a getter
+     */
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getH() {
+        return null;
+    }
+
+    public final void setH(@org.jetbrains.annotations.NotNull()
+    java.lang.String value) {
+    }
 }

plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.kt

@@ -1,5 +1,6 @@
+// FIR_BLOCKED: KT-59287
 // !JVM_DEFAULT_MODE: all
-// EXPECTED_ERROR: (kotlin:15:5) modifier private not allowed here
+// EXPECTED_ERROR: (kotlin:16:5) modifier private not allowed here
 
 interface Foo {
     fun foo() {

plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.kt

@@ -1,5 +1,6 @@
+// FIR_BLOCKED: KT-59287
 // !JVM_DEFAULT_MODE: all-compatibility
-// EXPECTED_ERROR: (kotlin:15:5) modifier private not allowed here
+// EXPECTED_ERROR: (kotlin:16:5) modifier private not allowed here
 
 interface Foo {
     fun foo() {

plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.kt

@@ -1,4 +1,4 @@
-
+// FIR_BLOCKED: support of @JvmOverloads in LC
 class State @JvmOverloads constructor(
         val someInt: Int,
         val someLong: Long,

plugins/kapt3/kapt3-compiler/testData/converter/jvmRepeatableAnnotation.fir.txt

@@ -0,0 +1,19 @@
+@kotlin.Metadata()
+@Condition(condition = "value1")
+@Condition(condition = "value2")
+public final class A {
+
+    public A() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Condition {
+
+    public abstract java.lang.String condition();
+}

plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.fir.txt

@@ -0,0 +1,66 @@
+@kotlin.Metadata()
+public abstract interface FooComponent {
+    @org.jetbrains.annotations.NotNull()
+    public static final FooComponent.Companion Companion = null;
+
+    @kotlin.jvm.JvmStatic()
+    @org.jetbrains.annotations.NotNull()
+    public static java.lang.String create(@org.jetbrains.annotations.NotNull()
+    java.lang.String context) {
+        return null;
+    }
+
+    @kotlin.Metadata()
+    public static final class Companion {
+
+        private Companion() {
+            super();
+        }
+
+        @kotlin.jvm.JvmStatic()
+        @org.jetbrains.annotations.NotNull()
+        public final java.lang.String create(@org.jetbrains.annotations.NotNull()
+        java.lang.String context) {
+            return null;
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class JvmStaticTest {
+    @org.jetbrains.annotations.NotNull()
+    public static final JvmStaticTest.Companion Companion = null;
+    private static final int one = 1;
+    public static final int two = 2;
+    public static final char c = 'C';
+    public final byte three = (byte)3;
+    public final char d = 'D';
+
+    public JvmStaticTest() {
+        super();
+    }
+
+    public static final int getOne() {
+        return 0;
+    }
+
+    @kotlin.Metadata()
+    public static final class Companion {
+
+        private Companion() {
+            super();
+        }
+
+        public final int getOne() {
+            return 0;
+        }
+
+        @kotlin.jvm.JvmStatic()
+        @java.lang.Deprecated()
+        public static void getOne$annotations() {
+        }
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.fir.txt

@@ -0,0 +1,34 @@
+@kotlin.Metadata()
+public final class Test {
+    @org.jetbrains.annotations.NotNull()
+    public static final Test.A A = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String test = "";
+
+    public Test() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String getTest() {
+        return null;
+    }
+
+    @kotlin.Metadata()
+    public static final class A {
+
+        private A() {
+            super();
+        }
+
+        @org.jetbrains.annotations.NotNull()
+        public final java.lang.String getTest() {
+            return null;
+        }
+
+        @kotlin.jvm.JvmStatic()
+        @java.lang.Deprecated()
+        public static void getTest$annotations() {
+        }
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/kt14996.fir.txt

@@ -0,0 +1,19 @@
+@kotlin.Metadata()
+public final class Kt14996Kt {
+
+    public Kt14996Kt() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.CharSequence crashMe(@org.jetbrains.annotations.NotNull()
+    java.util.List<? extends java.lang.CharSequence> values) {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String crashMe(@org.jetbrains.annotations.NotNull()
+    java.util.List<java.lang.String> values) {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/kt14997.fir.txt

@@ -0,0 +1,62 @@
+@kotlin.Metadata()
+public class CrashMe {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.Runnable notReally = null;
+
+    public CrashMe() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@kotlin.Suppress(names = {"AMBIGUOUS_ANONYMOUS_TYPE_INFERRED"})
+public final class Kt14997Kt {
+
+    public Kt14997Kt() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.Runnable a() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.io.Serializable b() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final CrashMe c() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.util.List<java.lang.Runnable> d() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.Runnable[] e() {
+        return null;
+    }
+
+    public static final void e1(@org.jetbrains.annotations.NotNull()
+    java.lang.CharSequence[] a) {
+    }
+
+    public static final void e2(@org.jetbrains.annotations.NotNull()
+    java.lang.Object[] a) {
+    }
+
+    public static final void e3(@org.jetbrains.annotations.NotNull()
+    java.lang.CharSequence[] a) {
+    }
+
+    public static final void e3(@org.jetbrains.annotations.NotNull()
+    java.lang.Object[] a) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/kt14998.fir.txt

@@ -0,0 +1,59 @@
+@kotlin.Metadata()
+public final class Outer {
+
+    public Outer() {
+        super();
+    }
+
+    public final void nonAbstract(@org.jetbrains.annotations.NotNull()
+    java.lang.String s, int i) {
+    }
+
+    @kotlin.Metadata()
+    private final class Inner {
+        @org.jetbrains.annotations.NotNull()
+        private final java.lang.String foo = null;
+        @org.jetbrains.annotations.NotNull()
+        private final java.lang.String bar = null;
+
+        public Inner(@org.jetbrains.annotations.NotNull()
+        java.lang.String foo, @org.jetbrains.annotations.NotNull()
+        java.lang.String bar) {
+            super();
+        }
+
+        @org.jetbrains.annotations.NotNull()
+        public final java.lang.String getFoo() {
+            return null;
+        }
+
+        @org.jetbrains.annotations.NotNull()
+        public final java.lang.String getBar() {
+            return null;
+        }
+    }
+
+    @kotlin.Metadata()
+    private static final class Nested {
+        @org.jetbrains.annotations.NotNull()
+        private final java.lang.String foo = null;
+        @org.jetbrains.annotations.NotNull()
+        private final java.lang.String bar = null;
+
+        public Nested(@org.jetbrains.annotations.NotNull()
+        java.lang.String foo, @org.jetbrains.annotations.NotNull()
+        java.lang.String bar) {
+            super();
+        }
+
+        @org.jetbrains.annotations.NotNull()
+        public final java.lang.String getFoo() {
+            return null;
+        }
+
+        @org.jetbrains.annotations.NotNull()
+        public final java.lang.String getBar() {
+            return null;
+        }
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/kt17567.kt

@@ -4,3 +4,8 @@ internal class MutableEntry<K, V>(
         private val internal: MutableMap<K, V>,
         override val key: K, value: V
 ): MutableMap.MutableEntry<K, V>
+
+// <K:Ljava/lang/Object;V:Ljava/lang/Object;>
+// Ljava/lang/Object;
+// Ljava/util/Map$Entry<TK;TV;>;
+// Lkotlin/jvm/internal/markers/KMutableMap$Entry;

plugins/kapt3/kapt3-compiler/testData/converter/kt18682.fir.txt

@@ -0,0 +1,38 @@
+@kotlin.Metadata()
+public abstract class Foo {
+
+    public Foo() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Kt18682Kt {
+
+    public Kt18682Kt() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.util.List<java.lang.Object> test1() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.util.List<java.lang.Runnable> test2() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.util.List<Foo> test3() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.util.List<Foo> test4() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/kt27126.fir.txt

@@ -0,0 +1,99 @@
+package test;
+
+@kotlin.Metadata()
+public abstract class BundleProperty<AA extends java.lang.Object> extends test.NullableBundleProperty<AA> {
+
+    public BundleProperty(@org.jetbrains.annotations.Nullable()
+    java.lang.String key) {
+        super(null);
+    }
+
+    @java.lang.Override()
+    public final void setValue(@org.jetbrains.annotations.NotNull()
+    java.lang.Object thisRef, @org.jetbrains.annotations.NotNull()
+    kotlin.reflect.KProperty<?> property, @org.jetbrains.annotations.Nullable()
+    AA value) {
+    }
+
+    @java.lang.Override()
+    public final AA getValue(@org.jetbrains.annotations.NotNull()
+    java.lang.Object thisRef, @org.jetbrains.annotations.NotNull()
+    kotlin.reflect.KProperty<?> property) {
+        return null;
+    }
+
+    @java.lang.Override()
+    public final void setNullableValue(@org.jetbrains.annotations.NotNull()
+    java.lang.Object bundle, @org.jetbrains.annotations.NotNull()
+    java.lang.String key, @org.jetbrains.annotations.Nullable()
+    AA value) {
+    }
+
+    public abstract void setValue(@org.jetbrains.annotations.NotNull()
+    java.lang.Object bundle, @org.jetbrains.annotations.NotNull()
+    java.lang.String key, AA value);
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+@kotlin.Suppress(names = {"NOTHING_TO_INLINE"})
+public final class Kt27126Kt {
+
+    public Kt27126Kt() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final test.BundleProperty<java.lang.CharSequence> charSequence(@org.jetbrains.annotations.Nullable()
+    java.lang.String key) {
+        return null;
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public abstract class NullableBundleProperty<EE extends java.lang.Object> implements kotlin.properties.ReadWriteProperty<java.lang.Object, EE> {
+    @org.jetbrains.annotations.Nullable()
+    private final java.lang.String key = null;
+
+    public NullableBundleProperty(@org.jetbrains.annotations.Nullable()
+    java.lang.String key) {
+        super();
+    }
+
+    private final java.lang.String toKey(@org.jetbrains.annotations.NotNull()
+    kotlin.reflect.KProperty<?> $this$toKey) {
+        return null;
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    @java.lang.Override()
+    public EE getValue(@org.jetbrains.annotations.NotNull()
+    java.lang.Object thisRef, @org.jetbrains.annotations.NotNull()
+    kotlin.reflect.KProperty<?> property) {
+        return null;
+    }
+
+    @java.lang.Override()
+    public void setValue(@org.jetbrains.annotations.NotNull()
+    java.lang.Object thisRef, @org.jetbrains.annotations.NotNull()
+    kotlin.reflect.KProperty<?> property, @org.jetbrains.annotations.Nullable()
+    EE value) {
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public abstract EE getValue(@org.jetbrains.annotations.NotNull()
+    java.lang.Object bundle, @org.jetbrains.annotations.NotNull()
+    java.lang.String key);
+
+    public abstract void setNullableValue(@org.jetbrains.annotations.NotNull()
+    java.lang.Object bundle, @org.jetbrains.annotations.NotNull()
+    java.lang.String key, @org.jetbrains.annotations.Nullable()
+    EE value);
+}

plugins/kapt3/kapt3-compiler/testData/converter/kt28306.fir.txt

@@ -0,0 +1,16 @@
+package foo;
+
+@kotlin.Metadata()
+public abstract interface InterfaceWithDefaults<T extends java.lang.Object> {
+
+    public default void foo() {
+    }
+}
+
+////////////////////
+
+package foo;
+
+@kotlin.Metadata()
+public abstract interface SubInterface<T extends java.lang.Object> extends foo.InterfaceWithDefaults<T> {
+}

plugins/kapt3/kapt3-compiler/testData/converter/kt32596.kt

@@ -1,3 +1,4 @@
+// FIR_BLOCKED: KT-60482
 // CORRECT_ERROR_TYPES
 
 @file:Suppress("UNRESOLVED_REFERENCE", "ANNOTATION_ARGUMENT_MUST_BE_CONST")
@@ -14,6 +15,6 @@ class ErrorSomeMissingAnnotations
 
 annotation class Anno(val klass: KClass<*>)
 
-// EXPECTED_ERROR: (kotlin:9:1) cannot find symbol
-// EXPECTED_ERROR: (kotlin:12:1) cannot find symbol
-// EXPECTED_ERROR: (kotlin:6:1) cannot find symbol
+// EXPECTED_ERROR: (kotlin:10:1) cannot find symbol
+// EXPECTED_ERROR: (kotlin:13:1) cannot find symbol
+// EXPECTED_ERROR: (kotlin:7:1) cannot find symbol

plugins/kapt3/kapt3-compiler/testData/converter/kt43786.fir.txt

@@ -0,0 +1,52 @@
+@kotlin.Metadata()
+@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
+public final class Application {
+    public DataStore<Preferences> _preferencesDataStore;
+    @org.jetbrains.annotations.NotNull()
+    public static final Application.Companion Companion = null;
+
+    public Application() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final DataStore<Preferences> get_preferencesDataStore() {
+        return null;
+    }
+
+    public final void set_preferencesDataStore(@org.jetbrains.annotations.NotNull()
+    DataStore<Preferences> p0) {
+    }
+
+    @kotlin.jvm.JvmStatic()
+    @org.jetbrains.annotations.NotNull()
+    public static final Application get() {
+        return null;
+    }
+
+    @kotlin.jvm.JvmStatic()
+    @org.jetbrains.annotations.NotNull()
+    public static final DataStore<Preferences> getPreferencesDataStore() {
+        return null;
+    }
+
+    @kotlin.Metadata()
+    public static final class Companion {
+
+        private Companion() {
+            super();
+        }
+
+        @kotlin.jvm.JvmStatic()
+        @org.jetbrains.annotations.NotNull()
+        public final Application get() {
+            return null;
+        }
+
+        @kotlin.jvm.JvmStatic()
+        @org.jetbrains.annotations.NotNull()
+        public final DataStore<Preferences> getPreferencesDataStore() {
+            return null;
+        }
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.fir.txt

@@ -0,0 +1,45 @@
+@kotlin.Metadata()
+public final class Foo {
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Lazy<java.lang.Runnable> foo$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Lazy<java.lang.Object> bar$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Lazy<java.lang.Object> baz$delegate = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.Lazy<GenericIntf<java.lang.CharSequence>> generic1$delegate = null;
+
+    public Foo() {
+        super();
+    }
+
+    private final java.lang.Runnable getFoo() {
+        return null;
+    }
+
+    private final java.lang.Object getBar() {
+        return null;
+    }
+
+    private final java.lang.Object getBaz() {
+        return null;
+    }
+
+    private final GenericIntf<java.lang.CharSequence> getGeneric1() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public abstract interface GenericIntf<T extends java.lang.Object> {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public abstract interface Intf {
+}

plugins/kapt3/kapt3-compiler/testData/converter/leadingDollars.kt

@@ -1,3 +1,4 @@
+// FIR_BLOCKED: LC don't support names with $
 // CORRECT_ERROR_TYPES
 
 // FILE: $Test.java

plugins/kapt3/kapt3-compiler/testData/converter/leadingDollars2.kt

@@ -1,3 +1,4 @@
+// FIR_BLOCKED: LC don't support names with $
 // CORRECT_ERROR_TYPES
 
 // FILE: te/st/a/JavaClass.java

plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.fir.txt

@@ -0,0 +1,12 @@
+@kotlin.Metadata()
+public final class Test {
+
+    public Test() {
+        super();
+    }
+
+    public final void a(@org.jetbrains.annotations.NotNull()
+    ABC a, @org.jetbrains.annotations.NotNull()
+    BCD b) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.fir.txt

@@ -0,0 +1,30 @@
+@kotlin.Metadata()
+public abstract class Cls {
+
+    public Cls() {
+        super();
+    }
+
+    public abstract void foo(@org.jetbrains.annotations.NotNull()
+    java.lang.String abc);
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String bar(int bcd) {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public abstract interface Intf {
+
+    public abstract void foo(@org.jetbrains.annotations.NotNull()
+    java.lang.String abc);
+
+    @org.jetbrains.annotations.NotNull()
+    public default java.lang.String bar(int bcd) {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/modifiers.fir.txt

@@ -0,0 +1,189 @@
+package modifiers;
+
+@kotlin.Metadata()
+public final class InternalClass {
+
+    public InternalClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+@kotlin.Metadata()
+public abstract interface InternalInterface {
+}
+
+////////////////////
+
+package modifiers;
+
+@kotlin.Metadata()
+public final class Modifiers {
+    @kotlin.jvm.Transient()
+    @org.jetbrains.annotations.NotNull()
+    private final transient java.lang.String transientField = "";
+    @kotlin.jvm.Volatile()
+    @org.jetbrains.annotations.NotNull()
+    private volatile java.lang.String volatileField = "";
+
+    public Modifiers() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getTransientField() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getVolatileField() {
+        return null;
+    }
+
+    public final void setVolatileField(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
+    }
+
+    @kotlin.jvm.Strictfp()
+    public final strictfp void strictFp() {
+    }
+
+    @kotlin.jvm.JvmOverloads()
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String overloads() {
+        return null;
+    }
+
+    @kotlin.jvm.JvmOverloads()
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String overloads(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
+        return null;
+    }
+
+    @kotlin.jvm.JvmOverloads()
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String overloads(@org.jetbrains.annotations.NotNull()
+    java.lang.String a, int n) {
+        return null;
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+@kotlin.Metadata()
+final class PrivateClass {
+
+    public PrivateClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+@kotlin.Metadata()
+abstract interface PrivateInterface {
+}
+
+////////////////////
+
+package modifiers;
+
+@kotlin.Metadata()
+public final class PublicClass {
+
+    public PublicClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+@kotlin.Metadata()
+public abstract class PublicClassPrivateConstructor {
+
+    private PublicClassPrivateConstructor() {
+        super();
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+@kotlin.Metadata()
+public class PublicClassProtectedConstructor {
+
+    protected PublicClassProtectedConstructor() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    protected static abstract interface ProtectedInterface {
+    }
+
+    @kotlin.Metadata()
+    private static abstract interface PrivateInterface {
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+@kotlin.Metadata()
+public abstract interface PublicInterface {
+}
+
+////////////////////
+
+package modifiers;
+
+@kotlin.Metadata()
+public abstract class SealedClass {
+
+    protected SealedClass() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public static final class One extends modifiers.SealedClass {
+
+        public One() {
+            super();
+        }
+    }
+
+    @kotlin.Metadata()
+    public static class Two extends modifiers.SealedClass {
+
+        public Two() {
+            super();
+        }
+    }
+
+    @kotlin.Metadata()
+    public static abstract class Three extends modifiers.SealedClass.Two {
+
+        public Three() {
+            super();
+        }
+    }
+
+    @kotlin.Metadata()
+    public static final class Four extends modifiers.SealedClass.Three {
+
+        public Four() {
+            super();
+        }
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/multifileClassDefaultPackage.ir.txt

@@ -0,0 +1,40 @@
+@kotlin.Metadata()
+public final class AnotherRootClass {
+
+    public AnotherRootClass() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class RootClass {
+
+    public RootClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class M1 {
+
+    public M1() {
+        super();
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public static final AnotherRootClass bar() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public static final RootClass foo() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/multifileClassDefaultPackage.kt

@@ -0,0 +1,30 @@
+// STRICT
+
+// EXPECTED_ERROR: (other:-1:-1) test.M1: Can't reference type 'RootClass' from default package in Java stub.
+// EXPECTED_ERROR_K2: (other:-1:-1) test.M1: Can't reference type 'AnotherRootClass' from default package in Java stub.
+
+// FILE: a.kt
+
+class RootClass
+
+class AnotherRootClass
+
+// FILE: test/b.kt
+
+@file:JvmMultifileClass
+@file:JvmName("M1")
+package test
+
+import RootClass
+
+fun foo(): RootClass? = null
+
+// FILE: test/c.kt
+
+@file:JvmMultifileClass
+@file:JvmName("M1")
+package test
+
+import AnotherRootClass
+
+fun bar(): AnotherRootClass? = null

plugins/kapt3/kapt3-compiler/testData/converter/multifileClassDefaultPackage.txt

@@ -0,0 +1,40 @@
+@kotlin.Metadata()
+public final class AnotherRootClass {
+
+    public AnotherRootClass() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class RootClass {
+
+    public RootClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@kotlin.Metadata()
+public final class M1 {
+
+    public M1() {
+        super();
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public static final RootClass foo() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public static final AnotherRootClass bar() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.fir.txt

@@ -0,0 +1,163 @@
+@kotlin.Metadata()
+public final class A {
+    @org.jetbrains.annotations.Nullable()
+    private final A x = null;
+
+    public A() {
+        super();
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public final A getX() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public final A f1(@org.jetbrains.annotations.NotNull()
+    A a, @org.jetbrains.annotations.NotNull()
+    A.B b) {
+        return null;
+    }
+
+    @kotlin.Metadata()
+    public static abstract interface B {
+
+        @org.jetbrains.annotations.Nullable()
+        public abstract A.B getY();
+    }
+
+    @kotlin.Metadata()
+    public static final class C {
+        @org.jetbrains.annotations.NotNull()
+        public static final A.C INSTANCE = null;
+
+        private C() {
+            super();
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class A2 {
+
+    public A2() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public static final class B {
+
+        public B() {
+            super();
+        }
+
+        @kotlin.Metadata()
+        public static final class C {
+
+            public C() {
+                super();
+            }
+
+            @kotlin.Metadata()
+            public static final class D {
+
+                public D() {
+                    super();
+                }
+
+                @kotlin.Metadata()
+                public static final class Cme {
+
+                    public Cme() {
+                        super();
+                    }
+                }
+
+                @kotlin.Metadata()
+                public static final class E {
+
+                    public E() {
+                        super();
+                    }
+                }
+            }
+        }
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Foo {
+
+    public Foo() {
+        super();
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test {
+
+    public Test() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public static final class Nested {
+
+        public Nested() {
+            super();
+        }
+
+        @kotlin.Metadata()
+        public static final class NestedNested {
+
+            public NestedNested() {
+                super();
+            }
+        }
+    }
+
+    @kotlin.Metadata()
+    public final class Inner {
+
+        public Inner() {
+            super();
+        }
+    }
+
+    @kotlin.Metadata()
+    public static final class NestedObject {
+        @org.jetbrains.annotations.NotNull()
+        public static final Test.NestedObject INSTANCE = null;
+
+        private NestedObject() {
+            super();
+        }
+    }
+
+    @kotlin.Metadata()
+    public static abstract interface NestedInterface {
+    }
+
+    @kotlin.Metadata()
+    public static enum NestedEnum {
+        /*public static final*/ BLACK /* = new NestedEnum() */,
+        /*public static final*/ WHITE /* = new NestedEnum() */;
+
+        NestedEnum() {
+        }
+
+        @org.jetbrains.annotations.NotNull()
+        public static kotlin.enums.EnumEntries<Test.NestedEnum> getEntries() {
+            return null;
+        }
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.kt

@@ -1,3 +1,4 @@
+// FIR_BLOCKED: LC don't support names with $
 // EXPECTED_ERROR: class J$B is public, should be declared in a file named J$B.java
 // EXPECTED_ERROR: class JavaClass is public, should be declared in a file named JavaClass.java
 

plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.kt

@@ -1,3 +1,4 @@
+// FIR_BLOCKED: LC don't support names with $
 // EXPECTED_ERROR: class J$B is public, should be declared in a file named J$B.java
 
 // FILE: test/JavaClass.java

plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.fir.txt

@@ -0,0 +1,56 @@
+@kotlin.Metadata()
+@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
+public final class NonExistentType {
+    @org.jetbrains.annotations.NotNull()
+    public static final NonExistentType INSTANCE = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final ABCDEF a = null;
+    @org.jetbrains.annotations.Nullable()
+    private static final java.util.List<ABCDEF> b = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final kotlin.jvm.functions.Function1<ABCDEF, kotlin.Unit> c = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final ABCDEF<java.lang.String, kotlin.jvm.functions.Function1<java.util.List<? extends ABCDEF>, kotlin.Unit>> d = null;
+
+    private NonExistentType() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF getA() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public final java.util.List<ABCDEF> getB() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final kotlin.jvm.functions.Function1<ABCDEF, kotlin.Unit> getC() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF<java.lang.String, kotlin.jvm.functions.Function1<java.util.List<? extends ABCDEF>, kotlin.Unit>> getD() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final Foo getFoo() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF a(@org.jetbrains.annotations.NotNull()
+    ABCDEF a, @org.jetbrains.annotations.NotNull()
+    java.lang.String s) {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF b(@org.jetbrains.annotations.NotNull()
+    java.lang.String s) {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.kt

@@ -1,7 +1,9 @@
+// FIR_BLOCKED: KT-59698
 // CORRECT_ERROR_TYPES
 // NON_EXISTENT_CLASS
 // NO_VALIDATION
 // WITH_STDLIB
+// FULL_JDK
 
 @file:Suppress("UNRESOLVED_REFERENCE", "ANNOTATION_ARGUMENT_MUST_BE_CONST", "NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION", "UNSUPPORTED_FEATURE")
 import java.util.Calendar

plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.fir.txt

@@ -0,0 +1,118 @@
+@kotlin.Metadata()
+@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
+public final class NonExistentClassWIthoutCorrectionKt {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class NonExistentType {
+    @org.jetbrains.annotations.NotNull()
+    public static final NonExistentType INSTANCE = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final ABCDEF a = null;
+    @org.jetbrains.annotations.Nullable()
+    private static final java.util.List<ABCDEF> b = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final kotlin.jvm.functions.Function1<ABCDEF, kotlin.Unit> c = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final ABCDEF<java.lang.String, kotlin.jvm.functions.Function1<java.util.List<? extends ABCDEF>, kotlin.Unit>> d = null;
+    public static java.lang.String string2;
+    public static ABC coocoo;
+    public static ABC<java.lang.String> coocoo2;
+    public static ABC<ABC> coocoo21;
+    public static ABC<java.lang.String, java.lang.String> coocoo3;
+    public static ABC<java.lang.String, ABC<ABC>> coocoo31;
+
+    private NonExistentType() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF getA() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public final java.util.List<ABCDEF> getB() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final kotlin.jvm.functions.Function1<ABCDEF, kotlin.Unit> getC() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF<java.lang.String, kotlin.jvm.functions.Function1<java.util.List<? extends ABCDEF>, kotlin.Unit>> getD() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getString2() {
+        return null;
+    }
+
+    public final void setString2(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABC getCoocoo() {
+        return null;
+    }
+
+    public final void setCoocoo(@org.jetbrains.annotations.NotNull()
+    ABC p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABC<java.lang.String> getCoocoo2() {
+        return null;
+    }
+
+    public final void setCoocoo2(@org.jetbrains.annotations.NotNull()
+    ABC<java.lang.String> p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABC<ABC> getCoocoo21() {
+        return null;
+    }
+
+    public final void setCoocoo21(@org.jetbrains.annotations.NotNull()
+    ABC<ABC> p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABC<java.lang.String, java.lang.String> getCoocoo3() {
+        return null;
+    }
+
+    public final void setCoocoo3(@org.jetbrains.annotations.NotNull()
+    ABC<java.lang.String, java.lang.String> p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABC<java.lang.String, ABC<ABC>> getCoocoo31() {
+        return null;
+    }
+
+    public final void setCoocoo31(@org.jetbrains.annotations.NotNull()
+    ABC<java.lang.String, ABC<ABC>> p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF a(@org.jetbrains.annotations.NotNull()
+    ABCDEF a, @org.jetbrains.annotations.NotNull()
+    java.lang.String s) {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF b(@org.jetbrains.annotations.NotNull()
+    java.lang.String s) {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.fir.txt

@@ -0,0 +1,75 @@
+@kotlin.Metadata()
+public final class PrimitiveTypes {
+    @org.jetbrains.annotations.NotNull()
+    public static final PrimitiveTypes INSTANCE = null;
+    public static final boolean booleanFalse = false;
+    public static final boolean booleanTrue = true;
+    public static final int int0 = 0;
+    public static final int intMinus1000 = -1000;
+    public static final int intMinValue = -2147483648;
+    public static final int intMaxValue = 2147483647;
+    public static final int intHex = -1;
+    public static final byte byte0 = (byte)0;
+    public static final byte byte50 = (byte)50;
+    public static final short short5 = (short)5;
+    public static final char charC = 'C';
+    public static final char char0 = '\u0000';
+    public static final char char10 = '\n';
+    public static final char char13 = '\r';
+    public static final long long0 = 0L;
+    public static final long longMaxValue = 9223372036854775807L;
+    public static final long longMinValue = -9223372036854775808L;
+    public static final long longHex = 4294967295L;
+    public static final float float54 = 5.4F;
+    private static final float floatMaxValue = 3.4028235E38F;
+    private static final float floatNan = 0.0F / 0.0F;
+    private static final float floatPositiveInfinity = 1.0F / 0.0F;
+    private static final float floatNegativeInfinity = -1.0F / 0.0F;
+    public static final double double54 = 5.4;
+    private static final double doubleMaxValue = 1.7976931348623157E308;
+    private static final double doubleNan = 0.0 / 0.0;
+    private static final double doublePositiveInfinity = 1.0 / 0.0;
+    private static final double doubleNegativeInfinity = -1.0 / 0.0;
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String stringHelloWorld = "Hello, world!";
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String stringQuotes = "quotes \" \'\'quotes";
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String stringRN = "\r\n";
+
+    private PrimitiveTypes() {
+        super();
+    }
+
+    public final float getFloatMaxValue() {
+        return 0.0F;
+    }
+
+    public final float getFloatNan() {
+        return 0.0F;
+    }
+
+    public final float getFloatPositiveInfinity() {
+        return 0.0F;
+    }
+
+    public final float getFloatNegativeInfinity() {
+        return 0.0F;
+    }
+
+    public final double getDoubleMaxValue() {
+        return 0.0;
+    }
+
+    public final double getDoubleNan() {
+        return 0.0;
+    }
+
+    public final double getDoublePositiveInfinity() {
+        return 0.0;
+    }
+
+    public final double getDoubleNegativeInfinity() {
+        return 0.0;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.fir.txt

@@ -0,0 +1,38 @@
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.CLASS})
+@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE})
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno2 {
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String prop = "A";
+
+    public Test() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getProp() {
+        return null;
+    }
+
+    @Anno()
+    @Anno2()
+    @java.lang.Deprecated()
+    public static void getProp$annotations() {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.fir.txt

@@ -0,0 +1,44 @@
+package androidx.annotation;
+
+public interface Box {
+
+    @RecentlyNullable()
+    public String foo();
+}
+
+////////////////////
+
+package androidx.annotation;
+
+import java.lang.annotation.*;
+
+@Retention(value = RetentionPolicy.CLASS)
+@Target(value = {ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@interface RecentlyNullable {
+}
+
+////////////////////
+
+package app;
+
+@kotlin.Metadata()
+public final class KBox implements androidx.annotation.Box {
+    @org.jetbrains.annotations.NotNull()
+    private final androidx.annotation.Box delegate = null;
+
+    @androidx.annotation.RecentlyNullable()
+    @java.lang.Override()
+    public java.lang.String foo() {
+        return null;
+    }
+
+    public KBox(@org.jetbrains.annotations.NotNull()
+    androidx.annotation.Box delegate) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final androidx.annotation.Box getDelegate() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.fir.txt

@@ -0,0 +1,232 @@
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoArray {
+
+    public abstract int x();
+
+    public abstract java.lang.String[] a();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoBoolean {
+
+    public abstract int x();
+
+    public abstract boolean bool();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoChar {
+
+    public abstract int x();
+
+    public abstract char chr();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoClass {
+
+    public abstract int x();
+
+    public abstract java.lang.Class<Color> c();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoDouble {
+
+    public abstract int x();
+
+    public abstract double dbl();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoEnum {
+
+    public abstract int x();
+
+    public abstract Color c();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoFloat {
+
+    public abstract int x();
+
+    public abstract float flt();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoInt {
+
+    public abstract int x();
+
+    public abstract int i();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoIntArray {
+
+    public abstract int x();
+
+    public abstract int[] b();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoLong {
+
+    public abstract int x();
+
+    public abstract long l();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoLongArray {
+
+    public abstract int x();
+
+    public abstract long[] b();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface AnnoString {
+
+    public abstract int x();
+
+    public abstract java.lang.String s();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum Color {
+    /*public static final*/ BLACK /* = new Color() */;
+
+    Color() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Color> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test {
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String value = "";
+
+    public Test() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getValue() {
+        return null;
+    }
+
+    @lib.Anno(value = "1")
+    @lib.Anno(value = "2", construct = {"A", "B"})
+    @lib.Anno(value = "3", construct = {"C"})
+    @java.lang.Deprecated()
+    public static void getValue$annotations() {
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+@AnnoChar(x = 100, chr = 'c')
+@AnnoBoolean(x = 100, bool = false)
+@AnnoInt(x = 100, i = 5)
+@AnnoFloat(x = 100, flt = 1.0F)
+@AnnoDouble(x = 100, dbl = 4.0)
+@AnnoString(x = 100, s = "AAA")
+@AnnoIntArray(x = 100, b = {1, 2, 3})
+@AnnoLongArray(x = 100, b = {1L, 3L})
+@AnnoArray(x = 100, a = {"A", "B"})
+@AnnoClass(x = 100, c = Color.class)
+public final class Test2 {
+
+    public Test2() {
+        super();
+    }
+}
+
+////////////////////
+
+package lib;
+
+public @interface Anno {
+
+    String[] construct() default {};
+
+    String value();
+}
+
+////////////////////
+
+package lib;
+
+public class R {
+
+    public R() {
+        super();
+    }
+
+    public static class id {
+
+        public id() {
+            super();
+        }
+        public static final int textView = 100;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.fir.txt

@@ -0,0 +1,33 @@
+package secondary;
+
+@kotlin.Metadata()
+public abstract interface Named {
+
+    @org.jetbrains.annotations.Nullable()
+    public abstract java.lang.String getName();
+}
+
+////////////////////
+
+package secondary;
+
+@kotlin.Metadata()
+public final class Product2 implements secondary.Named {
+    @org.jetbrains.annotations.Nullable()
+    private java.lang.String name = null;
+
+    @org.jetbrains.annotations.Nullable()
+    @java.lang.Override()
+    public java.lang.String getName() {
+        return null;
+    }
+
+    public void setName(@org.jetbrains.annotations.Nullable()
+    java.lang.String p0) {
+    }
+
+    public Product2(@org.jetbrains.annotations.NotNull()
+    java.lang.String otherName) {
+        super();
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/starImports.fir.txt

@@ -0,0 +1,43 @@
+@kotlin.Metadata()
+public final class ResolvedKt {
+
+    public ResolvedKt() {
+        super();
+    }
+    @org.jetbrains.annotations.Nullable()
+    private static kotlin.io.encoding.Base64 base64 = null;
+
+    @org.jetbrains.annotations.Nullable()
+    public static final kotlin.io.encoding.Base64 getBase64() {
+        return null;
+    }
+
+    public static final void setBase64(@org.jetbrains.annotations.Nullable()
+    kotlin.io.encoding.Base64 p0) {
+    }
+}
+
+////////////////////
+
+
+import kotlin.io.encoding.*;
+
+@kotlin.Metadata()
+@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
+public final class UnresolvedKt {
+
+    public UnresolvedKt() {
+        super();
+    }
+    @org.jetbrains.annotations.NotNull()
+    private static Base65 base65 = null;
+
+    @org.jetbrains.annotations.NotNull()
+    public static final Base65 getBase65() {
+        return null;
+    }
+
+    public static final void setBase65(@org.jetbrains.annotations.NotNull()
+    Base65 p0) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/starImports.kt

@@ -0,0 +1,11 @@
+// CORRECT_ERROR_TYPES
+// FILE: resolved.kt
+import kotlin.io.encoding.*
+
+var base64: Base64? = null
+
+// FILE: unresolved.kt
+@file:Suppress("UNRESOLVED_REFERENCE")
+import kotlin.io.encoding.*
+
+var base65: Base65? = null

plugins/kapt3/kapt3-compiler/testData/converter/starImports.txt

@@ -0,0 +1,45 @@
+import kotlin.io.encoding.*;
+
+@kotlin.Metadata()
+public final class ResolvedKt {
+
+    public ResolvedKt() {
+        super();
+    }
+    @org.jetbrains.annotations.Nullable()
+    private static kotlin.io.encoding.Base64 base64;
+
+    @org.jetbrains.annotations.Nullable()
+    public static final kotlin.io.encoding.Base64 getBase64() {
+        return null;
+    }
+
+    public static final void setBase64(@org.jetbrains.annotations.Nullable()
+    kotlin.io.encoding.Base64 p0) {
+    }
+}
+
+////////////////////
+
+
+import kotlin.io.encoding.*;
+
+@kotlin.Metadata()
+@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
+public final class UnresolvedKt {
+
+    public UnresolvedKt() {
+        super();
+    }
+    @org.jetbrains.annotations.Nullable()
+    private static Base65 base65;
+
+    @org.jetbrains.annotations.Nullable()
+    public static final Base65 getBase65() {
+        return null;
+    }
+
+    public static final void setBase65(@org.jetbrains.annotations.Nullable()
+    Base65 p0) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.fir.txt

@@ -0,0 +1,62 @@
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+
+    public abstract StrangeEnum size();
+
+    public abstract java.lang.String name();
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum StrangeEnum {
+    /*public static final*/ InvalidFieldName /* = new StrangeEnum() */;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String size = null;
+
+    StrangeEnum(java.lang.String size) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getSize() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<StrangeEnum> getEntries() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Test {
+    public final java.lang.String simpleName = null;
+
+    public Test() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getSimpleName() {
+        return null;
+    }
+
+    public final void simpleFun() {
+    }
+
+    @Anno(name = "Woofwoof", size = StrangeEnum.InvalidFieldName)
+    public final void simpleFun2(@org.jetbrains.annotations.NotNull()
+    java.lang.String a, @org.jetbrains.annotations.NotNull()
+    java.lang.String b) {
+    }
+
+    public final void strangeFun4(@org.jetbrains.annotations.NotNull()
+    java.lang.String a, @org.jetbrains.annotations.NotNull()
+    java.lang.String p1_949560896) {
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.fir.txt

@@ -0,0 +1,49 @@
+public abstract class BaseClass {
+
+    public BaseClass(@org.jetbrains.annotations.NotNull()
+    Context context, int num, boolean bool) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract Result doJob();
+}
+
+////////////////////
+
+
+public abstract interface Context {
+}
+
+////////////////////
+
+
+public final class Inheritor extends BaseClass {
+
+    public Inheritor(@org.jetbrains.annotations.NotNull()
+    Context context) {
+        super(null, 0, false);
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    @java.lang.Override()
+    public Result doJob() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+public enum Result {
+    /*public static final*/ SUCCESS /* = new Result() */,
+    /*public static final*/ ERROR /* = new Result() */;
+
+    Result() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<Result> getEntries() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.fir.txt

@@ -0,0 +1,13 @@
+@kotlin.Metadata()
+public final class Foo {
+
+    public Foo() {
+        super();
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public final java.lang.Object a(@org.jetbrains.annotations.NotNull()
+    kotlin.coroutines.Continuation<? super ABC> $completion) {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/topLevel.fir.txt

@@ -0,0 +1,69 @@
+package test.another;
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+
+    public abstract java.lang.String value();
+}
+
+////////////////////
+
+package test.another;
+
+@kotlin.Metadata()
+public final class TopLevelKt {
+
+    public TopLevelKt() {
+        super();
+    }
+    public static final int topLevelConstProperty = 2;
+    private static final int topLevelProperty = 2;
+
+    public static final void extensionFunction(@Anno(value = "rec")
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String $this$extensionFunction, @Anno(value = "1")
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String a, @Anno(value = "2")
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String b) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final <T extends java.lang.Object>java.lang.String getExtensionProperty(@Anno(value = "propRec")
+    @org.jetbrains.annotations.NotNull()
+    T $this$extensionProperty) {
+        return null;
+    }
+
+    @Anno(value = "extpr")
+    @java.lang.Deprecated()
+    public static void getExtensionProperty$annotations(java.lang.Object p0) {
+    }
+
+    public static final int getTopLevelProperty() {
+        return 0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String getTopLevelProperty2() {
+        return null;
+    }
+
+    public static final <T extends java.lang.Object>void setExtensionProperty(@Anno(value = "propRec")
+    @org.jetbrains.annotations.NotNull()
+    T $this$extensionProperty, @Anno(value = "setparam")
+    @org.jetbrains.annotations.NotNull()
+    java.lang.String setParamName) {
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public static final java.lang.String topLevelFunction() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.Nullable()
+    public static final <X extends java.lang.CharSequence, T extends java.util.List<? extends X>>T topLevelGenericFunction() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/testData/converter/topLevel.kt

@@ -1,3 +1,5 @@
+// WITH_STDLIB
+// FULL_JDK
 package test.another
 
 annotation class Anno(val value: String)

plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.fir.txt

@@ -0,0 +1,233 @@
+@kotlin.Metadata()
+public final class Boo {
+    @org.jetbrains.annotations.NotNull()
+    public static final Boo INSTANCE = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String z = null;
+
+    private Boo() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getZ() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String foo() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class Foo {
+    @org.jetbrains.annotations.NotNull()
+    public static final Foo INSTANCE = null;
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String aString = "foo";
+    public static final int aInt = 3;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String bString = "bar";
+    private static final int bInt = 5;
+    @org.jetbrains.annotations.NotNull()
+    private static java.lang.String cString = "baz";
+    private static int cInt = 7;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String d = null;
+    private static final int e = 0;
+    private static final int f = 8;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String g = "ab";
+    private static final int h = -4;
+    private static final int i = 2147483647;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String j = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String k = null;
+
+    private Foo() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getBString() {
+        return null;
+    }
+
+    public final int getBInt() {
+        return 0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getCString() {
+        return null;
+    }
+
+    public final void setCString(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
+    }
+
+    public final int getCInt() {
+        return 0;
+    }
+
+    public final void setCInt(int p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getD() {
+        return null;
+    }
+
+    public final int getE() {
+        return 0;
+    }
+
+    public final int getF() {
+        return 0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getG() {
+        return null;
+    }
+
+    public final int getH() {
+        return 0;
+    }
+
+    public final int getI() {
+        return 0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getJ() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getK() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public final class HavingState {
+    @org.jetbrains.annotations.NotNull()
+    private final State state = State.START;
+    @org.jetbrains.annotations.NotNull()
+    private final State[] stateArray = {State.START};
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.String[] stringArray = {"foo"};
+    @org.jetbrains.annotations.NotNull()
+    private final java.util.List<java.lang.String> stringList = null;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.Integer[] intArray = {1};
+    @org.jetbrains.annotations.NotNull()
+    private final float[] floatArray = {-1.0F};
+    @org.jetbrains.annotations.NotNull()
+    private final java.util.List<java.lang.Integer> intList = null;
+    private final int uint = 1;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.UInt[] uintArray = {1};
+    @org.jetbrains.annotations.NotNull()
+    private final java.util.List<kotlin.UInt> uintList = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.reflect.KClass<State> clazz = null;
+    @org.jetbrains.annotations.NotNull()
+    private final java.lang.Class<State> javaClass = null;
+    @org.jetbrains.annotations.NotNull()
+    private final kotlin.reflect.KClass<? extends java.lang.Object> anonymous = null;
+
+    public HavingState() {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final State getState() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final State[] getStateArray() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String[] getStringArray() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.List<java.lang.String> getStringList() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.Integer[] getIntArray() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final float[] getFloatArray() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.List<java.lang.Integer> getIntList() {
+        return null;
+    }
+
+    public final int getUint() {
+        return 0;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final kotlin.UInt[] getUintArray() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.List<kotlin.UInt> getUintList() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final kotlin.reflect.KClass<State> getClazz() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.Class<State> getJavaClass() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final kotlin.reflect.KClass<? extends java.lang.Object> getAnonymous() {
+        return null;
+    }
+}
+
+////////////////////
+
+
+@kotlin.Metadata()
+public enum State {
+    /*public static final*/ START /* = new State() */,
+    /*public static final*/ FINISH /* = new State() */;
+
+    State() {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static kotlin.enums.EnumEntries<State> getEntries() {
+        return null;
+    }
+}

plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/ClassFileToSourceStubConverterTestGenerated.java

@@ -535,6 +535,12 @@ public class ClassFileToSourceStubConverterTestGenerated extends AbstractClassFi
         runTest("plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.kt");
     }
 
+    @Test
+    @TestMetadata("multifileClassDefaultPackage.kt")
+    public void testMultifileClassDefaultPackage() throws Exception {
+        runTest("plugins/kapt3/kapt3-compiler/testData/converter/multifileClassDefaultPackage.kt");
+    }
+
     @Test
     @TestMetadata("nestedClasses.kt")
     public void testNestedClasses() throws Exception {
@@ -613,6 +619,12 @@ public class ClassFileToSourceStubConverterTestGenerated extends AbstractClassFi
         runTest("plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.kt");
     }
 
+    @Test
+    @TestMetadata("starImports.kt")
+    public void testStarImports() throws Exception {
+        runTest("plugins/kapt3/kapt3-compiler/testData/converter/starImports.kt");
+    }
+
     @Test
     @TestMetadata("strangeIdentifiers.kt")
     public void testStrangeIdentifiers() throws Exception {

plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrClassFileToSourceStubConverterTestGenerated.java

@@ -535,6 +535,12 @@ public class IrClassFileToSourceStubConverterTestGenerated extends AbstractIrCla
         runTest("plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.kt");
     }
 
+    @Test
+    @TestMetadata("multifileClassDefaultPackage.kt")
+    public void testMultifileClassDefaultPackage() throws Exception {
+        runTest("plugins/kapt3/kapt3-compiler/testData/converter/multifileClassDefaultPackage.kt");
+    }
+
     @Test
     @TestMetadata("nestedClasses.kt")
     public void testNestedClasses() throws Exception {
@@ -613,6 +619,12 @@ public class IrClassFileToSourceStubConverterTestGenerated extends AbstractIrCla
         runTest("plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.kt");
     }
 
+    @Test
+    @TestMetadata("starImports.kt")
+    public void testStarImports() throws Exception {
+        runTest("plugins/kapt3/kapt3-compiler/testData/converter/starImports.kt");
+    }
+
     @Test
     @TestMetadata("strangeIdentifiers.kt")
     public void testStrangeIdentifiers() throws Exception {

plugins/kapt4/build.gradle.kts

@@ -13,6 +13,17 @@ dependencies {
 
     implementation(project(":kotlin-annotation-processing-compiler"))
     embedded(project(":kotlin-annotation-processing-compiler")) { isTransitive = false }
+    implementation(project(":analysis:analysis-api-standalone"))
+    embedded(project(":analysis:analysis-api-standalone")) {
+        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+        exclude("org.jetbrains.kotlin", "kotlin-stdlib-common")
+    }
+    compileOnly(toolsJarApi())
+    testApiJUnit5()
+    testApi(projectTests(":kotlin-annotation-processing-compiler"))
+    testRuntimeOnly(toolsJar())
+    testRuntimeOnly(commonDependency("org.codehaus.woodstox:stax2-api"))
+    testRuntimeOnly(commonDependency("com.fasterxml:aalto-xml"))
 }
 
 optInToExperimentalCompilerApi()

plugins/kapt4/src/org/jetbrains/kotlin/kapt4/Kapt4ContextForStubGeneration.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.kapt4
+
+import com.sun.tools.javac.tree.TreeMaker
+import com.sun.tools.javac.util.Context
+import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.base.kapt3.KaptOptions
+import org.jetbrains.kotlin.kapt3.base.KaptContext
+import org.jetbrains.kotlin.kapt3.base.util.KaptLogger
+
+internal class Kapt4ContextForStubGeneration(
+    options: KaptOptions,
+    withJdk: Boolean,
+    logger: KaptLogger,
+    val analysisSession: KtAnalysisSession,
+    val classes: Iterable<KtLightClass>
+) : KaptContext(options, withJdk, logger) {
+    internal val treeMaker = TreeMaker.instance(context) as Kapt4TreeMaker
+
+    override fun preregisterTreeMaker(context: Context) {
+        Kapt4TreeMaker.preRegister(context)
+    }
+}