Kapt: Add Kotlin location to diagnostics reported in Kapt stubs

This commit is contained in:
Yan Zhulanow
2017-11-07 12:06:13 +09:00
parent 8fba19f269
commit 7136bf7e0a
63 changed files with 2637 additions and 521 deletions
@@ -5,10 +5,29 @@ public final class NonExistentClass {
////////////////////
package kapt.internal;
public @interface KaptMetadata {
public java.lang.String value();
}
////////////////////
package kapt.internal;
public @interface KaptSignature {
public java.lang.String value();
}
////////////////////
package test;
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kapt.internal.KaptMetadata()
public abstract @interface MyAnnotation {
}
@@ -17,13 +36,16 @@ public abstract @interface MyAnnotation {
package test;
@kotlin.Metadata()
@kapt.internal.KaptMetadata()
public final class Simple {
public static final test.Simple.Companion Companion = null;
@MyAnnotation()
@kapt.internal.KaptSignature("myMethod()V")
public final void myMethod() {
}
@kapt.internal.KaptSignature("<init>()V")
public Simple() {
super();
}
@@ -31,6 +53,7 @@ public final class Simple {
@kotlin.Metadata()
public static final class NestedClass {
@kapt.internal.KaptSignature("<init>()V")
public NestedClass() {
super();
}
@@ -38,6 +61,7 @@ public final class Simple {
@kotlin.Metadata()
public static final class NestedNestedClass {
@kapt.internal.KaptSignature("<init>()V")
public NestedNestedClass() {
super();
}
@@ -47,6 +71,7 @@ public final class Simple {
@kotlin.Metadata()
public final class InnerClass {
@kapt.internal.KaptSignature("<init>(Ltest/Simple;)V")
public InnerClass() {
super();
}
@@ -55,6 +80,7 @@ public final class Simple {
@kotlin.Metadata()
public static final class Companion {
@kapt.internal.KaptSignature("<init>()V")
private Companion() {
super();
}
@@ -5,10 +5,29 @@ public final class NonExistentClass {
////////////////////
package kapt.internal;
public @interface KaptMetadata {
public java.lang.String value();
}
////////////////////
package kapt.internal;
public @interface KaptSignature {
public java.lang.String value();
}
////////////////////
package test;
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kapt.internal.KaptMetadata()
public abstract @interface MyAnnotation {
}
@@ -18,30 +37,36 @@ package test;
@kotlin.Metadata()
@MyAnnotation()
@kapt.internal.KaptMetadata()
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;
@kapt.internal.KaptSignature("getSomeInt()I")
public final int getSomeInt() {
return 0;
}
@kapt.internal.KaptSignature("getSomeLong()J")
public final long getSomeLong() {
return 0L;
}
@org.jetbrains.annotations.NotNull()
@kapt.internal.KaptSignature("getSomeString()Ljava/lang/String;")
public final java.lang.String getSomeString() {
return null;
}
@kapt.internal.KaptSignature("<init>(IJLjava/lang/String;)V")
public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
java.lang.String someString) {
super();
}
@kapt.internal.KaptSignature("<init>(IJ)V")
public State(int someInt, long someLong) {
super();
}
@@ -5,13 +5,33 @@ public final class NonExistentClass {
////////////////////
package kapt.internal;
public @interface KaptMetadata {
public java.lang.String value();
}
////////////////////
package kapt.internal;
public @interface KaptSignature {
public java.lang.String value();
}
////////////////////
package test;
@kotlin.Metadata()
@kapt.internal.KaptMetadata()
public enum EnumClass {
/*public static final*/ BLACK /* = new BLACK() */,
/*public static final*/ WHITE /* = new WHITE() */;
@kapt.internal.KaptSignature("<init>(Ljava/lang/String;I)V")
EnumClass() {
}
}
@@ -22,6 +42,7 @@ package test;
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kapt.internal.KaptMetadata()
public abstract @interface MyAnnotation {
}
@@ -30,11 +51,13 @@ public abstract @interface MyAnnotation {
package test;
@kotlin.Metadata()
@kapt.internal.KaptMetadata()
public enum EnumClass2 {
/*public static final*/ WHITE /* = new WHITE(null) */,
/*public static final*/ RED /* = new RED(null) */;
private final java.lang.String blah = null;
@kapt.internal.KaptSignature("<init>(Ljava/lang/String;ILjava/lang/String;)V")
EnumClass2(@org.jetbrains.annotations.NotNull()
java.lang.String blah) {
}
@@ -44,17 +67,22 @@ public enum EnumClass2 {
package test;
@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
@kotlin.Metadata()
@kapt.internal.KaptMetadata()
public final class Simple {
@MyAnnotation()
@kapt.internal.KaptSignature("myMethod()V")
public final void myMethod() {
}
@kapt.internal.KaptSignature("heavyMethod()I")
public final int heavyMethod() {
return 0;
}
@kapt.internal.KaptSignature("<init>()V")
public Simple() {
super();
}
@@ -1,5 +1,6 @@
package test
@Suppress("UNRESOLVED_REFERENCE")
internal class Simple {
@MyAnnotation
fun myMethod() {