diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt index 27d0287d142..cfd9caa8b10 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt @@ -50,8 +50,6 @@ import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.tree.* import javax.lang.model.element.ElementKind import com.sun.tools.javac.util.List as JavacList -import org.jetbrains.kotlin.kapt3.stubs.KaptLineMappingCollector.Companion.KAPT_METADATA_ANNOTATION_FQNAME -import org.jetbrains.kotlin.kapt3.stubs.KaptLineMappingCollector.Companion.KAPT_SIGNATURE_ANNOTATION_FQNAME class ClassFileToSourceStubConverter( val kaptContext: KaptContext, @@ -114,9 +112,6 @@ class ClassFileToSourceStubConverter( stubs = stubs.append(generateNonExistentClass()) } - stubs = stubs.append(generateSimpleParametrizedAnnotationClass(KAPT_METADATA_ANNOTATION_FQNAME)) - stubs = stubs.append(generateSimpleParametrizedAnnotationClass(KAPT_SIGNATURE_ANNOTATION_FQNAME)) - return stubs } @@ -137,31 +132,6 @@ class ClassFileToSourceStubConverter( return topLevel } - private fun generateSimpleParametrizedAnnotationClass(fqName: FqName): JCCompilationUnit { - val valueMethod = treeMaker.MethodDef( - treeMaker.Modifiers(Flags.PUBLIC.toLong()), - treeMaker.name("value"), - treeMaker.FqName("java.lang.String"), - JavacList.nil(), - JavacList.nil(), - JavacList.nil(), - null, - null) - - val nonExistentClass = treeMaker.ClassDef( - treeMaker.Modifiers((Flags.PUBLIC or Flags.ANNOTATION or Flags.INTERFACE).toLong()), - treeMaker.name(fqName.shortName().asString()), - JavacList.nil(), - null, - JavacList.nil(), - JavacList.of(valueMethod)) - - val packageName = fqName.parent().asString() - val topLevel = treeMaker.TopLevelJava9Aware(treeMaker.FqName(packageName), JavacList.of(nonExistentClass)) - topLevel.sourcefile = KaptJavaFileObject(topLevel, nonExistentClass) - return topLevel - } - private fun convertTopLevelClass(clazz: ClassNode): JCCompilationUnit? { val origin = kaptContext.origins[clazz] ?: return null val ktFile = origin.element?.containingFile as? KtFile ?: return null @@ -177,13 +147,18 @@ class ClassFileToSourceStubConverter( val classDeclaration = convertClass(clazz, lineMappings, packageName, true) ?: return null - classDeclaration.mods.annotations = classDeclaration.mods.annotations.append( - createAnnotation(KAPT_METADATA_ANNOTATION_FQNAME, lineMappings.serializeLineInfo ())) + classDeclaration.mods.annotations = classDeclaration.mods.annotations val imports = if (correctErrorTypes) convertImports(ktFile, classDeclaration) else JavacList.nil() + + val nonEmptyImports: JavacList = when { + imports.size > 0 -> imports + else -> JavacList.of(treeMaker.Import(treeMaker.FqName("java.lang.System"), false)) + } + val classes = JavacList.of(classDeclaration) - val topLevel = treeMaker.TopLevelJava9Aware(packageClause, imports + classes) + val topLevel = treeMaker.TopLevelJava9Aware(packageClause, nonEmptyImports + classes) topLevel.docComments = kdocCommentKeeper.docCommentTable KaptJavaFileObject(topLevel, classDeclaration).apply { @@ -191,12 +166,9 @@ class ClassFileToSourceStubConverter( _bindings[clazz.name] = this } - return topLevel - } + kdocCommentKeeper.saveComment(topLevel, lineMappings.getClassMetadataCommentText()) - private fun createAnnotation(fqName: FqName, value: String): JCAnnotation { - val offsetsLiteral = convertLiteralExpression(value) - return treeMaker.Annotation(treeMaker.FqName(fqName), JavacList.of(offsetsLiteral)) + return topLevel } private fun convertImports(file: KtFile, classDeclaration: JCClassDecl): JavacList { @@ -343,7 +315,7 @@ class ClassFileToSourceStubConverter( genericType.typeParameters, if (hasSuperClass) genericType.superClass else null, genericType.interfaces, - enumValues + fields + methods + nestedClasses).keepComments(clazz) + enumValues + fields + methods + nestedClasses).keepKdocComments(clazz) } private tailrec fun checkIfShouldBeIgnored(type: Type): Boolean { @@ -449,7 +421,7 @@ class ClassFileToSourceStubConverter( lineMappings.registerField(containingClass, field) - return treeMaker.VarDef(modifiers, treeMaker.name(name), typeExpression, initializer).keepComments(field) + return treeMaker.VarDef(modifiers, treeMaker.name(name), typeExpression, initializer).keepKdocComments(field) } private fun convertMethod( @@ -485,9 +457,6 @@ class ClassFileToSourceStubConverter( method.access.toLong(), ElementKind.METHOD, packageFqName, visibleAnnotations, method.invisibleAnnotations, descriptor.annotations) - modifiers.annotations = modifiers.annotations.append( - createAnnotation(KAPT_SIGNATURE_ANNOTATION_FQNAME, method.name + method.desc)) - val asmReturnType = Type.getReturnType(method.desc) val jcReturnType = if (isConstructor) null else treeMaker.Type(asmReturnType) @@ -559,7 +528,8 @@ class ClassFileToSourceStubConverter( return treeMaker.MethodDef( modifiers, treeMaker.name(name), returnType, genericSignature.typeParameters, genericSignature.parameterTypes, genericSignature.exceptionTypes, - body, defaultValue).keepComments(method) + body, defaultValue + ).keepKdocComments(method).keepSignature(lineMappings, method) } private fun isIgnored(annotations: List?): Boolean { @@ -895,10 +865,15 @@ class ClassFileToSourceStubConverter( else -> null } - private fun T.keepComments(node: Any): T { + private fun T.keepKdocComments(node: Any): T { kdocCommentKeeper.saveKDocComment(this, node) return this } + + private fun JCMethodDecl.keepSignature(lineMappings: KaptLineMappingCollector, node: MethodNode): JCMethodDecl { + lineMappings.registerSignature(this, node) + return this + } } private fun Any?.isOfPrimiviteType(): Boolean = when(this) { @@ -913,21 +888,4 @@ internal tailrec fun getReferenceExpression(expression: KtExpression?): KtRefere is KtReferenceExpression -> expression is KtQualifiedExpression -> getReferenceExpression(expression.selectorExpression) else -> null -} - -internal fun getAnnotationValue(fqName: FqName, mods: JCTree.JCModifiers?): String? { - val annotations = mods?.annotations ?: return null - - val annotationName = fqName.asString() - val annotation = annotations.firstOrNull { it.annotationType.toString() == annotationName } ?: return null - - val valueArg = annotation.args.singleOrNull() - - return when (valueArg) { - is JCTree.JCLiteral -> valueArg.value as? String - is JCTree.JCAssign -> { - ((valueArg.rhs as? JCTree.JCLiteral)?.value as? String)?.takeIf { valueArg.lhs.toString() == "value" } - } - else -> null - } -} +} \ No newline at end of file diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KDocCommentKeeper.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KDocCommentKeeper.kt index ff113514d55..52f69037266 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KDocCommentKeeper.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KDocCommentKeeper.kt @@ -65,6 +65,10 @@ class KDocCommentKeeper(private val kaptContext: KaptContext<*>) { docCommentTable.putComment(tree, KDocComment(extractCommentText(docComment))) } + fun saveComment(tree: JCTree, comment: String) { + docCommentTable.putComment(tree, KDocComment(comment)) + } + private fun extractCommentText(docComment: KDoc): String { return docComment.children.dropWhile { it is PsiWhiteSpace || it.isKDocStart() } .dropLastWhile { it is PsiWhiteSpace || it.isKDocEnd() } diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KaptLineMappingCollector.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KaptLineMappingCollector.kt index 61bd2121353..5307c778ca1 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KaptLineMappingCollector.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KaptLineMappingCollector.kt @@ -18,10 +18,11 @@ package org.jetbrains.kotlin.kapt3.stubs import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile +import com.sun.tools.javac.parser.Tokens import com.sun.tools.javac.tree.JCTree import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import org.jetbrains.kotlin.kapt3.KaptContext -import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.kapt3.util.isJava9OrLater import org.jetbrains.org.objectweb.asm.tree.ClassNode import org.jetbrains.org.objectweb.asm.tree.FieldNode import org.jetbrains.org.objectweb.asm.tree.MethodNode @@ -34,39 +35,66 @@ private typealias LineInfoMap = MutableMap class KaptLineMappingCollector(private val kaptContext: KaptContext<*>) { companion object { - val KAPT_METADATA_ANNOTATION_FQNAME = FqName("kapt.internal.KaptMetadata") - val KAPT_SIGNATURE_ANNOTATION_FQNAME = FqName("kapt.internal.KaptSignature") + private val METADATA_COMMENT_PREFIX = "@KaptMetadata " - fun parseMetadataAnnotation(file: JCTree.JCCompilationUnit): LineInfo { - val metadata = file.defs.asSequence() - .filterIsInstance() - .mapNotNull { getAnnotationValue(KAPT_METADATA_ANNOTATION_FQNAME, it.mods) } - .firstOrNull() ?: return LineInfo.EMPTY + fun parseFileInfo(file: JCTree.JCCompilationUnit): FileInfo { + fun getCommentTree(): Tokens.Comment? { + if (isJava9OrLater) { + val packageElement = JCTree.JCCompilationUnit::class.java.getDeclaredMethod("getPackage").invoke(file) as JCTree? + if (packageElement != null) { + file.docComments.getComment(packageElement)?.let { return it } + } + } - return LineInfo(deserializeMetadata(metadata)) + return file.docComments.getComment(file) + } + + val comment = getCommentTree()?.text?.trim() + ?.takeIf { it.startsWith(METADATA_COMMENT_PREFIX) } + ?.drop(METADATA_COMMENT_PREFIX.length) + ?: return FileInfo.EMPTY + + return FileInfo.parse(comment) } - private fun deserializeMetadata(data: String): LineInfoMap { - val map: LineInfoMap = mutableMapOf() + private fun deserializeMetadata(data: String): Pair> { + val lineInfo: LineInfoMap = mutableMapOf() + val signatureInfo = mutableMapOf() val ois = ObjectInputStream(ByteArrayInputStream(Base64.getDecoder().decode(data))) - val count = ois.readInt() - repeat(count) { + val lineInfoCount = ois.readInt() + repeat(lineInfoCount) { val fqName = ois.readUTF() val path = ois.readUTF() val isRelative = ois.readBoolean() val line = ois.readInt() val column = ois.readInt() - map[fqName] = KotlinPosition(path, isRelative, line, column) + lineInfo[fqName] = KotlinPosition(path, isRelative, line, column) } - return map + val signatureCount = ois.readInt() + repeat(signatureCount) { + val javacSignature = ois.readUTF() + val methodDesc = ois.readUTF() + + signatureInfo[javacSignature] = methodDesc + } + + return Pair(lineInfo, signatureInfo) + } + + private fun getJavacSignature(decl: JCTree.JCMethodDecl): String { + val name = decl.name.toString() + val params = decl.parameters.joinToString { it.getType().toString() } + return "$name($params)" } } private val lineInfo: LineInfoMap = mutableMapOf() + private val signatureInfo = mutableMapOf() + private val filePaths = mutableMapOf>() fun registerClass(clazz: ClassNode) { @@ -81,6 +109,10 @@ class KaptLineMappingCollector(private val kaptContext: KaptContext<*>) { register(field, clazz.name + "#" + field.name) } + fun registerSignature(decl: JCTree.JCMethodDecl, method: MethodNode) { + signatureInfo[getJavacSignature(decl)] = method.name + method.desc + } + private fun register(asmNode: Any, fqName: String) { val psiElement = kaptContext.origins[asmNode]?.element ?: return register(fqName, psiElement) @@ -114,7 +146,7 @@ class KaptLineMappingCollector(private val kaptContext: KaptContext<*>) { } } - fun serializeLineInfo(): String { + fun getClassMetadataCommentText(): String { val os = ByteArrayOutputStream() val oos = ObjectOutputStream(os) @@ -127,15 +159,27 @@ class KaptLineMappingCollector(private val kaptContext: KaptContext<*>) { oos.writeInt(kotlinPosition.column) } - oos.flush() - return Base64.getEncoder().encodeToString(os.toByteArray()) - } - - class LineInfo(private val map: LineInfoMap) { - companion object { - val EMPTY = LineInfo(mutableMapOf()) + oos.writeInt(signatureInfo.size) + for ((javacSignature, methodDesc) in signatureInfo) { + oos.writeUTF(javacSignature) + oos.writeUTF(methodDesc) } - fun getPositionFor(fqName: String) = map[fqName] + oos.flush() + return METADATA_COMMENT_PREFIX + Base64.getEncoder().encodeToString(os.toByteArray()) + } + + class FileInfo(private val lineInfo: LineInfoMap, private val signatureInfo: Map) { + companion object { + val EMPTY = FileInfo(mutableMapOf(), emptyMap()) + + fun parse(comment: String): FileInfo { + val (lineInfo, signatureInfo) = deserializeMetadata(comment) + return FileInfo(lineInfo, signatureInfo) + } + } + + fun getPositionFor(fqName: String) = lineInfo[fqName] + fun getMethodDescriptor(decl: JCTree.JCMethodDecl) = signatureInfo[getJavacSignature(decl)] } } \ No newline at end of file diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KaptStubLineInformation.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KaptStubLineInformation.kt index b226fea8918..b4d5a1a975f 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KaptStubLineInformation.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/KaptStubLineInformation.kt @@ -18,19 +18,20 @@ package org.jetbrains.kotlin.kapt3.stubs import com.sun.tools.javac.tree.JCTree import com.sun.tools.javac.tree.TreeScanner -import org.jetbrains.kotlin.kapt3.stubs.KaptLineMappingCollector.Companion.KAPT_SIGNATURE_ANNOTATION_FQNAME +import org.jetbrains.kotlin.kapt3.stubs.KaptLineMappingCollector.FileInfo import org.jetbrains.kotlin.kapt3.util.getPackageNameJava9Aware class KaptStubLineInformation { - private val offsets = mutableMapOf() + private val offsets = mutableMapOf() private val declarations = mutableMapOf>() fun getPositionInKotlinFile(file: JCTree.JCCompilationUnit, element: JCTree): KotlinPosition? { val declaration = findDeclarationFor(element, file) ?: return null - val elementDescriptor = getKaptDescriptor(declaration, file) ?: return null - val offsets = offsets.getOrPut(file) { KaptLineMappingCollector.parseMetadataAnnotation(file) } - return offsets.getPositionFor(elementDescriptor) + val fileInfo = offsets.getOrPut(file) { KaptLineMappingCollector.parseFileInfo(file) } + val elementDescriptor = getKaptDescriptor(declaration, file, fileInfo) ?: return null + + return fileInfo.getPositionFor(elementDescriptor) } private fun findDeclarationFor(element: JCTree, file: JCTree.JCCompilationUnit): JCTree? { @@ -38,7 +39,7 @@ class KaptStubLineInformation { return fileDeclarations.firstOrNull { element.isLocatedInside(it) } } - private fun getKaptDescriptor(declaration: JCTree, file: JCTree.JCCompilationUnit): String? { + private fun getKaptDescriptor(declaration: JCTree, file: JCTree.JCCompilationUnit, fileInfo: FileInfo): String? { fun getFqName(declaration: JCTree, parent: JCTree, currentName: String): String? { return when (parent) { is JCTree.JCCompilationUnit -> { @@ -72,7 +73,7 @@ class KaptStubLineInformation { is JCTree.JCMethodDecl -> { // We don't need to process local declarations here as kapt does not support locals entirely. if (declaration === parent) { - val nameAndSignature = getAnnotationValue(KAPT_SIGNATURE_ANNOTATION_FQNAME, parent.mods) ?: return null + val nameAndSignature = fileInfo.getMethodDescriptor(parent) ?: return null return currentName + "#" + nameAndSignature } diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt index db6c12e327f..7c46e45a0f2 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt @@ -160,13 +160,13 @@ open class AbstractClassFileToSourceStubConverterTest : AbstractKotlinKapt3Test( companion object { private val KOTLIN_METADATA_GROUP = "[a-z0-9]+ = (\\{.+?\\}|[0-9]+)" private val KOTLIN_METADATA_REGEX = "@kotlin\\.Metadata\\(($KOTLIN_METADATA_GROUP)(, $KOTLIN_METADATA_GROUP)*\\)".toRegex() - private val KAPT_METADATA_REGEX = "@kapt\\.internal\\.KaptMetadata\\((value = )?\"[^(].*?\"\\)".toRegex() + private val KAPT_METADATA_REGEX = "\\* @KaptMetadata .+".toRegex() private val EXPECTED_ERROR = "EXPECTED_ERROR" internal fun removeMetadataAnnotationContents(s: String): String { return s.replace(KOTLIN_METADATA_REGEX, "@kotlin.Metadata()") - .replace(KAPT_METADATA_REGEX, "@kapt.internal.KaptMetadata()") + .replace(KAPT_METADATA_REGEX, "* @KaptMetadata") } @JvmStatic diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt index 412486b6efd..c1775642888 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt @@ -1,17 +1,19 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum E { /*public static final*/ X /* = new E() */, /*public static final*/ Y /* = new E() */; - @kapt.internal.KaptSignature(value = "a()V") public abstract void a(); - @kapt.internal.KaptSignature(value = "b()V") public final void b() { } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;I)V") E() { } @@ -19,7 +21,6 @@ public enum E { public static final class Obj { public static final E.Obj INSTANCE = null; - @kapt.internal.KaptSignature(value = "()V") private Obj() { super(); } @@ -28,7 +29,6 @@ public enum E { @kotlin.Metadata() public static final class NestedClass { - @kapt.internal.KaptSignature(value = "()V") public NestedClass() { super(); } @@ -37,21 +37,22 @@ public enum E { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum E2 { /*public static final*/ X /* = new E2() */, /*public static final*/ Y /* = new E2() */; - @kapt.internal.KaptSignature(value = "a()V") public abstract void a(); - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;II)V") E2(int n) { } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;ILjava/lang/String;)V") E2(@org.jetbrains.annotations.NotNull() java.lang.String s) { } @@ -59,9 +60,13 @@ public enum E2 { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum E3 { /*public static final*/ X /* = new E3() */, /*public static final*/ Y /* = new E3() */; @@ -69,12 +74,10 @@ public enum E3 { private final java.lang.String a = null; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getA()Ljava/lang/String;") public final java.lang.String getA() { return null; } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;ILjava/lang/String;)V") E3(@org.jetbrains.annotations.NotNull() java.lang.String a) { } @@ -82,9 +85,13 @@ public enum E3 { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum E4 { /*public static final*/ X /* = new E4() */; @org.jetbrains.annotations.NotNull() @@ -94,46 +101,23 @@ public enum E4 { private final boolean d = false; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getA()Ljava/lang/String;") public final java.lang.String getA() { return null; } - @kapt.internal.KaptSignature(value = "getB()I") public final int getB() { return 0; } - @kapt.internal.KaptSignature(value = "getC()J") public final long getC() { return 0L; } - @kapt.internal.KaptSignature(value = "getD()Z") public final boolean getD() { return false; } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;ILjava/lang/String;IJZ)V") E4(@org.jetbrains.annotations.NotNull() java.lang.String a, int b, long c, boolean d) { } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt index a7298921259..2c500c5a48c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt @@ -1,16 +1,18 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract class Base { - @kapt.internal.KaptSignature(value = "doJob(Ljava/lang/String;I)V") protected abstract void doJob(@org.jetbrains.annotations.NotNull() java.lang.String job, int delay); - @kapt.internal.KaptSignature(value = "doJobGeneric(Ljava/lang/CharSequence;I)V") protected abstract void doJobGeneric(@org.jetbrains.annotations.NotNull() T job, int delay); - @kapt.internal.KaptSignature(value = "()V") public Base() { super(); } @@ -18,43 +20,26 @@ public abstract class Base { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Impl extends Base { @java.lang.Override() - @kapt.internal.KaptSignature(value = "doJob(Ljava/lang/String;I)V") protected void doJob(@org.jetbrains.annotations.NotNull() java.lang.String job, int delay) { } @java.lang.Override() - @kapt.internal.KaptSignature(value = "doJobGeneric(Ljava/lang/CharSequence;I)V") protected void doJobGeneric(@org.jetbrains.annotations.NotNull() T job, int delay) { } - @kapt.internal.KaptSignature(value = "()V") public Impl() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt index 62e3e5c528f..6d06a7bd7d9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt @@ -1,10 +1,13 @@ +/** + * @KaptMetadata + */ + import java.util.Date; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit.MICROSECONDS; import a.b.ABC; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { @org.jetbrains.annotations.NotNull() public Test.MyDate date; @@ -18,61 +21,50 @@ public final class Test { public bcd bcd; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getDate()LTest$MyDate;") public final Test.MyDate getDate() { return null; } - @kapt.internal.KaptSignature("setDate(LTest$MyDate;)V") public final void setDate(@org.jetbrains.annotations.NotNull() Test.MyDate p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getTimeUnit()Ljava/util/concurrent/TimeUnit;") public final java.util.concurrent.TimeUnit getTimeUnit() { return null; } - @kapt.internal.KaptSignature("setTimeUnit(Ljava/util/concurrent/TimeUnit;)V") public final void setTimeUnit(@org.jetbrains.annotations.NotNull() java.util.concurrent.TimeUnit p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getMicroseconds()Ljava/util/concurrent/TimeUnit;") public final java.util.concurrent.TimeUnit getMicroseconds() { return null; } - @kapt.internal.KaptSignature("setMicroseconds(Ljava/util/concurrent/TimeUnit;)V") public final void setMicroseconds(@org.jetbrains.annotations.NotNull() java.util.concurrent.TimeUnit p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getAbc()Lerror/NonExistentClass;") public final a.b.ABC getAbc() { return null; } - @kapt.internal.KaptSignature("setAbc(Lerror/NonExistentClass;)V") public final void setAbc(@org.jetbrains.annotations.NotNull() a.b.ABC p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getBcd()Lerror/NonExistentClass;") public final bcd getBcd() { return null; } - @kapt.internal.KaptSignature("setBcd(Lerror/NonExistentClass;)V") public final void setBcd(@org.jetbrains.annotations.NotNull() bcd p0) { } - @kapt.internal.KaptSignature("()V") public Test() { super(); } @@ -83,17 +75,14 @@ public final class Test { public Test.MyDate date2; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getDate2()LTest$MyDate;") public final Test.MyDate getDate2() { return null; } - @kapt.internal.KaptSignature("setDate2(LTest$MyDate;)V") public final void setDate2(@org.jetbrains.annotations.NotNull() Test.MyDate p0) { } - @kapt.internal.KaptSignature("()V") public MyDate() { super(); } @@ -102,6 +91,9 @@ public final class Test { //////////////////// +/** + * @KaptMetadata + */ import java.util.Date; import java.util.concurrent.TimeUnit; @@ -109,42 +101,20 @@ import java.util.concurrent.TimeUnit.MICROSECONDS; import a.b.ABC; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test2 { @org.jetbrains.annotations.NotNull() public java.util.Date date; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getDate()Ljava/util/Date;") public final java.util.Date getDate() { return null; } - @kapt.internal.KaptSignature("setDate(Ljava/util/Date;)V") public final void setDate(@org.jetbrains.annotations.NotNull() java.util.Date p0) { } - @kapt.internal.KaptSignature("()V") public Test2() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt index 2e142d310e9..4357688f63a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt @@ -1,97 +1,109 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno1 { } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno2 { - @kapt.internal.KaptSignature(value = "i()I") public abstract int i() default 5; - @kapt.internal.KaptSignature(value = "s()Ljava/lang/String;") public abstract java.lang.String s() default "ABC"; - @kapt.internal.KaptSignature(value = "ii()[I") public abstract int[] ii() default {1, 2, 3}; - @kapt.internal.KaptSignature(value = "ss()[Ljava/lang/String;") public abstract java.lang.String[] ss() default {"A", "B"}; - @kapt.internal.KaptSignature(value = "a()LAnno1;") public abstract Anno1 a(); - @kapt.internal.KaptSignature(value = "color()LColors;") public abstract Colors color() default Colors.BLACK; - @kapt.internal.KaptSignature(value = "colors()[LColors;") public abstract Colors[] colors() default {Colors.BLACK, Colors.WHITE}; - @kapt.internal.KaptSignature(value = "clazz()Ljava/lang/Class;") public abstract java.lang.Class clazz(); - @kapt.internal.KaptSignature(value = "classes()[Ljava/lang/Class;") public abstract java.lang.Class[] classes(); } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno3 { - @kapt.internal.KaptSignature(value = "value()Ljava/lang/String;") public abstract java.lang.String value(); } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum Colors { /*public static final*/ WHITE /* = new Colors() */, /*public static final*/ BLACK /* = new Colors() */; - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;I)V") Colors() { } } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum Enum1 { /*public static final*/ BLACK /* = new Enum1() */, @Anno1() /*public static final*/ WHITE /* = new Enum1() */; - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;I)V") Enum1() { } } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() @Anno3(value = "value") @Anno2(a = @Anno1(), clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class}) @Anno1() -@kapt.internal.KaptMetadata() public final class TestAnno { - @kapt.internal.KaptSignature(value = "()V") public TestAnno() { super(); } @@ -99,62 +111,43 @@ public final class TestAnno { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() @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") -@kapt.internal.KaptMetadata() public final class TestAnno2 { @org.jetbrains.annotations.NotNull() @Anno3(value = "field") private java.lang.String b; @Anno1() - @kapt.internal.KaptSignature(value = "a(Ljava/lang/String;)V") public final void a(@org.jetbrains.annotations.NotNull() @Anno3(value = "param-pam-pam") java.lang.String param) { } @Anno3(value = "property") - @kapt.internal.KaptSignature(value = "b$annotations()V") public static void b$annotations() { } @org.jetbrains.annotations.NotNull() @Anno3(value = "getter") - @kapt.internal.KaptSignature(value = "getB()Ljava/lang/String;") public final java.lang.String getB() { return null; } @Anno3(value = "setter") - @kapt.internal.KaptSignature(value = "setB(Ljava/lang/String;)V") public final void setB(@org.jetbrains.annotations.NotNull() @Anno3(value = "setparam") java.lang.String p0) { } - @kapt.internal.KaptSignature(value = "()V") public TestAnno2() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt index 44a688370c2..d08279fab6b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt @@ -1,39 +1,28 @@ -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @Anno(value = "anno-class") -@kapt.internal.KaptMetadata() public abstract @interface Anno { - @kapt.internal.KaptSignature(value = "value()Ljava/lang/String;") public abstract java.lang.String value(); } //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class AnnotationsTest { public AnnotationsTest() { @@ -41,19 +30,16 @@ public final class AnnotationsTest { } @Anno(value = "top-level-fun") - @kapt.internal.KaptSignature(value = "topLevelFun(Ljava/lang/String;)V") public static final void topLevelFun(@org.jetbrains.annotations.NotNull() @Anno(value = "top-level-fun-receiver") java.lang.String $receiver) { } @Anno(value = "top-level-val") - @kapt.internal.KaptSignature(value = "topLevelVal$annotations(I)V") public static void topLevelVal$annotations(int p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getTopLevelVal(I)Ljava/lang/String;") public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver") int $receiver) { return null; @@ -62,11 +48,15 @@ public final class AnnotationsTest { //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() @Anno(value = "enum") -@kapt.internal.KaptMetadata() public enum Enum { @Anno(value = "white") /*public static final*/ WHITE /* = new Enum() */, @@ -74,13 +64,11 @@ public enum Enum { /*public static final*/ BLACK /* = new Enum() */; private final int x = 0; - @kapt.internal.KaptSignature(value = "getX()I") public final int getX() { return 0; } @Anno(value = "enum-constructor") - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;II)V") Enum(@Anno(value = "x") int x) { } @@ -88,50 +76,47 @@ public enum Enum { //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() @Anno(value = "clazz") -@kapt.internal.KaptMetadata() public abstract class Test { @org.jetbrains.annotations.NotNull() private java.lang.String v; @org.jetbrains.annotations.NotNull() @Anno(value = "abstract-method") - @kapt.internal.KaptSignature(value = "abstractMethod()Ljava/lang/String;") public abstract java.lang.String abstractMethod(); @Anno(value = "abstract-val") - @kapt.internal.KaptSignature(value = "abstractVal$annotations()V") public static void abstractVal$annotations() { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getAbstractVal()Ljava/lang/String;") public abstract java.lang.String getAbstractVal(); @Anno(value = "v-property") - @kapt.internal.KaptSignature(value = "v$annotations()V") public static void v$annotations() { } @org.jetbrains.annotations.NotNull() @Anno(value = "v-get") - @kapt.internal.KaptSignature(value = "getV()Ljava/lang/String;") public final java.lang.String getV() { return null; } @Anno(value = "v-set") - @kapt.internal.KaptSignature(value = "setV(Ljava/lang/String;)V") public final void setV(@org.jetbrains.annotations.NotNull() @Anno(value = "v-setparam") java.lang.String p0) { } @Anno(value = "test-constructor") - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;)V") protected Test(@org.jetbrains.annotations.NotNull() @Anno(value = "v-param") java.lang.String v) { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt index 8ef663eab50..c05f09ffbf5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt @@ -1,23 +1,31 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Target(value = {}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY}) -@kapt.internal.KaptMetadata() public abstract @interface Anno { } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; /** * Obj. */ @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Obj { public static final Obj INSTANCE = null; - @kapt.internal.KaptSignature(value = "()V") private Obj() { super(); } @@ -25,12 +33,16 @@ public final class Obj { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; /** * Test. */ @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { /** @@ -48,38 +60,32 @@ public final class Test { /** * method(). */ - @kapt.internal.KaptSignature(value = "method()V") public final void method() { } /** * method(int). */ - @kapt.internal.KaptSignature(value = "method(I)V") public final void method(int a) { } /** * method(String). */ - @kapt.internal.KaptSignature(value = "method(Ljava/lang/String;)V") public final void method(@org.jetbrains.annotations.NotNull() java.lang.String a) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getProp()Ljava/lang/String;") public final java.lang.String getProp() { return null; } @Anno() - @kapt.internal.KaptSignature(value = "prop2$annotations()V") public static void prop2$annotations() { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getProp2()Ljava/lang/String;") public final java.lang.String getProp2() { return null; } @@ -88,7 +94,6 @@ public final class Test { * get. */ @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getProp3()Ljava/lang/String;") public final java.lang.String getProp3() { return null; } @@ -96,12 +101,10 @@ public final class Test { /** * set. */ - @kapt.internal.KaptSignature(value = "setProp3(Ljava/lang/String;)V") public final void setProp3(@org.jetbrains.annotations.NotNull() java.lang.String v) { } - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } @@ -109,6 +112,11 @@ public final class Test { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; /** * * Test2 @@ -116,18 +124,15 @@ public final class Test { * * documentation. */ @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test2 { @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getA()Ljava/lang/String;") public final java.lang.String getA() { return null; } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;)V") public Test2(@org.jetbrains.annotations.NotNull() java.lang.String a) { super(); @@ -136,23 +141,25 @@ public final class Test2 { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; /** * constructor. */ @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test3 { @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getA()Ljava/lang/String;") public final java.lang.String getA() { return null; } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;)V") protected Test3(@org.jetbrains.annotations.NotNull() java.lang.String a) { super(); @@ -161,35 +168,19 @@ public final class Test3 { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test4 { - @kapt.internal.KaptSignature(value = "method()V") public final void method() { } - @kapt.internal.KaptSignature(value = "()V") public Test4() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt index 0faaadebd2b..11e7cf333c6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt @@ -1,5 +1,10 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class User { @org.jetbrains.annotations.NotNull() private final java.lang.String firstName = null; @@ -7,28 +12,23 @@ public final class User { private final java.lang.String secondName = null; private final int age = 0; - @kapt.internal.KaptSignature(value = "procedure()V") public final void procedure() { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getFirstName()Ljava/lang/String;") public final java.lang.String getFirstName() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getSecondName()Ljava/lang/String;") public final java.lang.String getSecondName() { return null; } - @kapt.internal.KaptSignature(value = "getAge()I") public final int getAge() { return 0; } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;Ljava/lang/String;I)V") public User(@org.jetbrains.annotations.NotNull() java.lang.String firstName, @org.jetbrains.annotations.NotNull() java.lang.String secondName, int age) { @@ -36,24 +36,20 @@ public final class User { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "component1()Ljava/lang/String;") public final java.lang.String component1() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "component2()Ljava/lang/String;") public final java.lang.String component2() { return null; } - @kapt.internal.KaptSignature(value = "component3()I") public final int component3() { return 0; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "copy(Ljava/lang/String;Ljava/lang/String;I)LUser;") public final User copy(@org.jetbrains.annotations.NotNull() java.lang.String firstName, @org.jetbrains.annotations.NotNull() java.lang.String secondName, int age) { @@ -61,38 +57,17 @@ public final class User { } @java.lang.Override() - @kapt.internal.KaptSignature(value = "toString()Ljava/lang/String;") public java.lang.String toString() { return null; } @java.lang.Override() - @kapt.internal.KaptSignature(value = "hashCode()I") public int hashCode() { return 0; } @java.lang.Override() - @kapt.internal.KaptSignature(value = "equals(Ljava/lang/Object;)Z") public boolean equals(java.lang.Object p0) { return false; } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt index 3be3c441499..e0b12e93829 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt @@ -1,10 +1,14 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface Intf { public static final Intf.Companion Companion = null; public static final int WHITE = 2; - @kapt.internal.KaptSignature(value = "getColor()I") public abstract int getColor(); @kotlin.Metadata() @@ -14,7 +18,6 @@ public abstract interface Intf { super(); } - @kapt.internal.KaptSignature(value = "getColor(LIntf;)I") public static int getColor(Intf $this) { return 0; } @@ -25,12 +28,10 @@ public abstract interface Intf { private static final int BLACK = 1; public static final int WHITE = 2; - @kapt.internal.KaptSignature(value = "getBLACK()I") public final int getBLACK() { return 0; } - @kapt.internal.KaptSignature(value = "()V") private Companion() { super(); } @@ -39,12 +40,15 @@ public abstract interface Intf { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface IntfWithDefaultImpls { - @kapt.internal.KaptSignature(value = "a()V") public abstract void a(); @kotlin.Metadata() @@ -54,7 +58,6 @@ public abstract interface IntfWithDefaultImpls { super(); } - @kapt.internal.KaptSignature(value = "a(LIntfWithDefaultImpls;)V") public static void a(IntfWithDefaultImpls $this) { } } @@ -62,26 +65,12 @@ public abstract interface IntfWithDefaultImpls { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface IntfWithoutDefaultImpls { } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt index 2b0835d3d64..4fc5f950dae 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt @@ -1,31 +1,42 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno1 { - @kapt.internal.KaptSignature(value = "value()Ljava/lang/String;") public abstract java.lang.String value(); } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum Enum1 { /*public static final*/ BLACK /* = new Enum1() */, /*public static final*/ WHITE /* = new Enum1() */; - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;I)V") Enum1() { } } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum Enum2 { /*public static final*/ RED /* = new Enum2() */, /*public static final*/ WHITE /* = new Enum2() */; @@ -34,52 +45,28 @@ public enum Enum2 { private final int col2 = 0; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "color()Ljava/lang/String;") public final java.lang.String color() { return null; } - @kapt.internal.KaptSignature(value = "privateEnumFun()V") private final void privateEnumFun() { } - @kapt.internal.KaptSignature(value = "publicEnumFun()V") public final void publicEnumFun() { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getCol()Ljava/lang/String;") public final java.lang.String getCol() { return null; } - @kapt.internal.KaptSignature(value = "getCol2()I") public final int getCol2() { return 0; } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;ILjava/lang/String;I)V") Enum2(@org.jetbrains.annotations.NotNull() @Anno1(value = "first") java.lang.String col, @Anno1(value = "second") int col2) { } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.kt b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.kt index b5937a8e89c..af0fd138489 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.kt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.kt @@ -1,21 +1,21 @@ // CORRECT_ERROR_TYPES -// EXPECTED_ERROR(10;12) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (33, 5)) -// EXPECTED_ERROR(10;19) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 50)) -// EXPECTED_ERROR(12;12) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (34, 5)) -// EXPECTED_ERROR(12;34) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 62)) +// EXPECTED_ERROR(12;12) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (33, 5)) +// EXPECTED_ERROR(12;19) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 50)) +// EXPECTED_ERROR(14;12) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (34, 5)) +// EXPECTED_ERROR(14;34) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 62)) // EXPECTED_ERROR(22;18) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 50)) -// EXPECTED_ERROR(27;18) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (33, 5)) -// EXPECTED_ERROR(28;33) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 62)) -// EXPECTED_ERROR(33;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (33, 5)) -// EXPECTED_ERROR(35;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 34)) -// EXPECTED_ERROR(36;30) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 34)) -// EXPECTED_ERROR(38;18) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (34, 5)) -// EXPECTED_ERROR(44;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (34, 5)) -// EXPECTED_ERROR(54;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (37, 5)) -// EXPECTED_ERROR(5;11) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (23, 1)) -// EXPECTED_ERROR(60;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (39, 5)) -// EXPECTED_ERROR(73;18) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (42, 5)) +// EXPECTED_ERROR(26;18) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (33, 5)) +// EXPECTED_ERROR(27;33) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 62)) +// EXPECTED_ERROR(31;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (33, 5)) +// EXPECTED_ERROR(33;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 34)) +// EXPECTED_ERROR(34;30) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (26, 34)) +// EXPECTED_ERROR(35;18) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (34, 5)) +// EXPECTED_ERROR(40;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (34, 5)) +// EXPECTED_ERROR(48;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (37, 5)) +// EXPECTED_ERROR(53;5) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (39, 5)) +// EXPECTED_ERROR(63;18) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (42, 5)) +// EXPECTED_ERROR(8;11) cannot find symbol (Kotlin location: /errorLocationMapping.kt: (23, 1)) @file:Suppress("UNRESOLVED_REFERENCE", "ANNOTATION_PARAMETER_MUST_BE_CONST", "NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION") import kotlin.reflect.KClass diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt index 8ff5d0db450..691452b1e59 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt @@ -1,25 +1,28 @@ +/** + * @KaptMetadata + */ + import kotlin.reflect.KClass; @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno { - @kapt.internal.KaptSignature(value = "a()Ljava/lang/Class;") public abstract java.lang.Class a(); } //////////////////// +/** + * @KaptMetadata + */ import kotlin.reflect.KClass; @kotlin.Metadata() @Anno(a = ABC.class) -@kapt.internal.KaptMetadata() public final class ErrorInAnnotation { - @kapt.internal.KaptSignature(value = "()V") public ErrorInAnnotation() { super(); } @@ -27,11 +30,13 @@ public final class ErrorInAnnotation { //////////////////// +/** + * @KaptMetadata + */ import kotlin.reflect.KClass; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class ErrorInConstructorParameter { @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; @@ -41,24 +46,20 @@ public final class ErrorInConstructorParameter { private final java.util.List c = null; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getA()Ljava/lang/String;") public final java.lang.String getA() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getB()Lerror/NonExistentClass;") public final ABC getB() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getC()Ljava/util/List;") public final java.util.List getC() { return null; } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;Lerror/NonExistentClass;Ljava/util/List;)V") public ErrorInConstructorParameter(@org.jetbrains.annotations.NotNull() java.lang.String a, @org.jetbrains.annotations.NotNull() ABC b, @org.jetbrains.annotations.NotNull() @@ -69,11 +70,13 @@ public final class ErrorInConstructorParameter { //////////////////// +/** + * @KaptMetadata + */ import kotlin.reflect.KClass; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class ErrorInDeclarations { @org.jetbrains.annotations.NotNull() public java.lang.String p1; @@ -83,69 +86,56 @@ public final class ErrorInDeclarations { public BCD p3; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getP1()Ljava/lang/String;") public final java.lang.String getP1() { return null; } - @kapt.internal.KaptSignature(value = "setP1(Ljava/lang/String;)V") public final void setP1(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getP2()Lerror/NonExistentClass;") public final ABC getP2() { return null; } - @kapt.internal.KaptSignature(value = "setP2(Lerror/NonExistentClass;)V") public final void setP2(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getP3()Lerror/NonExistentClass;") public final BCD getP3() { return null; } - @kapt.internal.KaptSignature(value = "setP3(Lerror/NonExistentClass;)V") public final void setP3(@org.jetbrains.annotations.NotNull() BCD p0) { } - @kapt.internal.KaptSignature(value = "overloads(Ljava/lang/String;)V") public final void overloads(@org.jetbrains.annotations.NotNull() java.lang.String a) { } - @kapt.internal.KaptSignature(value = "overloads(Lerror/NonExistentClass;)V") public final void overloads(@org.jetbrains.annotations.NotNull() ABC a) { } - @kapt.internal.KaptSignature(value = "f1(Ljava/lang/String;Lerror/NonExistentClass;)V") public final void f1(@org.jetbrains.annotations.NotNull() java.lang.String a, @org.jetbrains.annotations.NotNull() ABC> b) { } - @kapt.internal.KaptSignature(value = "f2()V") public final void f2() { } - @kapt.internal.KaptSignature(value = "f3()V") public final void f3() { } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "f4()Lerror/NonExistentClass;") public final ABC f4() { return null; } - @kapt.internal.KaptSignature(value = "()V") public ErrorInDeclarations() { super(); } @@ -153,14 +143,15 @@ public final class ErrorInDeclarations { //////////////////// +/** + * @KaptMetadata + */ import kotlin.reflect.KClass; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class ErrorInSupertype { - @kapt.internal.KaptSignature(value = "()V") public ErrorInSupertype() { super(); } @@ -168,33 +159,16 @@ public final class ErrorInSupertype { //////////////////// +/** + * @KaptMetadata + */ import kotlin.reflect.KClass; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class ErrorInSupertype2 { - @kapt.internal.KaptSignature(value = "()V") public ErrorInSupertype2() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt index 22d85469d86..4079149057e 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt @@ -1,7 +1,11 @@ +/** + * @KaptMetadata + */ package a.b.c; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class FacadeName { public FacadeName() { @@ -9,30 +13,10 @@ public final class FacadeName { } private static final int bar = 3; - @kapt.internal.KaptSignature(value = "foo()V") public static final void foo() { } - @kapt.internal.KaptSignature(value = "getBar()I") public static final int getBar() { return 0; } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt b/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt index 06b3b7d1967..e95f11b0838 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt @@ -1,48 +1,30 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class FunctionsTest { @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "f()Lkotlin/reflect/KProperty1;") public final kotlin.reflect.KProperty1 f() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "f2()Lkotlin/jvm/functions/Function2;") public final kotlin.jvm.functions.Function2 f2() { return null; } - @kapt.internal.KaptSignature(value = "f3()V") public final void f3() { } - @kapt.internal.KaptSignature(value = "f4()I") public final int f4() { return 0; } - @kapt.internal.KaptSignature(value = "()V") public FunctionsTest() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt index 5a2b62ade36..7de4a6b2bbf 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt @@ -1,39 +1,23 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class GenericRawSignatures { @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "genericFun()Ljava/lang/Object;") public final T genericFun() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "nonGenericFun()Ljava/lang/String;") public final java.lang.String nonGenericFun() { return null; } - @kapt.internal.KaptSignature(value = "()V") public GenericRawSignatures() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt index c7032f4f6bb..2175bd4175f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt @@ -1,27 +1,33 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface ABC { @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "abc(Ljava/lang/CharSequence;Ljava/util/List;[Ljava/lang/CharSequence;)Ljava/util/List;") public abstract java.util.List abc(@org.jetbrains.annotations.NotNull() T item, @org.jetbrains.annotations.NotNull() java.util.List items, @org.jetbrains.annotations.NotNull() T... otherItems); - @kapt.internal.KaptSignature(value = "bcd([C)I") public abstract int bcd(@org.jetbrains.annotations.NotNull() char... a); } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public class BaseClass { - @kapt.internal.KaptSignature(value = "()V") public BaseClass() { super(); } @@ -29,36 +35,46 @@ public class BaseClass { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface Intf { } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface Intf2, M extends T> { } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class MyClass extends BaseClass implements Intf, OtherIntf { @org.jetbrains.annotations.Nullable() private final java.util.List> fld = null; @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "getFld()Ljava/util/List;") public final java.util.List> getFld() { return null; } - @kapt.internal.KaptSignature(value = "()V") public MyClass() { super(); } @@ -66,26 +82,12 @@ public final class MyClass { } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt index 51d1f841ee8..96b2e9ec0ee 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt @@ -1,41 +1,25 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { @org.jetbrains.annotations.NotNull() private final java.lang.String ignoredProperty = ""; @org.jetbrains.annotations.NotNull() private final java.lang.String nonIgnoredProperty = ""; - @kapt.internal.KaptSignature(value = "nonIgnoredFun()V") public final void nonIgnoredFun() { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getNonIgnoredProperty()Ljava/lang/String;") public final java.lang.String getNonIgnoredProperty() { return null; } - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.txt index d8285996e72..ab05797c3ef 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.txt @@ -1,10 +1,13 @@ +/** + * @KaptMetadata + */ + import java.util.concurrent.*; import java.util.Date; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit.MICROSECONDS; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class ImportsForErrorTypesKt { public ImportsForErrorTypesKt() { @@ -12,26 +15,7 @@ public final class ImportsForErrorTypesKt { } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "test()Ljava/lang/Object;") public static final java.lang.Object test() { return null; } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt index fa01226538e..1677d5c5e9d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt @@ -1,12 +1,15 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract class BaseClass { @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "doJob()LResult;") public abstract Result doJob(); - @kapt.internal.KaptSignature(value = "(LContext;IZ)V") public BaseClass(@org.jetbrains.annotations.NotNull() Context context, int num, boolean bool) { super(); @@ -15,27 +18,33 @@ public abstract class BaseClass { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface Context { } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Inheritor extends BaseClass { @org.jetbrains.annotations.NotNull() @java.lang.Override() - @kapt.internal.KaptSignature(value = "doJob()LResult;") public Result doJob() { return null; } - @kapt.internal.KaptSignature(value = "(LContext;)V") public Inheritor(@org.jetbrains.annotations.NotNull() Context context) { super(null, 0, false); @@ -44,32 +53,17 @@ public final class Inheritor extends BaseClass { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum Result { /*public static final*/ SUCCESS /* = new Result() */, /*public static final*/ ERROR /* = new Result() */; - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;I)V") Result() { } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt index 74b7f0df06f..e65124344d4 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt @@ -1,9 +1,13 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { private Test.FilterValueDelegate a; - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } @@ -11,7 +15,6 @@ public final class Test { @kotlin.Metadata() final class FilterValueDelegate { - @kapt.internal.KaptSignature(value = "(LTest;)V") public FilterValueDelegate() { super(); } @@ -20,12 +23,15 @@ public final class Test { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test2 { - @kapt.internal.KaptSignature(value = "()V") public Test2() { super(); } @@ -34,7 +40,6 @@ public final class Test2 { public final class FilterValueDelegate { private Test2.FilterValueDelegate.Filter2 a; - @kapt.internal.KaptSignature(value = "(LTest2;)V") public FilterValueDelegate() { super(); } @@ -42,7 +47,6 @@ public final class Test2 { @kotlin.Metadata() public final class Filter2 { - @kapt.internal.KaptSignature(value = "(LTest2$FilterValueDelegate;)V") public Filter2() { super(); } @@ -52,13 +56,16 @@ public final class Test2 { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test3 { private Test3.FilterValueDelegate a; - @kapt.internal.KaptSignature(value = "()V") public Test3() { super(); } @@ -66,27 +73,8 @@ public final class Test3 { @kotlin.Metadata() static final class FilterValueDelegate { - @kapt.internal.KaptSignature(value = "()V") public FilterValueDelegate() { super(); } } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt index b39a3769a32..1e374a6b8e2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt @@ -1,5 +1,5 @@ // EXPECTED_ERROR(-1;-1) 'WHI-TE' is an invalid Java enum value name -// EXPECTED_ERROR(4;20) cannot find symbol (Kotlin location: /invalidFieldName.kt: (8, 1)) +// EXPECTED_ERROR(9;20) cannot find symbol (Kotlin location: /invalidFieldName.kt: (8, 1)) enum class Color { BLACK, `WHI-TE` diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt index 8f654b17423..30f33653573 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt @@ -1,40 +1,29 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @Anno(color = Color.InvalidFieldName) -@kapt.internal.KaptMetadata() public abstract @interface Anno { - @kapt.internal.KaptSignature(value = "color()LColor;") public abstract Color color(); } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum Color { /*public static final*/ BLACK /* = new Color() */; - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;I)V") Color() { } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywords.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywords.txt index cb11bb99b4c..8b137891791 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywords.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywords.txt @@ -1,15 +1 @@ -package kapt.internal; -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt index fda3f9eb36d..cc0c4930a95 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt @@ -1,10 +1,13 @@ +/** + * @KaptMetadata + */ package a.b.c; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class A { - @kapt.internal.KaptSignature(value = "()V") public A() { super(); } @@ -12,32 +15,17 @@ public final class A { //////////////////// +/** + * @KaptMetadata + */ package a.b.typealias.c; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class E { - @kapt.internal.KaptSignature(value = "()V") public E() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt index c6a5b78dd5d..90a7ee6c111 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt @@ -1,34 +1,34 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@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(value = "getSomeInt()I") public final int getSomeInt() { return 0; } - @kapt.internal.KaptSignature(value = "getSomeLong()J") public final long getSomeLong() { return 0L; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getSomeString()Ljava/lang/String;") public final java.lang.String getSomeString() { return null; } - @kapt.internal.KaptSignature(value = "(IJLjava/lang/String;)V") public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull() java.lang.String someString) { super(); } - @kapt.internal.KaptSignature(value = "(IJ)V") public State(int someInt, long someLong) { super(); } @@ -36,71 +36,49 @@ public final class State { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() 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; - @kapt.internal.KaptSignature(value = "test(IJLjava/lang/String;)I") public final int test(int someInt, long someLong, @org.jetbrains.annotations.NotNull() java.lang.String someString) { return 0; } - @kapt.internal.KaptSignature(value = "test(IJ)I") public final int test(int someInt, long someLong) { return 0; } - @kapt.internal.KaptSignature(value = "test(I)I") public final int test(int someInt) { return 0; } - @kapt.internal.KaptSignature(value = "someMethod(Ljava/lang/String;)V") public final void someMethod(@org.jetbrains.annotations.NotNull() java.lang.String str) { } - @kapt.internal.KaptSignature(value = "methodWithoutArgs()V") public final void methodWithoutArgs() { } - @kapt.internal.KaptSignature(value = "(IJLjava/lang/String;)V") public State2(int someInt, long someLong, @org.jetbrains.annotations.NotNull() java.lang.String someString) { super(); } - @kapt.internal.KaptSignature(value = "(IJ)V") public State2(int someInt, long someLong) { super(); } - @kapt.internal.KaptSignature(value = "(I)V") public State2(int someInt) { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt index ce3bde3df2c..0321ea9e9f6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt @@ -1,5 +1,10 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class JvmStaticTest { private final byte three = (byte)3; private final char d = 'D'; @@ -8,22 +13,18 @@ public final class JvmStaticTest { public static final char c = 'C'; public static final JvmStaticTest.Companion Companion = null; - @kapt.internal.KaptSignature(value = "getThree()B") public final byte getThree() { return 0; } - @kapt.internal.KaptSignature(value = "getD()C") public final char getD() { return '\u0000'; } - @kapt.internal.KaptSignature(value = "()V") public JvmStaticTest() { super(); } - @kapt.internal.KaptSignature(value = "getOne()I") public static final int getOne() { return 0; } @@ -31,41 +32,19 @@ public final class JvmStaticTest { @kotlin.Metadata() public static final class Companion { - @kapt.internal.KaptSignature(value = "one$annotations()V") public static void one$annotations() { } - @kapt.internal.KaptSignature(value = "getOne()I") public final int getOne() { return 0; } - @kapt.internal.KaptSignature(value = "getTwo()I") public final int getTwo() { return 0; } - @kapt.internal.KaptSignature(value = "()V") private Companion() { super(); } } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt index b949ae7c942..bf7b2f13cb0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt @@ -1,17 +1,20 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { @org.jetbrains.annotations.NotNull() private static final java.lang.String test = ""; public static final Test.A A = null; - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getTest()Ljava/lang/String;") public static final java.lang.String getTest() { return null; } @@ -19,37 +22,16 @@ public final class Test { @kotlin.Metadata() public static final class A { - @kapt.internal.KaptSignature(value = "test$annotations()V") public static void test$annotations() { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getTest()Ljava/lang/String;") public final java.lang.String getTest() { return null; } - @kapt.internal.KaptSignature(value = "()V") private A() { super(); } } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt index ef671362708..66ec7ae4261 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt @@ -1,5 +1,10 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Kt14996Kt { public Kt14996Kt() { @@ -7,34 +12,14 @@ public final class Kt14996Kt { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "crashMe(Ljava/util/List;)Ljava/lang/String;") public static final java.lang.String crashMe(@org.jetbrains.annotations.NotNull() java.util.List values) { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "crashMe(Ljava/util/List;)Ljava/lang/CharSequence;") public static final java.lang.CharSequence crashMe(@org.jetbrains.annotations.NotNull() java.util.List values) { return null; } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt index 2a3794a5ad2..89555a7768f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt @@ -1,9 +1,13 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public class CrashMe { private final java.lang.Runnable notReally = null; - @kapt.internal.KaptSignature(value = "()V") public CrashMe() { super(); } @@ -11,10 +15,14 @@ public class CrashMe { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Suppress(names = {"AMBIGUOUS_ANONYMOUS_TYPE_INFERRED"}) @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Kt14997Kt { public Kt14997Kt() { @@ -22,38 +30,17 @@ public final class Kt14997Kt { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "a()Ljava/lang/Runnable;") public static final java.lang.Runnable a() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "b()LKt14997Kt$b$1;") public static final java.lang.Runnable b() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "c()LKt14997Kt$c$1;") public static final CrashMe c() { return null; } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt index 37c20bfdd16..24c4002f103 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt @@ -1,13 +1,16 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Outer { - @kapt.internal.KaptSignature(value = "nonAbstract(Ljava/lang/String;I)V") public final void nonAbstract(@org.jetbrains.annotations.NotNull() java.lang.String s, int i) { } - @kapt.internal.KaptSignature(value = "()V") public Outer() { super(); } @@ -20,18 +23,15 @@ public final class Outer { private final java.lang.String bar = null; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getFoo()Ljava/lang/String;") public final java.lang.String getFoo() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getBar()Ljava/lang/String;") public final java.lang.String getBar() { return null; } - @kapt.internal.KaptSignature(value = "(LOuter;Ljava/lang/String;Ljava/lang/String;)V") public Inner(@org.jetbrains.annotations.NotNull() java.lang.String foo, @org.jetbrains.annotations.NotNull() java.lang.String bar) { @@ -47,18 +47,15 @@ public final class Outer { private final java.lang.String bar = null; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getFoo()Ljava/lang/String;") public final java.lang.String getFoo() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getBar()Ljava/lang/String;") public final java.lang.String getBar() { return null; } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;Ljava/lang/String;)V") public Nested(@org.jetbrains.annotations.NotNull() java.lang.String foo, @org.jetbrains.annotations.NotNull() java.lang.String bar) { @@ -66,21 +63,3 @@ public final class Outer { } } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt index 043b3786799..db99c5e2d30 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt @@ -1,34 +1,19 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface MyInterface { - @kapt.internal.KaptSignature(value = "someFun()V") public abstract void someFun(); @kotlin.Metadata() public static final class MyDefaultInferface { - @kapt.internal.KaptSignature(value = "()V") public MyDefaultInferface() { super(); } } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt index b0a46f371c8..242bd1c4320 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt @@ -1,36 +1,20 @@ -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class MutableEntry implements java.util.Map.Entry, kotlin.jvm.internal.markers.KMutableMap.Entry { private final java.util.Map internal = null; private final K key = null; @java.lang.Override() - @kapt.internal.KaptSignature(value = "getKey()Ljava/lang/Object;") public K getKey() { return null; } - @kapt.internal.KaptSignature(value = "(Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)V") public MutableEntry(@org.jetbrains.annotations.NotNull() java.util.Map internal, K key, V value) { super(); diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt index 4acc6de0bd7..0e16fc7f4b0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt @@ -1,5 +1,10 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Kt18377Kt { public Kt18377Kt() { @@ -7,26 +12,7 @@ public final class Kt18377Kt { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "Date(D)Ljava/util/Date;") public static final java.util.Date Date(double p0_1484504552) { return null; } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt index a9c9a278f5f..475681d8d33 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt @@ -1,8 +1,12 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract class Foo { - @kapt.internal.KaptSignature(value = "()V") public Foo() { super(); } @@ -10,9 +14,13 @@ public abstract class Foo { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Kt18682Kt { public Kt18682Kt() { @@ -20,44 +28,22 @@ public final class Kt18682Kt { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "test1()Ljava/util/List;") public static final java.util.List test1() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "test2()Ljava/util/List;") public static final java.util.List test2() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "test3()Ljava/util/List;") public static final java.util.List test3() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "test4()Ljava/util/List;") public static final java.util.List test4() { return null; } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt index 5d344d3b7a1..558cf1a9330 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt @@ -1,35 +1,30 @@ +/** + * @KaptMetadata + */ package app; +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno { - @kapt.internal.KaptSignature(value = "a1()Z") public abstract boolean a1(); - @kapt.internal.KaptSignature(value = "a2()B") public abstract byte a2(); - @kapt.internal.KaptSignature(value = "a3()I") public abstract int a3(); - @kapt.internal.KaptSignature(value = "a4()S") public abstract short a4(); - @kapt.internal.KaptSignature(value = "a5()J") public abstract long a5(); - @kapt.internal.KaptSignature(value = "a6()C") public abstract char a6(); - @kapt.internal.KaptSignature(value = "a7()F") public abstract float a7(); - @kapt.internal.KaptSignature(value = "a8()D") public abstract double a8(); - @kapt.internal.KaptSignature(value = "a9()Ljava/lang/String;") public abstract java.lang.String a9(); } @@ -63,57 +58,57 @@ public class B { //////////////////// +/** + * @KaptMetadata + */ package app; +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Bind { - @kapt.internal.KaptSignature(value = "id()I") public abstract int id(); } //////////////////// +/** + * @KaptMetadata + */ package app; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class MyActivity { @Bind(id = lib.R.id.textView) - @kapt.internal.KaptSignature(value = "foo()V") public final void foo() { } @Bind(id = lib.R.id.textView) - @kapt.internal.KaptSignature(value = "foo2()V") public final void foo2() { } @Bind(id = app.R.layout.mainActivity) - @kapt.internal.KaptSignature(value = "foo3()V") public final void foo3() { } @Bind(id = app.R.layout.mainActivity) - @kapt.internal.KaptSignature(value = "foo4()V") public final void foo4() { } @Anno(a1 = app.B.a1, a2 = app.B.a2, a3 = app.B.a3, a4 = app.B.a4, a5 = app.B.a5, a6 = app.B.a6, a7 = app.B.a7, a8 = app.B.a8, a9 = "A") @Bind(id = app.R2.layout.mainActivity) - @kapt.internal.KaptSignature(value = "foo5()V") public final void foo5() { } @Bind(id = app.B.id.textView) - @kapt.internal.KaptSignature(value = "plainIntConstant()V") public final void plainIntConstant() { } - @kapt.internal.KaptSignature(value = "()V") public MyActivity() { super(); } @@ -159,24 +154,6 @@ public class R2 { //////////////////// -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - package lib; public class R { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt index 65630c657a6..9edc2c3e27a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt @@ -1,41 +1,29 @@ -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface ListUpdateCallback { - @kapt.internal.KaptSignature(value = "onInserted(II)V") public abstract void onInserted(int position, int count); } //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { private final test.ListUpdateCallback x = null; - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt index cdbca40f0fc..c8772e55252 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt @@ -1,29 +1,14 @@ -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { private final test.TypedListUpdateCallback x = null; - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } @@ -31,13 +16,16 @@ public final class Test { - @kapt.internal.KaptSignature(value = "onInserted(Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/Object;)V") public abstract void onInserted(@org.jetbrains.annotations.NotNull() C position, @org.jetbrains.annotations.NotNull() C count, @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt b/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt index f4ae55338a2..63b935715de 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt @@ -1,31 +1,16 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface EntryHolder { @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "entry(Ljava/util/Map$Entry;)Ljava/util/Map$Entry;") public abstract java.util.Map.Entry entry(@org.jetbrains.annotations.NotNull() java.util.Map.Entry> p); @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getEntryProperty()Ljava/util/Map$Entry;") public abstract java.util.Map.Entry getEntryProperty(); } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.kt b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.kt index 3a350101b88..ca22e660709 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.kt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.kt @@ -1,5 +1,5 @@ // CORRECT_ERROR_TYPES -// EXPECTED_ERROR(10;5) cannot find symbol (Kotlin location: /maxErrorCount.kt: (9, 5)) +// EXPECTED_ERROR(11;5) cannot find symbol (Kotlin location: /maxErrorCount.kt: (9, 5)) // JAVAC_OPTION -Xmaxerrs=1 @file:Suppress("UNRESOLVED_REFERENCE") diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt index 7efa3b60adc..2f47884103f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt @@ -1,35 +1,18 @@ +/** + * @KaptMetadata + */ + import kotlin.reflect.KClass; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { - @kapt.internal.KaptSignature(value = "a(Lerror/NonExistentClass;Lerror/NonExistentClass;)V") public final void a(@org.jetbrains.annotations.NotNull() ABC a, @org.jetbrains.annotations.NotNull() BCD b) { } - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt index 35284513338..76d992f1e2a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt @@ -1,18 +1,20 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract class Cls { - @kapt.internal.KaptSignature(value = "foo(Ljava/lang/String;)V") public abstract void foo(@org.jetbrains.annotations.NotNull() java.lang.String abc); @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "bar(I)Ljava/lang/String;") public final java.lang.String bar(int bcd) { return null; } - @kapt.internal.KaptSignature(value = "()V") public Cls() { super(); } @@ -20,17 +22,19 @@ public abstract class Cls { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface Intf { - @kapt.internal.KaptSignature(value = "foo(Ljava/lang/String;)V") public abstract void foo(@org.jetbrains.annotations.NotNull() java.lang.String abc); @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "bar(I)Ljava/lang/String;") public abstract java.lang.String bar(int bcd); @kotlin.Metadata() @@ -41,27 +45,8 @@ public abstract interface Intf { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "bar(LIntf;I)Ljava/lang/String;") public static java.lang.String bar(Intf $this, int bcd) { return null; } } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt index 44d4364e4aa..af37bb2d8b6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt @@ -1,39 +1,23 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class CrashMe { private final int resources = 1; - @kapt.internal.KaptSignature(value = "getResources()I") public final int getResources() { return 0; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getResources()Ljava/lang/String;") public final java.lang.String getResources() { return null; } - @kapt.internal.KaptSignature(value = "()V") public CrashMe() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt index d84cc3ae5f6..5d8ae808f5d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt @@ -1,28 +1,13 @@ -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class InternalClass { - @kapt.internal.KaptSignature(value = "()V") public InternalClass() { super(); } @@ -30,19 +15,27 @@ public final class InternalClass { //////////////////// +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface InternalInterface { } //////////////////// +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Modifiers { @org.jetbrains.annotations.NotNull() private final transient java.lang.String transientField = ""; @@ -50,47 +43,39 @@ public final class Modifiers { private volatile java.lang.String volatileField; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getTransientField()Ljava/lang/String;") public final java.lang.String getTransientField() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getVolatileField()Ljava/lang/String;") public final java.lang.String getVolatileField() { return null; } - @kapt.internal.KaptSignature(value = "setVolatileField(Ljava/lang/String;)V") public final void setVolatileField(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } - @kapt.internal.KaptSignature(value = "strictFp()V") public final strictfp void strictFp() { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "overloads(Ljava/lang/String;I)Ljava/lang/String;") public final java.lang.String overloads(@org.jetbrains.annotations.NotNull() java.lang.String a, int n) { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "overloads(Ljava/lang/String;)Ljava/lang/String;") public final java.lang.String overloads(@org.jetbrains.annotations.NotNull() java.lang.String a) { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "overloads()Ljava/lang/String;") public final java.lang.String overloads() { return null; } - @kapt.internal.KaptSignature(value = "()V") public Modifiers() { super(); } @@ -98,13 +83,16 @@ public final class Modifiers { //////////////////// +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() final class PrivateClass { - @kapt.internal.KaptSignature(value = "()V") public PrivateClass() { super(); } @@ -112,22 +100,29 @@ final class PrivateClass { //////////////////// +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() abstract interface PrivateInterface { } //////////////////// +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class PublicClass { - @kapt.internal.KaptSignature(value = "()V") public PublicClass() { super(); } @@ -135,13 +130,16 @@ public final class PublicClass { //////////////////// +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract class PublicClassPrivateConstructor { - @kapt.internal.KaptSignature(value = "()V") private PublicClassPrivateConstructor() { super(); } @@ -149,13 +147,16 @@ public abstract class PublicClassPrivateConstructor { //////////////////// +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public class PublicClassProtectedConstructor { - @kapt.internal.KaptSignature(value = "()V") protected PublicClassProtectedConstructor() { super(); } @@ -171,22 +172,29 @@ public class PublicClassProtectedConstructor { //////////////////// +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface PublicInterface { } //////////////////// +/** + * @KaptMetadata + */ package modifiers; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract class SealedClass { - @kapt.internal.KaptSignature(value = "()V") private SealedClass() { super(); } @@ -194,7 +202,6 @@ public abstract class SealedClass { @kotlin.Metadata() public static final class One extends modifiers.SealedClass { - @kapt.internal.KaptSignature(value = "()V") public One() { super(); } @@ -203,7 +210,6 @@ public abstract class SealedClass { @kotlin.Metadata() public static class Two extends modifiers.SealedClass { - @kapt.internal.KaptSignature(value = "()V") public Two() { super(); } @@ -212,7 +218,6 @@ public abstract class SealedClass { @kotlin.Metadata() public static abstract class Three extends modifiers.SealedClass.Two { - @kapt.internal.KaptSignature(value = "()V") public Three() { super(); } @@ -221,7 +226,6 @@ public abstract class SealedClass { @kotlin.Metadata() public static final class Four extends modifiers.SealedClass.Three { - @kapt.internal.KaptSignature(value = "()V") public Four() { super(); } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt index 2faab7c4e0a..ec05371c7dd 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt @@ -1,53 +1,40 @@ -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class M1 { public M1() { super(); } - @kapt.internal.KaptSignature(value = "bar()V") public static final void bar() { } - @kapt.internal.KaptSignature(value = "foo()V") public static final void foo() { } } //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class M2 { public M2() { super(); } - @kapt.internal.KaptSignature(value = "baz()V") public static final void baz() { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt index 6a60c62c434..13515607fdf 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt @@ -1,24 +1,26 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class A { @org.jetbrains.annotations.Nullable() private final A x = null; @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "getX()LA;") public final A getX() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "f1(LA;LA$B;)LA;") public final A f1(@org.jetbrains.annotations.NotNull() A a, @org.jetbrains.annotations.NotNull() A.B b) { return null; } - @kapt.internal.KaptSignature(value = "()V") public A() { super(); } @@ -27,7 +29,6 @@ public final class A { public static abstract interface B { @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "getY()LA$B;") public abstract A.B getY(); @kotlin.Metadata() @@ -43,7 +44,6 @@ public final class A { public static final class C { public static final A.C INSTANCE = null; - @kapt.internal.KaptSignature(value = "()V") private C() { super(); } @@ -52,12 +52,15 @@ public final class A { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class A2 { - @kapt.internal.KaptSignature(value = "()V") public A2() { super(); } @@ -65,7 +68,6 @@ public final class A2 { @kotlin.Metadata() public static final class B { - @kapt.internal.KaptSignature(value = "()V") public B() { super(); } @@ -73,7 +75,6 @@ public final class A2 { @kotlin.Metadata() public static final class C { - @kapt.internal.KaptSignature(value = "()V") public C() { super(); } @@ -81,7 +82,6 @@ public final class A2 { @kotlin.Metadata() public static final class D { - @kapt.internal.KaptSignature(value = "()V") public D() { super(); } @@ -89,7 +89,6 @@ public final class A2 { @kotlin.Metadata() public static final class Cme { - @kapt.internal.KaptSignature(value = "()V") public Cme() { super(); } @@ -98,7 +97,6 @@ public final class A2 { @kotlin.Metadata() public static final class E { - @kapt.internal.KaptSignature(value = "()V") public E() { super(); } @@ -110,12 +108,15 @@ public final class A2 { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Foo { - @kapt.internal.KaptSignature(value = "()V") public Foo() { super(); } @@ -123,12 +124,15 @@ public final class Foo { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } @@ -136,7 +140,6 @@ public final class Test { @kotlin.Metadata() public static final class Nested { - @kapt.internal.KaptSignature(value = "()V") public Nested() { super(); } @@ -144,7 +147,6 @@ public final class Test { @kotlin.Metadata() public static final class NestedNested { - @kapt.internal.KaptSignature(value = "()V") public NestedNested() { super(); } @@ -154,7 +156,6 @@ public final class Test { @kotlin.Metadata() public final class Inner { - @kapt.internal.KaptSignature(value = "(LTest;)V") public Inner() { super(); } @@ -164,7 +165,6 @@ public final class Test { public static final class NestedObject { public static final Test.NestedObject INSTANCE = null; - @kapt.internal.KaptSignature(value = "()V") private NestedObject() { super(); } @@ -179,26 +179,7 @@ public final class Test { /*public static final*/ BLACK /* = new NestedEnum() */, /*public static final*/ WHITE /* = new NestedEnum() */; - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;I)V") NestedEnum() { } } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt index c6121dd3ce7..b9aea6f1e87 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt @@ -1,5 +1,10 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class A$B { @org.jetbrains.annotations.NotNull() public A$B.C c; @@ -18,7 +23,6 @@ public final class A$B { @org.jetbrains.annotations.NotNull() public J$B.D$$$E jdeee; - @kapt.internal.KaptSignature(value = "()V") public A$B() { super(); } @@ -26,7 +30,6 @@ public final class A$B { @kotlin.Metadata() public static final class C { - @kapt.internal.KaptSignature(value = "()V") public C() { super(); } @@ -43,7 +46,6 @@ public final class A$B { @org.jetbrains.annotations.NotNull() public J$B.D$E.F$G jfg; - @kapt.internal.KaptSignature(value = "()V") public D$E() { super(); } @@ -51,7 +53,6 @@ public final class A$B { @kotlin.Metadata() public static final class F { - @kapt.internal.KaptSignature(value = "()V") public F() { super(); } @@ -60,7 +61,6 @@ public final class A$B { @kotlin.Metadata() public static final class F$G { - @kapt.internal.KaptSignature(value = "()V") public F$G() { super(); } @@ -70,7 +70,6 @@ public final class A$B { @kotlin.Metadata() public static final class D$$E { - @kapt.internal.KaptSignature(value = "()V") public D$$E() { super(); } @@ -79,7 +78,6 @@ public final class A$B { @kotlin.Metadata() public static final class D$$$E { - @kapt.internal.KaptSignature(value = "()V") public D$$$E() { super(); } @@ -88,12 +86,15 @@ public final class A$B { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Experiment { - @kapt.internal.KaptSignature(value = "()V") public Experiment() { super(); } @@ -107,14 +108,12 @@ public final class Experiment { @Experiment.Type() public static final class Group { - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;)V") public Group(@org.jetbrains.annotations.NotNull() java.lang.String s) { super(); } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "copy(Ljava/lang/String;)LExperiment$Group;") public final Experiment.Group copy(@org.jetbrains.annotations.NotNull() java.lang.String s) { return null; @@ -124,12 +123,15 @@ public final class Experiment { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Foo { - @kapt.internal.KaptSignature(value = "()V") public Foo() { super(); } @@ -137,7 +139,6 @@ public final class Foo { @kotlin.Metadata() public static class Bar { - @kapt.internal.KaptSignature(value = "()V") public Bar() { super(); } @@ -146,7 +147,6 @@ public final class Foo { public static final class Zoo { public static final Foo.Bar.Zoo INSTANCE = null; - @kapt.internal.KaptSignature(value = "()V") private Zoo() { super(); } @@ -156,9 +156,13 @@ public final class Foo { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface IFoo { @kotlin.Metadata() @@ -168,7 +172,6 @@ public abstract interface IFoo { @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public static abstract @interface Anno { - @kapt.internal.KaptSignature(value = "value()[Ljava/lang/Class;") public abstract java.lang.Class[] value(); } @@ -257,53 +260,35 @@ public class JavaClass { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() @IFoo.IBar.Anno(value = {IFoo.IBar.IZoo.class, Foo.Bar.class}) -@kapt.internal.KaptMetadata() public final class Test1 extends Foo.Bar implements IFoo.IBar, IFoo.IBar.IZoo { @org.jetbrains.annotations.NotNull() private final Foo.Bar.Zoo zoo = null; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "a()Ljava/lang/Thread$State;") public final java.lang.Thread.State a() { return null; } - @kapt.internal.KaptSignature(value = "b(LJavaClass$Foo;LJavaClass$Foo$Bar;)V") public final void b(@org.jetbrains.annotations.NotNull() JavaClass.Foo foo, @org.jetbrains.annotations.NotNull() JavaClass.Foo.Bar bar) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getZoo()LFoo$Bar$Zoo;") public final Foo.Bar.Zoo getZoo() { return null; } - @kapt.internal.KaptSignature(value = "(LFoo$Bar$Zoo;)V") public Test1(@org.jetbrains.annotations.NotNull() Foo.Bar.Zoo zoo) { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt index c1461f05835..d4d51e3d9ff 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt @@ -1,25 +1,11 @@ -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class A$B { @org.jetbrains.annotations.NotNull() public test.A$B.C c; @@ -38,7 +24,6 @@ public final class A$B { @org.jetbrains.annotations.NotNull() public test.J$B.D$$$E jdeee; - @kapt.internal.KaptSignature(value = "()V") public A$B() { super(); } @@ -46,7 +31,6 @@ public final class A$B { @kotlin.Metadata() public static final class C { - @kapt.internal.KaptSignature(value = "()V") public C() { super(); } @@ -63,7 +47,6 @@ public final class A$B { @org.jetbrains.annotations.NotNull() public test.J$B.D$E.F$G jfg; - @kapt.internal.KaptSignature(value = "()V") public D$E() { super(); } @@ -71,7 +54,6 @@ public final class A$B { @kotlin.Metadata() public static final class F { - @kapt.internal.KaptSignature(value = "()V") public F() { super(); } @@ -80,7 +62,6 @@ public final class A$B { @kotlin.Metadata() public static final class F$G { - @kapt.internal.KaptSignature(value = "()V") public F$G() { super(); } @@ -90,7 +71,6 @@ public final class A$B { @kotlin.Metadata() public static final class D$$E { - @kapt.internal.KaptSignature(value = "()V") public D$$E() { super(); } @@ -99,7 +79,6 @@ public final class A$B { @kotlin.Metadata() public static final class D$$$E { - @kapt.internal.KaptSignature(value = "()V") public D$$$E() { super(); } @@ -108,13 +87,16 @@ public final class A$B { //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Experiment { - @kapt.internal.KaptSignature(value = "()V") public Experiment() { super(); } @@ -128,14 +110,12 @@ public final class Experiment { @test.Experiment.Type() public static final class Group { - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;)V") public Group(@org.jetbrains.annotations.NotNull() java.lang.String s) { super(); } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "copy(Ljava/lang/String;)Ltest/Experiment$Group;") public final test.Experiment.Group copy(@org.jetbrains.annotations.NotNull() java.lang.String s) { return null; @@ -145,13 +125,16 @@ public final class Experiment { //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Foo { - @kapt.internal.KaptSignature(value = "()V") public Foo() { super(); } @@ -159,7 +142,6 @@ public final class Foo { @kotlin.Metadata() public static class Bar { - @kapt.internal.KaptSignature(value = "()V") public Bar() { super(); } @@ -168,7 +150,6 @@ public final class Foo { public static final class Zoo { public static final test.Foo.Bar.Zoo INSTANCE = null; - @kapt.internal.KaptSignature(value = "()V") private Zoo() { super(); } @@ -178,10 +159,14 @@ public final class Foo { //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public abstract interface IFoo { @kotlin.Metadata() @@ -191,7 +176,6 @@ public abstract interface IFoo { @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public static abstract @interface Anno { - @kapt.internal.KaptSignature(value = "value()[Ljava/lang/Class;") public abstract java.lang.Class[] value(); } @@ -282,34 +266,34 @@ class JavaClass { //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() @test.IFoo.IBar.Anno(value = {test.IFoo.IBar.IZoo.class, test.Foo.Bar.class}) -@kapt.internal.KaptMetadata() public final class Test1 extends test.Foo.Bar implements test.IFoo.IBar, test.IFoo.IBar.IZoo { @org.jetbrains.annotations.NotNull() private final test.Foo.Bar.Zoo zoo = null; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "a()Ljava/lang/Thread$State;") public final java.lang.Thread.State a() { return null; } - @kapt.internal.KaptSignature(value = "b(Ltest/JavaClass$Foo;Ltest/JavaClass$Foo$Bar;)V") public final void b(@org.jetbrains.annotations.NotNull() test.JavaClass.Foo foo, @org.jetbrains.annotations.NotNull() test.JavaClass.Foo.Bar bar) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getZoo()Ltest/Foo$Bar$Zoo;") public final test.Foo.Bar.Zoo getZoo() { return null; } - @kapt.internal.KaptSignature(value = "(Ltest/Foo$Bar$Zoo;)V") public Test1(@org.jetbrains.annotations.NotNull() test.Foo.Bar.Zoo zoo) { super(); diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt index 35688b035b4..624043376ed 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt @@ -1,6 +1,11 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class NonExistentType { @org.jetbrains.annotations.Nullable() private static final ABCDEF a = null; @@ -13,31 +18,26 @@ public final class NonExistentType { public static final NonExistentType INSTANCE = null; @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("getA()Lerror/NonExistentClass;") public final ABCDEF getA() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("getB()Ljava/util/List;") public final java.util.List getB() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getC()Lkotlin/jvm/functions/Function1;") public final Function1 getC() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("getD()Lerror/NonExistentClass;") public final ABCDEF, kotlin.Unit>> getD() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("a(Lerror/NonExistentClass;Ljava/lang/String;)Lerror/NonExistentClass;") public final ABCDEF a(@org.jetbrains.annotations.NotNull() ABCDEF a, @org.jetbrains.annotations.NotNull() java.lang.String s) { @@ -45,13 +45,11 @@ public final class NonExistentType { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("b(Ljava/lang/String;)Lerror/NonExistentClass;") public final ABCDEF b(@org.jetbrains.annotations.NotNull() java.lang.String s) { return null; } - @kapt.internal.KaptSignature("()V") private NonExistentType() { super(); } @@ -63,21 +61,3 @@ package error; 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(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt index b87d4d086b7..fc4836e3f25 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt @@ -1,35 +1,35 @@ +/** + * @KaptMetadata + */ + import java.util.Calendar; import kotlin.reflect.KClass; @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno { - @kapt.internal.KaptSignature("a()Ljava/lang/Class;") public abstract java.lang.Class a(); - @kapt.internal.KaptSignature("b()[Ljava/lang/Class;") public abstract java.lang.Class[] b(); - @kapt.internal.KaptSignature("c()[Ljava/lang/Class;") public abstract java.lang.Class[] c(); - @kapt.internal.KaptSignature("d()[Ljava/lang/Class;") public abstract java.lang.Class[] d(); } //////////////////// +/** + * @KaptMetadata + */ import java.util.Calendar; import kotlin.reflect.KClass; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class MyType { - @kapt.internal.KaptSignature("()V") public MyType() { super(); } @@ -37,25 +37,29 @@ public final class MyType { //////////////////// +/** + * @KaptMetadata + */ import java.util.Calendar; import kotlin.reflect.KClass; @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE", "ANNOTATION_PARAMETER_MUST_BE_CONST", "NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION", "UNSUPPORTED_FEATURE"}) @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class NonExistentClassTypesConversionKt { } //////////////////// +/** + * @KaptMetadata + */ import java.util.Calendar; import kotlin.reflect.KClass; @kotlin.Metadata() @Anno(a = Blah.class, b = {NoFoo1.class, NoBar1.class}, c = {NoFoo2.class, String.class}, d = {Boolean.class, NoBar3.class}) -@kapt.internal.KaptMetadata() public final class Test { @org.jetbrains.annotations.NotNull() public ABC a; @@ -105,265 +109,218 @@ public final class Test { public java.util.Calendar.Builder p; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getA()Lerror/NonExistentClass;") public final ABC getA() { return null; } - @kapt.internal.KaptSignature("setA(Lerror/NonExistentClass;)V") public final void setA(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("getB()Lerror/NonExistentClass;") public final ABC getB() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("getC()Ljava/util/List;") public final java.util.List getC() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("getD()Ljava/util/List;") public final java.util.List>>> getD() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getE()Ljava/util/List;") public final java.util.List> getE() { return null; } - @kapt.internal.KaptSignature("setE(Ljava/util/List;)V") public final void setE(@org.jetbrains.annotations.NotNull() java.util.List> p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getF()Lerror/NonExistentClass;") public final ABC getF() { return null; } - @kapt.internal.KaptSignature("setF(Lerror/NonExistentClass;)V") public final void setF(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getG()Ljava/util/List;") public final java.util.List getG() { return null; } - @kapt.internal.KaptSignature("setG(Ljava/util/List;)V") public final void setG(@org.jetbrains.annotations.NotNull() java.util.List p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getH()Lerror/NonExistentClass;") public final ABC getH() { return null; } - @kapt.internal.KaptSignature("setH(Lerror/NonExistentClass;)V") public final void setH(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getI()Lkotlin/jvm/functions/Function2;") public final Function2, CDE> getI() { return null; } - @kapt.internal.KaptSignature("setI(Lkotlin/jvm/functions/Function2;)V") public final void setI(@org.jetbrains.annotations.NotNull() Function2, CDE> p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getJ()Lkotlin/jvm/functions/Function0;") public final Function0 getJ() { return null; } - @kapt.internal.KaptSignature("setJ(Lkotlin/jvm/functions/Function0;)V") public final void setJ(@org.jetbrains.annotations.NotNull() Function0 p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getK()Lkotlin/jvm/functions/Function2;") public final Function2, CDE> getK() { return null; } - @kapt.internal.KaptSignature("setK(Lkotlin/jvm/functions/Function2;)V") public final void setK(@org.jetbrains.annotations.NotNull() Function2, CDE> p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getL()Lerror/NonExistentClass;") public final ABC.BCD.EFG getL() { return null; } - @kapt.internal.KaptSignature("setL(Lerror/NonExistentClass;)V") public final void setL(@org.jetbrains.annotations.NotNull() ABC.BCD.EFG p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo()Lerror/NonExistentClass;") public final ABC getCoocoo() { return null; } - @kapt.internal.KaptSignature("setCoocoo(Lerror/NonExistentClass;)V") public final void setCoocoo(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo2()Lerror/NonExistentClass;") public final ABC getCoocoo2() { return null; } - @kapt.internal.KaptSignature("setCoocoo2(Lerror/NonExistentClass;)V") public final void setCoocoo2(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo21()Lerror/NonExistentClass;") public final ABC getCoocoo21() { return null; } - @kapt.internal.KaptSignature("setCoocoo21(Lerror/NonExistentClass;)V") public final void setCoocoo21(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo3()Lerror/NonExistentClass;") public final ABC getCoocoo3() { return null; } - @kapt.internal.KaptSignature("setCoocoo3(Lerror/NonExistentClass;)V") public final void setCoocoo3(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo31()Lerror/NonExistentClass;") public final ABC> getCoocoo31() { return null; } - @kapt.internal.KaptSignature("setCoocoo31(Lerror/NonExistentClass;)V") public final void setCoocoo31(@org.jetbrains.annotations.NotNull() ABC> p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getNested()Lerror/NonExistentClass;") public final ABC getNested() { return null; } - @kapt.internal.KaptSignature("setNested(Lerror/NonExistentClass;)V") public final void setNested(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getM()Lerror/NonExistentClass;") public final java.lang.Object getM() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getN()Ljava/lang/String;") public final java.lang.String getN() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getO11()Ljava/util/List;") public final java.util.List>>>>>>>>> getO11() { return null; } - @kapt.internal.KaptSignature("setO11(Ljava/util/List;)V") public final void setO11(@org.jetbrains.annotations.NotNull() java.util.List>>>>>>>>> p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getO10()Ljava/util/List;") public final java.util.List>>>>>>>> getO10() { return null; } - @kapt.internal.KaptSignature("setO10(Ljava/util/List;)V") public final void setO10(@org.jetbrains.annotations.NotNull() java.util.List>>>>>>>> p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getP()Lerror/NonExistentClass;") public final java.util.Calendar.Builder getP() { return null; } - @kapt.internal.KaptSignature("setP(Lerror/NonExistentClass;)V") public final void setP(@org.jetbrains.annotations.NotNull() java.util.Calendar.Builder p0) { } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("f1(Lerror/NonExistentClass;)Lerror/NonExistentClass;") public final BCD f1(@org.jetbrains.annotations.NotNull() ABC a) { return null; } - @kapt.internal.KaptSignature("f2(Lerror/NonExistentClass;)V") public final void f2(@org.jetbrains.annotations.NotNull() ABC> a) { } - @kapt.internal.KaptSignature("f3(Lerror/NonExistentClass;I)J") public final long f3(@org.jetbrains.annotations.NotNull() ABC a, int b) { return 0L; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("f4()Lerror/NonExistentClass;") public final java.lang.Object f4() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("f5(LMyType;)Ljava/lang/Class;") public final java.lang.Class> f5(@org.jetbrains.annotations.NotNull() MyType $receiver) { return null; } - @kapt.internal.KaptSignature("()V") public Test() { super(); } @@ -375,21 +332,3 @@ package error; 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(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt index 3ae67634591..6a601877825 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt @@ -1,14 +1,23 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class NonExistentClassWIthoutCorrectionKt { } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class NonExistentType { @org.jetbrains.annotations.Nullable() private static final error.NonExistentClass a = null; @@ -33,97 +42,80 @@ public final class NonExistentType { public static final NonExistentType INSTANCE = null; @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("getA()Lerror/NonExistentClass;") public final error.NonExistentClass getA() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("getB()Ljava/util/List;") public final java.util.List getB() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getC()Lkotlin/jvm/functions/Function1;") public final kotlin.jvm.functions.Function1 getC() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature("getD()Lerror/NonExistentClass;") public final error.NonExistentClass getD() { return null; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getString2()Ljava/lang/String;") public final java.lang.String getString2() { return null; } - @kapt.internal.KaptSignature("setString2(Ljava/lang/String;)V") public final void setString2(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo()Lerror/NonExistentClass;") public final error.NonExistentClass getCoocoo() { return null; } - @kapt.internal.KaptSignature("setCoocoo(Lerror/NonExistentClass;)V") public final void setCoocoo(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo2()Lerror/NonExistentClass;") public final error.NonExistentClass getCoocoo2() { return null; } - @kapt.internal.KaptSignature("setCoocoo2(Lerror/NonExistentClass;)V") public final void setCoocoo2(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo21()Lerror/NonExistentClass;") public final error.NonExistentClass getCoocoo21() { return null; } - @kapt.internal.KaptSignature("setCoocoo21(Lerror/NonExistentClass;)V") public final void setCoocoo21(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo3()Lerror/NonExistentClass;") public final error.NonExistentClass getCoocoo3() { return null; } - @kapt.internal.KaptSignature("setCoocoo3(Lerror/NonExistentClass;)V") public final void setCoocoo3(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("getCoocoo31()Lerror/NonExistentClass;") public final error.NonExistentClass getCoocoo31() { return null; } - @kapt.internal.KaptSignature("setCoocoo31(Lerror/NonExistentClass;)V") public final void setCoocoo31(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("a(Lerror/NonExistentClass;Ljava/lang/String;)Lerror/NonExistentClass;") public final error.NonExistentClass a(@org.jetbrains.annotations.NotNull() error.NonExistentClass a, @org.jetbrains.annotations.NotNull() java.lang.String s) { @@ -131,13 +123,11 @@ public final class NonExistentType { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature("b(Ljava/lang/String;)Lerror/NonExistentClass;") public final error.NonExistentClass b(@org.jetbrains.annotations.NotNull() java.lang.String s) { return null; } - @kapt.internal.KaptSignature("()V") private NonExistentType() { super(); } @@ -149,21 +139,3 @@ package error; 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(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt index d609aca40c1..fe1b7c4b5a9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt @@ -1,5 +1,10 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class PrimitiveTypes { public static final boolean booleanFalse = false; public static final boolean booleanTrue = true; @@ -37,66 +42,39 @@ public final class PrimitiveTypes { public static final java.lang.String stringRN = "\r\n"; public static final PrimitiveTypes INSTANCE = null; - @kapt.internal.KaptSignature(value = "getFloatMaxValue()F") public final float getFloatMaxValue() { return 0.0F; } - @kapt.internal.KaptSignature(value = "getFloatNan()F") public final float getFloatNan() { return 0.0F; } - @kapt.internal.KaptSignature(value = "getFloatPositiveInfinity()F") public final float getFloatPositiveInfinity() { return 0.0F; } - @kapt.internal.KaptSignature(value = "getFloatNegativeInfinity()F") public final float getFloatNegativeInfinity() { return 0.0F; } - @kapt.internal.KaptSignature(value = "getDoubleMaxValue()D") public final double getDoubleMaxValue() { return 0.0; } - @kapt.internal.KaptSignature(value = "getDoubleNan()D") public final double getDoubleNan() { return 0.0; } - @kapt.internal.KaptSignature(value = "getDoublePositiveInfinity()D") public final double getDoublePositiveInfinity() { return 0.0; } - @kapt.internal.KaptSignature(value = "getDoubleNegativeInfinity()D") public final double getDoubleNegativeInfinity() { return 0.0; } - @kapt.internal.KaptSignature(value = "()V") private PrimitiveTypes() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt index 4da66f07e32..5c76506e0b6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt @@ -1,61 +1,53 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno { } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.CLASS}) -@kapt.internal.KaptMetadata() public abstract @interface Anno2 { } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { @org.jetbrains.annotations.NotNull() private final java.lang.String prop = "A"; @Anno2() @Anno() - @kapt.internal.KaptSignature(value = "prop$annotations()V") public static void prop$annotations() { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getProp()Ljava/lang/String;") public final java.lang.String getProp() { return null; } - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt b/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt index a2f1381c32c..6374d96800b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt @@ -1,49 +1,37 @@ -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class AKt { public AKt() { super(); } - @kapt.internal.KaptSignature(value = "foo()V") public static final void foo() { } } //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class BKt { public BKt() { super(); } - @kapt.internal.KaptSignature(value = "bar()V") public static final void bar() { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt index b2e5385ba26..214a4e737b8 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt @@ -1,32 +1,37 @@ +/** + * @KaptMetadata + */ + +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno { - @kapt.internal.KaptSignature(value = "size()LStrangeEnum;") public abstract StrangeEnum size(); - @kapt.internal.KaptSignature(value = "name()Ljava/lang/String;") public abstract java.lang.String name(); } //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public enum StrangeEnum { /*public static final*/ InvalidFieldName /* = new StrangeEnum() */; @org.jetbrains.annotations.NotNull() private final java.lang.String size = null; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getSize()Ljava/lang/String;") public final java.lang.String getSize() { return null; } - @kapt.internal.KaptSignature(value = "(Ljava/lang/String;ILjava/lang/String;)V") StrangeEnum(@org.jetbrains.annotations.NotNull() java.lang.String size) { } @@ -34,56 +39,37 @@ public enum StrangeEnum { //////////////////// +/** + * @KaptMetadata + */ + +import java.lang.System; @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class Test { @org.jetbrains.annotations.NotNull() public java.lang.String simpleName; @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getSimpleName()Ljava/lang/String;") public final java.lang.String getSimpleName() { return null; } - @kapt.internal.KaptSignature(value = "simpleFun()V") public final void simpleFun() { } @Anno(name = "Woofwoof", size = StrangeEnum.InvalidFieldName) - @kapt.internal.KaptSignature(value = "simpleFun2(Ljava/lang/String;Ljava/lang/String;)V") public final void simpleFun2(@org.jetbrains.annotations.NotNull() java.lang.String a, @org.jetbrains.annotations.NotNull() java.lang.String b) { } - @kapt.internal.KaptSignature(value = "strangeFun4(Ljava/lang/String;Ljava/lang/String;)V") public final void strangeFun4(@org.jetbrains.annotations.NotNull() java.lang.String a, @org.jetbrains.annotations.NotNull() java.lang.String p1_949560896) { } - @kapt.internal.KaptSignature(value = "()V") public Test() { super(); } } - -//////////////////// - -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeNames.txt index cb11bb99b4c..8b137891791 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeNames.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeNames.txt @@ -1,15 +1 @@ -package kapt.internal; -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt index 5b33c16ac15..30928998c97 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt @@ -1,38 +1,27 @@ -package kapt.internal; - -public @interface KaptMetadata { - - public java.lang.String value(); -} - -//////////////////// - -package kapt.internal; - -public @interface KaptSignature { - - public java.lang.String value(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test.another; +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface Anno { - @kapt.internal.KaptSignature(value = "value()Ljava/lang/String;") public abstract java.lang.String value(); } //////////////////// +/** + * @KaptMetadata + */ package test.another; +import java.lang.System; + @kotlin.Metadata() -@kapt.internal.KaptMetadata() public final class TopLevelKt { public TopLevelKt() { @@ -41,29 +30,24 @@ public final class TopLevelKt { private static final int topLevelProperty = 2; @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "topLevelFunction()Ljava/lang/String;") public static final java.lang.String topLevelFunction() { return null; } @org.jetbrains.annotations.Nullable() - @kapt.internal.KaptSignature(value = "topLevelGenericFunction()Ljava/util/List;") public static final >T topLevelGenericFunction() { return null; } - @kapt.internal.KaptSignature(value = "getTopLevelProperty()I") public static final int getTopLevelProperty() { return 0; } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getTopLevelProperty2()Ljava/lang/String;") public static final java.lang.String getTopLevelProperty2() { return null; } - @kapt.internal.KaptSignature(value = "extensionFunction(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V") public static final void extensionFunction(@org.jetbrains.annotations.NotNull() @Anno(value = "rec") java.lang.String $receiver, @org.jetbrains.annotations.NotNull() @@ -74,19 +58,16 @@ public final class TopLevelKt { } @Anno(value = "extpr") - @kapt.internal.KaptSignature(value = "extensionProperty$annotations(Ljava/lang/Object;)V") public static void extensionProperty$annotations(java.lang.Object p0) { } @org.jetbrains.annotations.NotNull() - @kapt.internal.KaptSignature(value = "getExtensionProperty(Ljava/lang/Object;)Ljava/lang/String;") public static final java.lang.String getExtensionProperty(@org.jetbrains.annotations.NotNull() @Anno(value = "propRec") T $receiver) { return null; } - @kapt.internal.KaptSignature(value = "setExtensionProperty(Ljava/lang/Object;Ljava/lang/String;)V") public static final void setExtensionProperty(@org.jetbrains.annotations.NotNull() @Anno(value = "propRec") T $receiver, @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt index e8f3c68a68c..c9c26984d42 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt @@ -1,51 +1,32 @@ -package error; - -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(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface MyAnnotation { } //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @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("()V") public Simple() { super(); } @@ -53,7 +34,6 @@ public final class Simple { @kotlin.Metadata() public static final class NestedClass { - @kapt.internal.KaptSignature("()V") public NestedClass() { super(); } @@ -61,7 +41,6 @@ public final class Simple { @kotlin.Metadata() public static final class NestedNestedClass { - @kapt.internal.KaptSignature("()V") public NestedNestedClass() { super(); } @@ -71,7 +50,6 @@ public final class Simple { @kotlin.Metadata() public final class InnerClass { - @kapt.internal.KaptSignature("(Ltest/Simple;)V") public InnerClass() { super(); } @@ -80,9 +58,15 @@ public final class Simple { @kotlin.Metadata() public static final class Companion { - @kapt.internal.KaptSignature("()V") private Companion() { super(); } } } + +//////////////////// + +package error; + +public final class NonExistentClass { +} diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt index 34d98c5176e..8e835c28001 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt @@ -1,73 +1,58 @@ -package error; - -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(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @kotlin.Metadata() @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() public abstract @interface MyAnnotation { } //////////////////// +/** + * @KaptMetadata + */ package test; +import java.lang.System; + @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("(IJLjava/lang/String;)V") public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull() java.lang.String someString) { super(); } - @kapt.internal.KaptSignature("(IJ)V") public State(int someInt, long someLong) { super(); } } + +//////////////////// + +package error; + +public final class NonExistentClass { +} diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt index d5287da7d2c..f99ee55f340 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt @@ -1,49 +1,57 @@ -package error; - -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(); -} - -//////////////////// - +/** + * @KaptMetadata + */ package test; +import java.lang.System; + +@kotlin.Metadata() +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +public abstract @interface MyAnnotation { +} + +//////////////////// + +/** + * @KaptMetadata + */ +package test; + +import java.lang.System; + +@kotlin.Metadata() +public enum EnumClass { + /*public static final*/ BLACK /* = new BLACK() */, + /*public static final*/ WHITE /* = new WHITE() */; + + EnumClass() { + } +} + +//////////////////// + +/** + * @KaptMetadata + */ +package test; + +import java.lang.System; + /** * * KDoc comment. */ @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("()V") public Simple() { super(); } @@ -51,42 +59,27 @@ public final class Simple { //////////////////// +/** + * @KaptMetadata + */ 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("(Ljava/lang/String;I)V") - EnumClass() { - } -} - -//////////////////// - -package test; +import java.lang.System; @kotlin.Metadata() -@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@kapt.internal.KaptMetadata() -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("(Ljava/lang/String;ILjava/lang/String;)V") EnumClass2(@org.jetbrains.annotations.NotNull() java.lang.String blah) { } } + +//////////////////// + +package error; + +public final class NonExistentClass { +}