Kapt3: Write Intellij annotations (NotNull/Nullable) to stubs

plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt

@@ -67,7 +67,6 @@ class ClassFileToSourceStubConverter(
                 "java.lang.Synthetic",
                 "synthetic.kotlin.jvm.GeneratedByJvmOverloads", // kapt3-related annotation for marking JvmOverloads-generated methods
                 "java.lang.annotation.", // Java annotations
-                "org.jetbrains.annotations.", // Nullable/NotNull, ReadOnly, Mutable
                 "kotlin.jvm.", "kotlin.Metadata" // Kotlin annotations from runtime
         )
 

plugins/kapt3/testData/converter/abstractEnum.txt

@@ -74,7 +74,8 @@ public enum E2 {
     E2(int n) {
     }
 
-    E2(java.lang.String s) {
+    E2(@org.jetbrains.annotations.NotNull()
+    java.lang.String s) {
     }
 }
 
@@ -84,13 +85,16 @@ public enum E2 {
 public enum E3 {
     /*public static final*/ X /* = new X(null) */,
     /*public static final*/ Y /* = new Y(null) */;
+    @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getA() {
         return null;
     }
 
-    E3(java.lang.String a) {
+    E3(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
     }
 }
 
@@ -99,11 +103,13 @@ public enum E3 {
 
 public enum E4 {
     /*public static final*/ X /* = new X(null, 0, 0L, false) */;
+    @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;
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getA() {
         return null;
     }
@@ -120,6 +126,7 @@ public enum E4 {
         return false;
     }
 
-    E4(java.lang.String a, int b, long c, boolean d) {
+    E4(@org.jetbrains.annotations.NotNull()
+    java.lang.String a, int b, long c, boolean d) {
     }
 }

plugins/kapt3/testData/converter/abstractMethods.txt

@@ -1,8 +1,10 @@
 public abstract class Base {
 
-    protected abstract void doJob(java.lang.String p0, int p1);
+    protected abstract void doJob(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0, int p1);
 
-    protected abstract <T extends java.lang.CharSequence>void doJobGeneric(T p0, int p1);
+    protected abstract <T extends java.lang.CharSequence>void doJobGeneric(@org.jetbrains.annotations.NotNull()
+    T p0, int p1);
 
     public Base() {
         super();
@@ -15,11 +17,13 @@ public abstract class Base {
 public final class Impl extends Base {
 
     @java.lang.Override()
-    protected void doJob(java.lang.String job, int delay) {
+    protected void doJob(@org.jetbrains.annotations.NotNull()
+    java.lang.String job, int delay) {
     }
 
     @java.lang.Override()
-    protected <T extends java.lang.CharSequence>void doJobGeneric(T job, int delay) {
+    protected <T extends java.lang.CharSequence>void doJobGeneric(@org.jetbrains.annotations.NotNull()
+    T job, int delay) {
     }
 
     public Impl() {

plugins/kapt3/testData/converter/annotations.txt

@@ -63,11 +63,13 @@ public final class TestAnno {
 @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})
 @Anno3(value = "value")
 public final class TestAnno2 {
+    @org.jetbrains.annotations.NotNull()
     @Anno3(value = "field")
     private java.lang.String b;
 
     @Anno1()
-    public final void a(@Anno3(value = "param-pam-pam")
+    public final void a(@org.jetbrains.annotations.NotNull()
+    @Anno3(value = "param-pam-pam")
     java.lang.String param) {
     }
 
@@ -75,13 +77,15 @@ public final class TestAnno2 {
     private static void b$annotations() {
     }
 
+    @org.jetbrains.annotations.NotNull()
     @Anno3(value = "getter")
     public final java.lang.String getB() {
         return null;
     }
 
     @Anno3(value = "setter")
-    public final void setB(@Anno3(value = "setparam")
+    public final void setB(@org.jetbrains.annotations.NotNull()
+    @Anno3(value = "setparam")
     java.lang.String p0) {
     }
 

plugins/kapt3/testData/converter/annotations2.txt

@@ -17,7 +17,8 @@ public final class AnnotationsTest {
     }
 
     @Anno(value = "top-level-fun")
-    public static final void topLevelFun(@Anno(value = "top-level-fun-receiver")
+    public static final void topLevelFun(@org.jetbrains.annotations.NotNull()
+    @Anno(value = "top-level-fun-receiver")
     java.lang.String $receiver) {
     }
 
@@ -25,6 +26,7 @@ public final class AnnotationsTest {
     private static void topLevelVal$annotations(int p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
     int $receiver) {
         return null;
@@ -57,8 +59,10 @@ package test;
 
 @Anno(value = "clazz")
 public abstract class Test {
+    @org.jetbrains.annotations.NotNull()
     private java.lang.String v;
 
+    @org.jetbrains.annotations.NotNull()
     @Anno(value = "abstract-method")
     public abstract java.lang.String abstractMethod();
 
@@ -66,24 +70,28 @@ public abstract class Test {
     private static void abstractVal$annotations() {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public abstract java.lang.String getAbstractVal();
 
     @Anno(value = "v-property")
     private static void v$annotations() {
     }
 
+    @org.jetbrains.annotations.NotNull()
     @Anno(value = "v-get")
     public final java.lang.String getV() {
         return null;
     }
 
     @Anno(value = "v-set")
-    public final void setV(@Anno(value = "v-setparam")
+    public final void setV(@org.jetbrains.annotations.NotNull()
+    @Anno(value = "v-setparam")
     java.lang.String p0) {
     }
 
     @Anno(value = "test-constructor")
-    protected Test(@Anno(value = "v-param")
+    protected Test(@org.jetbrains.annotations.NotNull()
+    @Anno(value = "v-param")
     java.lang.String v) {
         super();
     }

plugins/kapt3/testData/converter/dataClass.txt

@@ -1,16 +1,19 @@
-
 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;
 
     public final void procedure() {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getFirstName() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getSecondName() {
         return null;
     }
@@ -19,14 +22,18 @@ public final class User {
         return 0;
     }
 
-    public User(java.lang.String firstName, java.lang.String secondName, int age) {
+    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 component2() {
         return null;
     }
@@ -35,7 +42,10 @@ public final class User {
         return 0;
     }
 
-    public final User copy(java.lang.String firstName, java.lang.String secondName, int age) {
+    @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;
     }
 
@@ -53,4 +63,4 @@ public final class User {
     public boolean equals(java.lang.Object p0) {
         return false;
     }
-}
+}

plugins/kapt3/testData/converter/enums.txt

@@ -20,9 +20,11 @@ public enum Enum1 {
 public enum Enum2 {
     /*public static final*/ RED /* = new RED(null, 0) */,
     /*public static final*/ WHITE /* = new WHITE(null, 0) */;
+    @org.jetbrains.annotations.NotNull()
     private final java.lang.String col = null;
     private final int col2 = 0;
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String color() {
         return null;
     }
@@ -33,6 +35,7 @@ public enum Enum2 {
     public final void publicEnumFun() {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getCol() {
         return null;
     }
@@ -41,7 +44,8 @@ public enum Enum2 {
         return 0;
     }
 
-    Enum2(@Anno1(value = "first")
+    Enum2(@org.jetbrains.annotations.NotNull()
+    @Anno1(value = "first")
     java.lang.String col, @Anno1(value = "second")
     int col2) {
     }

plugins/kapt3/testData/converter/functions.txt

@@ -1,9 +1,11 @@
 public final class FunctionsTest {
 
+    @org.jetbrains.annotations.NotNull()
     public final kotlin.reflect.KProperty1<java.lang.String, java.lang.Integer> f() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final kotlin.jvm.functions.Function2<java.lang.Integer, java.lang.Integer, java.lang.Boolean> f2() {
         return null;
     }

plugins/kapt3/testData/converter/genericRawSignatures.txt

@@ -1,9 +1,11 @@
 public final class GenericRawSignatures {
 
+    @org.jetbrains.annotations.Nullable()
     public final <T extends java.lang.Object>T genericFun() {
         return null;
     }
 
+    @org.jetbrains.annotations.Nullable()
     public final java.lang.String nonGenericFun() {
         return null;
     }

plugins/kapt3/testData/converter/genericSimple.txt

@@ -1,8 +1,13 @@
 public abstract interface ABC {
 
-    public abstract <T extends java.lang.CharSequence>java.util.List<T> abc(T p0, java.util.List<? extends T> p1, T... p2);
+    @org.jetbrains.annotations.NotNull()
+    public abstract <T extends java.lang.CharSequence>java.util.List<T> abc(@org.jetbrains.annotations.NotNull()
+    T p0, @org.jetbrains.annotations.NotNull()
+    java.util.List<? extends T> p1, @org.jetbrains.annotations.NotNull()
+    T... p2);
 
-    public abstract <X extends java.lang.Object>int bcd(char... p0);
+    public abstract <X extends java.lang.Object>int bcd(@org.jetbrains.annotations.NotNull()
+    char... p0);
 }
 
 ////////////////////
@@ -31,8 +36,10 @@ public abstract interface Intf2<T extends java.util.List<? extends java.lang.Str
 
 
 public final class MyClass<M1 extends java.lang.Object, M2 extends java.lang.Object> extends BaseClass<java.lang.RuntimeException> implements Intf<java.lang.Object, java.util.Date>, OtherIntf<java.lang.String> {
+    @org.jetbrains.annotations.Nullable()
     private final java.util.List<java.util.Map<java.lang.String, M1>> fld = null;
 
+    @org.jetbrains.annotations.Nullable()
     public final java.util.List<java.util.Map<java.lang.String, M1>> getFld() {
         return null;
     }

plugins/kapt3/testData/converter/inheritanceSimple.txt

@@ -1,8 +1,10 @@
 public abstract class BaseClass {
 
+    @org.jetbrains.annotations.NotNull()
     public abstract Result doJob();
 
-    public BaseClass(Context context, int num, boolean bool) {
+    public BaseClass(@org.jetbrains.annotations.NotNull()
+    Context context, int num, boolean bool) {
         super();
     }
 }
@@ -18,12 +20,14 @@ public abstract interface Context {
 
 public final class Inheritor extends BaseClass {
 
+    @org.jetbrains.annotations.NotNull()
     @java.lang.Override()
     public Result doJob() {
         return null;
     }
 
-    public Inheritor(Context context) {
+    public Inheritor(@org.jetbrains.annotations.NotNull()
+    Context context) {
         super(null, 0, false);
     }
 }

plugins/kapt3/testData/converter/javaKeywords.txt

@@ -1,6 +1,8 @@
 public final class _default_ {
+    @org.jetbrains.annotations.NotNull()
     public java.lang.String _extends_;
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getExtends() {
         return null;
     }

plugins/kapt3/testData/converter/jvmOverloads.txt

@@ -1,6 +1,7 @@
 public final class State {
     private final int someInt = 0;
     private final long someLong = 0L;
+    @org.jetbrains.annotations.NotNull()
     private final java.lang.String someString = null;
 
     public final int getSomeInt() {
@@ -11,11 +12,13 @@ public final class State {
         return 0L;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getSomeString() {
         return null;
     }
 
-    public State(int someInt, long someLong, java.lang.String someString) {
+    public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
+    java.lang.String someString) {
         super();
     }
 
@@ -30,9 +33,11 @@ public final class State {
 public final class State2 {
     public final int someInt = 0;
     public final long someLong = 0L;
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String someString = null;
 
-    public final int test(int someInt, long someLong, java.lang.String someString) {
+    public final int test(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
+    java.lang.String someString) {
         return 0;
     }
 
@@ -44,13 +49,15 @@ public final class State2 {
         return 0;
     }
 
-    public final void someMethod(java.lang.String str) {
+    public final void someMethod(@org.jetbrains.annotations.NotNull()
+    java.lang.String str) {
     }
 
     public final void methodWithoutArgs() {
     }
 
-    public State2(int someInt, long someLong, java.lang.String someString) {
+    public State2(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
+    java.lang.String someString) {
         super();
     }
 

plugins/kapt3/testData/converter/jvmStaticFieldInParent.txt

@@ -1,4 +1,5 @@
 public final class Test {
+    @org.jetbrains.annotations.NotNull()
     private static final java.lang.String test = "";
     public static final Test.A A = null;
 
@@ -6,6 +7,7 @@ public final class Test {
         super();
     }
 
+    @org.jetbrains.annotations.NotNull()
     public static final java.lang.String getTest() {
         return null;
     }
@@ -15,6 +17,7 @@ public final class Test {
         private static void test$annotations() {
         }
 
+        @org.jetbrains.annotations.NotNull()
         public final java.lang.String getTest() {
             return null;
         }

plugins/kapt3/testData/converter/kt14996.txt

@@ -4,11 +4,15 @@ public final class Kt14996Kt {
         super();
     }
 
-    public static final java.lang.String crashMe(java.util.List<java.lang.String> values) {
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String crashMe(@org.jetbrains.annotations.NotNull()
+    java.util.List<java.lang.String> values) {
         return null;
     }
 
-    public static final java.lang.CharSequence crashMe(java.util.List<? extends java.lang.CharSequence> values) {
+    @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;
     }
 }

plugins/kapt3/testData/converter/kt14997.txt

@@ -16,14 +16,17 @@ public final class Kt14997Kt {
         super();
     }
 
+    @org.jetbrains.annotations.NotNull()
     public static final java.lang.Runnable a() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public static final java.lang.Runnable b() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public static final CrashMe c() {
         return null;
     }

plugins/kapt3/testData/converter/kt14998.txt

@@ -1,44 +1,58 @@
 public final class Outer {
 
-    public final void nonAbstract(java.lang.String s, int i) {
+    public final void nonAbstract(@org.jetbrains.annotations.NotNull()
+    java.lang.String s, int i) {
     }
 
-    public abstract void _abstract_(java.lang.String p0, int p1);
+    public abstract void _abstract_(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0, int p1);
 
     public Outer() {
         super();
     }
 
     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;
 
+        @org.jetbrains.annotations.NotNull()
         public final java.lang.String getFoo() {
             return null;
         }
 
+        @org.jetbrains.annotations.NotNull()
         public final java.lang.String getBar() {
             return null;
         }
 
-        public Inner(java.lang.String foo, java.lang.String bar) {
+        public Inner(@org.jetbrains.annotations.NotNull()
+        java.lang.String foo, @org.jetbrains.annotations.NotNull()
+        java.lang.String bar) {
             super();
         }
     }
 
     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;
 
+        @org.jetbrains.annotations.NotNull()
         public final java.lang.String getFoo() {
             return null;
         }
 
+        @org.jetbrains.annotations.NotNull()
         public final java.lang.String getBar() {
             return null;
         }
 
-        public Nested(java.lang.String foo, java.lang.String bar) {
+        public Nested(@org.jetbrains.annotations.NotNull()
+        java.lang.String foo, @org.jetbrains.annotations.NotNull()
+        java.lang.String bar) {
             super();
         }
     }

plugins/kapt3/testData/converter/mapEntry.txt

@@ -1,6 +1,9 @@
 public abstract interface EntryHolder {
 
-    public abstract java.util.Map.Entry<java.lang.String, java.lang.Object> entry(java.util.Map.Entry<? extends java.lang.CharSequence, ? extends java.util.Map.Entry<java.lang.String, java.lang.Integer>> p0);
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.util.Map.Entry<java.lang.String, java.lang.Object> entry(@org.jetbrains.annotations.NotNull()
+    java.util.Map.Entry<? extends java.lang.CharSequence, ? extends java.util.Map.Entry<java.lang.String, java.lang.Integer>> p0);
 
+    @org.jetbrains.annotations.NotNull()
     public abstract java.util.Map.Entry<java.lang.String, java.lang.Object> getEntryProperty();
 }

plugins/kapt3/testData/converter/methodPropertySignatureClash.txt

@@ -5,6 +5,7 @@ public final class CrashMe {
         return 0;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getResources() {
         return null;
     }

plugins/kapt3/testData/converter/modifiers.txt

@@ -19,31 +19,41 @@ public abstract interface InternalInterface {
 package modifiers;
 
 public final class Modifiers {
+    @org.jetbrains.annotations.NotNull()
     private final transient java.lang.String transientField = "";
+    @org.jetbrains.annotations.NotNull()
     private volatile java.lang.String volatileField;
 
+    @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(java.lang.String p0) {
+    public final void setVolatileField(@org.jetbrains.annotations.NotNull()
+    java.lang.String p0) {
     }
 
     public final strictfp void strictFp() {
     }
 
-    public final java.lang.String overloads(java.lang.String a, int n) {
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String overloads(@org.jetbrains.annotations.NotNull()
+    java.lang.String a, int n) {
         return null;
     }
 
-    public final java.lang.String overloads(java.lang.String a) {
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String overloads(@org.jetbrains.annotations.NotNull()
+    java.lang.String a) {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String overloads() {
         return null;
     }

plugins/kapt3/testData/converter/nonExistentClass.txt

@@ -1,32 +1,45 @@
 @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
 public final class NonExistentType {
+    @org.jetbrains.annotations.Nullable()
     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 Function1<ABCDEF, kotlin.Unit> c = null;
+    @org.jetbrains.annotations.Nullable()
     private static final ABCDEF<java.lang.String, ? extends Function1<java.util.List<ABCDEF>, kotlin.Unit>> d = null;
     public static final NonExistentType INSTANCE = null;
 
+    @org.jetbrains.annotations.Nullable()
     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 Function1<ABCDEF, kotlin.Unit> getC() {
         return null;
     }
 
+    @org.jetbrains.annotations.Nullable()
     public final ABCDEF<java.lang.String, ? extends Function1<java.util.List<ABCDEF>, kotlin.Unit>> getD() {
         return null;
     }
 
-    public final ABCDEF a(ABCDEF a, java.lang.String s) {
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF a(@org.jetbrains.annotations.NotNull()
+    ABCDEF a, @org.jetbrains.annotations.NotNull()
+    java.lang.String s) {
         return null;
     }
 
-    public final ABCDEF b(java.lang.String s) {
+    @org.jetbrains.annotations.NotNull()
+    public final ABCDEF b(@org.jetbrains.annotations.NotNull()
+    java.lang.String s) {
         return null;
     }
 

plugins/kapt3/testData/converter/nonExistentClassTypesConversion.txt

@@ -10,144 +10,197 @@ public final class MyType<T extends java.lang.Object> {
 
 @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
 public final class Test {
+    @org.jetbrains.annotations.NotNull()
     public ABC a;
+    @org.jetbrains.annotations.Nullable()
     private final ABC b = null;
+    @org.jetbrains.annotations.Nullable()
     private final java.util.List<ABC> c = null;
+    @org.jetbrains.annotations.Nullable()
     private final java.util.List<java.util.Map<BCD, ABC<? extends java.util.List<BCD>>>> d = null;
+    @org.jetbrains.annotations.NotNull()
     public java.util.List<? extends java.util.Map<? extends ABC, ? extends BCD>> e;
+    @org.jetbrains.annotations.NotNull()
     public ABC<?> f;
+    @org.jetbrains.annotations.NotNull()
     public java.util.List<?> g;
+    @org.jetbrains.annotations.NotNull()
     public ABC<java.lang.Integer, java.lang.String> h;
+    @org.jetbrains.annotations.NotNull()
     public Function2<ABC, java.util.List<BCD>, CDE> i;
+    @org.jetbrains.annotations.NotNull()
     public Function0<CDE> j;
+    @org.jetbrains.annotations.NotNull()
     public Function2<ABC, java.util.List<BCD>, CDE> k;
+    @org.jetbrains.annotations.NotNull()
     public ABC.BCD.EFG l;
+    @org.jetbrains.annotations.NotNull()
     private final error.NonExistentClass m = null;
+    @org.jetbrains.annotations.NotNull()
     private final java.lang.String n = "";
+    @org.jetbrains.annotations.NotNull()
     public java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends error.NonExistentClass>>>>>>>>>> o11;
+    @org.jetbrains.annotations.NotNull()
     public java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<ABC>>>>>>>>> o10;
+    @org.jetbrains.annotations.NotNull()
     public java.util.Calendar.Builder p;
 
+    @org.jetbrains.annotations.NotNull()
     public final ABC getA() {
         return null;
     }
 
-    public final void setA(ABC p0) {
+    public final void setA(@org.jetbrains.annotations.NotNull()
+    ABC p0) {
     }
 
+    @org.jetbrains.annotations.Nullable()
     public final ABC getB() {
         return null;
     }
 
+    @org.jetbrains.annotations.Nullable()
     public final java.util.List<ABC> getC() {
         return null;
     }
 
+    @org.jetbrains.annotations.Nullable()
     public final java.util.List<java.util.Map<BCD, ABC<? extends java.util.List<BCD>>>> getD() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.util.List<? extends java.util.Map<? extends ABC, ? extends BCD>> getE() {
         return null;
     }
 
-    public final void setE(java.util.List<? extends java.util.Map<? extends ABC, ? extends BCD>> p0) {
+    public final void setE(@org.jetbrains.annotations.NotNull()
+    java.util.List<? extends java.util.Map<? extends ABC, ? extends BCD>> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final ABC<?> getF() {
         return null;
     }
 
-    public final void setF(ABC<?> p0) {
+    public final void setF(@org.jetbrains.annotations.NotNull()
+    ABC<?> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.util.List<?> getG() {
         return null;
     }
 
-    public final void setG(java.util.List<?> p0) {
+    public final void setG(@org.jetbrains.annotations.NotNull()
+    java.util.List<?> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final ABC<java.lang.Integer, java.lang.String> getH() {
         return null;
     }
 
-    public final void setH(ABC<java.lang.Integer, java.lang.String> p0) {
+    public final void setH(@org.jetbrains.annotations.NotNull()
+    ABC<java.lang.Integer, java.lang.String> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final Function2<ABC, java.util.List<BCD>, CDE> getI() {
         return null;
     }
 
-    public final void setI(Function2<ABC, java.util.List<BCD>, CDE> p0) {
+    public final void setI(@org.jetbrains.annotations.NotNull()
+    Function2<ABC, java.util.List<BCD>, CDE> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final Function0<CDE> getJ() {
         return null;
     }
 
-    public final void setJ(Function0<CDE> p0) {
+    public final void setJ(@org.jetbrains.annotations.NotNull()
+    Function0<CDE> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final Function2<ABC, java.util.List<BCD>, CDE> getK() {
         return null;
     }
 
-    public final void setK(Function2<ABC, java.util.List<BCD>, CDE> p0) {
+    public final void setK(@org.jetbrains.annotations.NotNull()
+    Function2<ABC, java.util.List<BCD>, CDE> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final ABC.BCD.EFG getL() {
         return null;
     }
 
-    public final void setL(ABC.BCD.EFG p0) {
+    public final void setL(@org.jetbrains.annotations.NotNull()
+    ABC.BCD.EFG p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final error.NonExistentClass getM() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getN() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<error.NonExistentClass>>>>>>>>>> getO11() {
         return null;
     }
 
-    public final void setO11(java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends error.NonExistentClass>>>>>>>>>> p0) {
+    public final void setO11(@org.jetbrains.annotations.NotNull()
+    java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends error.NonExistentClass>>>>>>>>>> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<ABC>>>>>>>>> getO10() {
         return null;
     }
 
-    public final void setO10(java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<ABC>>>>>>>>> p0) {
+    public final void setO10(@org.jetbrains.annotations.NotNull()
+    java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<ABC>>>>>>>>> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.util.Calendar.Builder getP() {
         return null;
     }
 
-    public final void setP(java.util.Calendar.Builder p0) {
+    public final void setP(@org.jetbrains.annotations.NotNull()
+    java.util.Calendar.Builder p0) {
     }
 
-    public final BCD f1(ABC a) {
+    @org.jetbrains.annotations.Nullable()
+    public final BCD f1(@org.jetbrains.annotations.NotNull()
+    ABC a) {
         return null;
     }
 
-    public final <T extends java.lang.Object>void f2(ABC<java.lang.String, java.lang.Integer, Function0<BCD>> a) {
+    public final <T extends java.lang.Object>void f2(@org.jetbrains.annotations.NotNull()
+    ABC<java.lang.String, java.lang.Integer, Function0<BCD>> a) {
     }
 
-    public final <T extends java.lang.Object>long f3(ABC a, int b) {
+    public final <T extends java.lang.Object>long f3(@org.jetbrains.annotations.NotNull()
+    ABC a, int b) {
         return 0L;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final error.NonExistentClass f4() {
         return null;
     }
 
-    public final <T extends java.lang.Object>java.lang.Class<java.lang.Enum<?>> f5(MyType<T> $receiver) {
+    @org.jetbrains.annotations.Nullable()
+    public final <T extends java.lang.Object>java.lang.Class<java.lang.Enum<?>> f5(@org.jetbrains.annotations.NotNull()
+    MyType<T> $receiver) {
         return null;
     }
 

plugins/kapt3/testData/converter/primitiveTypes.txt

@@ -27,8 +27,11 @@ public final class PrimitiveTypes {
     private static final double doubleNan = 0.0;
     private static final double doublePositiveInfinity = 0.0;
     private static final double doubleNegativeInfinity = 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";
     public static final PrimitiveTypes INSTANCE = null;
 

plugins/kapt3/testData/converter/propertyAnnotations.txt

@@ -5,12 +5,14 @@ public abstract @interface Anno {
 
 
 public final class Test {
+    @org.jetbrains.annotations.NotNull()
     private final java.lang.String prop = "A";
 
     @Anno()
     private static void prop$annotations() {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getProp() {
         return null;
     }

plugins/kapt3/testData/converter/strangeNames.txt

@@ -1,14 +1,18 @@
 public final class My $ name {
+    @org.jetbrains.annotations.NotNull()
     private final java.lang.String (@\u2022@) = "";
+    @org.jetbrains.annotations.NotNull()
     private final java.lang.String \u041a\u043e\u0442\u043b\u0438\u043d-\u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0442\u043e\u0440 = "";
 
     public final void (^_^)(int )))))) {
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String get(@\u2022@)() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String get\u041a\u043e\u0442\u043b\u0438\u043d-\u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0442\u043e\u0440() {
         return null;
     }

plugins/kapt3/testData/converter/topLevel.txt

@@ -16,10 +16,12 @@ public final class TopLevelKt {
     }
     private static final int topLevelProperty = 2;
 
+    @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;
     }
@@ -28,13 +30,17 @@ public final class TopLevelKt {
         return 0;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public static final java.lang.String getTopLevelProperty2() {
         return null;
     }
 
-    public static final void extensionFunction(@Anno(value = "rec")
+    public static final void extensionFunction(@org.jetbrains.annotations.NotNull()
-    java.lang.String $receiver, @Anno(value = "1")
+    @Anno(value = "rec")
-    java.lang.String a, @Anno(value = "2")
+    java.lang.String $receiver, @org.jetbrains.annotations.NotNull()
+    @Anno(value = "1")
+    java.lang.String a, @org.jetbrains.annotations.NotNull()
+    @Anno(value = "2")
     java.lang.String b) {
     }
 
@@ -42,13 +48,17 @@ public final class TopLevelKt {
     private static void extensionProperty$annotations(java.lang.Object p0) {
     }
 
-    public static final <T extends java.lang.Object>java.lang.String getExtensionProperty(@Anno(value = "propRec")
+    @org.jetbrains.annotations.NotNull()
+    public static final <T extends java.lang.Object>java.lang.String getExtensionProperty(@org.jetbrains.annotations.NotNull()
+    @Anno(value = "propRec")
     T $receiver) {
         return null;
     }
 
-    public static final <T extends java.lang.Object>void setExtensionProperty(@Anno(value = "propRec")
+    public static final <T extends java.lang.Object>void setExtensionProperty(@org.jetbrains.annotations.NotNull()
-    T $receiver, @Anno(value = "setparam")
+    @Anno(value = "propRec")
+    T $receiver, @org.jetbrains.annotations.NotNull()
+    @Anno(value = "setparam")
     java.lang.String setParamName) {
     }
 }

plugins/kapt3/testData/kotlinRunner/Overloads.it.txt

@@ -1,16 +1,10 @@
 package test;
 
-public abstract @interface MyAnnotation {
-}
-
-////////////////////
-
-package test;
-
 @MyAnnotation()
 public final class State {
     private final int someInt = 0;
     private final long someLong = 0L;
+    @org.jetbrains.annotations.NotNull()
     private final java.lang.String someString = null;
 
     public final int getSomeInt() {
@@ -21,11 +15,13 @@ public final class State {
         return 0L;
     }
 
+    @org.jetbrains.annotations.NotNull()
     public final java.lang.String getSomeString() {
         return null;
     }
 
-    public State(int someInt, long someLong, java.lang.String someString) {
+    public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
+    java.lang.String someString) {
         super();
     }
 
@@ -36,6 +32,13 @@ public final class State {
 
 ////////////////////
 
+package test;
+
+public abstract @interface MyAnnotation {
+}
+
+////////////////////
+
 package error;
 
 public final class NonExistentClass {

plugins/kapt3/testData/kotlinRunner/Simple.it.txt

@@ -12,19 +12,6 @@ public enum EnumClass {
 
 package test;
 
-public enum EnumClass2 {
-    /*public static final*/ WHITE /* = new WHITE(null) */,
-    /*public static final*/ RED /* = new RED(null) */;
-    private final java.lang.String blah = null;
-
-    EnumClass2(java.lang.String blah) {
-    }
-}
-
-////////////////////
-
-package test;
-
 public abstract @interface MyAnnotation {
 }
 
@@ -53,3 +40,17 @@ public final class Simple {
         super();
     }
 }
+
+////////////////////
+
+package test;
+
+public enum EnumClass2 {
+    /*public static final*/ WHITE /* = new WHITE(null) */,
+    /*public static final*/ RED /* = new RED(null) */;
+    private final java.lang.String blah = null;
+
+    EnumClass2(@org.jetbrains.annotations.NotNull()
+    java.lang.String blah) {
+    }
+}