diff --git a/plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotatedGettersSetters.kt b/plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotatedGettersSetters.kt index f84016a152a..e4b499b767c 100644 --- a/plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotatedGettersSetters.kt +++ b/plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotatedGettersSetters.kt @@ -1,14 +1,12 @@ package org.test -import javax.inject.* - -public class SomeClass { +public data class SomeClass { public val immutableProperty: Int = 5 - [Inject] get + [Deprecated] get public var mutableProperty: String = "String" - [Inject] get - [Inject] set + [Deprecated] get + [Deprecated] set } \ No newline at end of file diff --git a/plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotations.txt b/plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotations.txt index 43ae939e695..726d49dd5f9 100644 --- a/plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotations.txt @@ -1,8 +1,11 @@ -a javax.inject.Inject 0 +a kotlin.data 0 p org.test 0 -m 0 0/SomeClass getImmutableProperty -a org.jetbrains.annotations.NotNull 1 -f 1 0/SomeClass mutableProperty -m 0 0/SomeClass getMutableProperty +c 0 0/SomeClass +a java.lang.Deprecated 1 +m 1 0/SomeClass getImmutableProperty +a org.jetbrains.annotations.NotNull 2 +f 2 0/SomeClass mutableProperty m 1 0/SomeClass getMutableProperty -m 0 0/SomeClass setMutableProperty +m 2 0/SomeClass getMutableProperty +m 1 0/SomeClass setMutableProperty +m 2 0/SomeClass copy diff --git a/plugins/annotation-collector/testData/collectToFile/annotationInSameFile/annotationInSameFile.kt b/plugins/annotation-collector/testData/collectToFile/annotationInSameFile/annotationInSameFile.kt index 2726a0a38fd..6d4608fa2ac 100644 --- a/plugins/annotation-collector/testData/collectToFile/annotationInSameFile/annotationInSameFile.kt +++ b/plugins/annotation-collector/testData/collectToFile/annotationInSameFile/annotationInSameFile.kt @@ -2,11 +2,9 @@ package org.test public annotation class SomeAnnotation -SomeAnnotation -public class SomeClass { +SomeAnnotation public class SomeClass { - SomeAnnotation - public fun annotatedFunction() { + SomeAnnotation public fun annotatedFunction() { } diff --git a/plugins/annotation-collector/testData/collectToFile/anonymousClasses/annotations.txt b/plugins/annotation-collector/testData/collectToFile/anonymousClasses/annotations.txt index 6aa23adc539..c5234bbf612 100644 --- a/plugins/annotation-collector/testData/collectToFile/anonymousClasses/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/anonymousClasses/annotations.txt @@ -1,3 +1,3 @@ -a javax.inject.Inject 0 +a java.lang.Deprecated 0 p org.test 0 f 0 0/SomeClass$a$1 property diff --git a/plugins/annotation-collector/testData/collectToFile/anonymousClasses/anonymousClasses.kt b/plugins/annotation-collector/testData/collectToFile/anonymousClasses/anonymousClasses.kt index 5fe2f907e9e..0024e704151 100644 --- a/plugins/annotation-collector/testData/collectToFile/anonymousClasses/anonymousClasses.kt +++ b/plugins/annotation-collector/testData/collectToFile/anonymousClasses/anonymousClasses.kt @@ -1,12 +1,10 @@ package org.test -import javax.inject.* - public class SomeClass { private fun a() { object : Any() { - [Inject] + [Deprecated] val property: Int = 5 } diff --git a/plugins/annotation-collector/testData/collectToFile/classAnnotations/annotations.txt b/plugins/annotation-collector/testData/collectToFile/classAnnotations/annotations.txt index 835d0f6a322..e0babb51f7f 100644 --- a/plugins/annotation-collector/testData/collectToFile/classAnnotations/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/classAnnotations/annotations.txt @@ -1,4 +1,4 @@ -a javax.inject.Named 0 +a java.lang.Deprecated 0 p org.test 0 c 0 0/SomeClass c 0 0/SomeObject diff --git a/plugins/annotation-collector/testData/collectToFile/classAnnotations/classAnnotations.kt b/plugins/annotation-collector/testData/collectToFile/classAnnotations/classAnnotations.kt index 0c2a12e733b..65563f893df 100644 --- a/plugins/annotation-collector/testData/collectToFile/classAnnotations/classAnnotations.kt +++ b/plugins/annotation-collector/testData/collectToFile/classAnnotations/classAnnotations.kt @@ -1,9 +1,5 @@ package org.test -import javax.inject.* +Deprecated public class SomeClass -Named("KotlinClass") -public class SomeClass - -Named("KotlinObject") -public object SomeObject \ No newline at end of file +Deprecated public object SomeObject \ No newline at end of file diff --git a/plugins/annotation-collector/testData/collectToFile/defaultPackage/annotations.txt b/plugins/annotation-collector/testData/collectToFile/defaultPackage/annotations.txt index 12a11beb164..0acc5c332d0 100644 --- a/plugins/annotation-collector/testData/collectToFile/defaultPackage/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/defaultPackage/annotations.txt @@ -1,8 +1,12 @@ -a javax.inject.Named 0 +a kotlin.data 0 c 0 SomeClass -a javax.inject.Inject 1 +a java.lang.Deprecated 1 f 1 SomeClass annotatedProperty a org.jetbrains.annotations.Nullable 2 f 2 SomeClass annotatedProperty m 2 SomeClass getAnnotatedProperty m 1 SomeClass annotatedFunction +a kotlin.inline 3 +m 3 SomeClass annotatedFunction +a org.jetbrains.annotations.NotNull 4 +m 4 SomeClass copy diff --git a/plugins/annotation-collector/testData/collectToFile/defaultPackage/defaultPackage.kt b/plugins/annotation-collector/testData/collectToFile/defaultPackage/defaultPackage.kt index 6d25f77da96..5623a97f744 100644 --- a/plugins/annotation-collector/testData/collectToFile/defaultPackage/defaultPackage.kt +++ b/plugins/annotation-collector/testData/collectToFile/defaultPackage/defaultPackage.kt @@ -1,13 +1,8 @@ -import javax.inject.* +data public class SomeClass { -Named("KotlinClass") -public class SomeClass { + [Deprecated] public var annotatedProperty: String? = null - Inject - public var annotatedProperty: String? = null - - Inject - public fun annotatedFunction() { + Deprecated public inline fun annotatedFunction() { } diff --git a/plugins/annotation-collector/testData/collectToFile/fieldAnnotations/annotations.txt b/plugins/annotation-collector/testData/collectToFile/fieldAnnotations/annotations.txt index 93072144e40..f195fb9f68f 100644 --- a/plugins/annotation-collector/testData/collectToFile/fieldAnnotations/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/fieldAnnotations/annotations.txt @@ -1,4 +1,4 @@ -a javax.inject.Inject 0 +a java.lang.Deprecated 0 p org.test 0 f 0 0/SomeClass annotatedVal a org.jetbrains.annotations.Nullable 1 diff --git a/plugins/annotation-collector/testData/collectToFile/fieldAnnotations/fieldAnnotations.kt b/plugins/annotation-collector/testData/collectToFile/fieldAnnotations/fieldAnnotations.kt index a6782f1c414..60d2001a8ff 100644 --- a/plugins/annotation-collector/testData/collectToFile/fieldAnnotations/fieldAnnotations.kt +++ b/plugins/annotation-collector/testData/collectToFile/fieldAnnotations/fieldAnnotations.kt @@ -1,13 +1,11 @@ package org.test -import javax.inject.* - public class SomeClass { - Inject + Deprecated public val annotatedVal: String? = null - Inject + Deprecated public var annotatedVar: Int = 5 } \ No newline at end of file diff --git a/plugins/annotation-collector/testData/collectToFile/localClasses/annotations.txt b/plugins/annotation-collector/testData/collectToFile/localClasses/annotations.txt index 52bd9d146cb..68e69348eee 100644 --- a/plugins/annotation-collector/testData/collectToFile/localClasses/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/localClasses/annotations.txt @@ -1,9 +1,9 @@ -a javax.inject.Named 0 +a java.lang.Deprecated 0 p org.test 0 c 0 0/SomeClass$someFunction$LocalClass -a javax.inject.Inject 1 +f 0 0/SomeClass$someFunction$LocalClass annotatedProperty +a org.jetbrains.annotations.Nullable 1 f 1 0/SomeClass$someFunction$LocalClass annotatedProperty -a org.jetbrains.annotations.Nullable 2 -f 2 0/SomeClass$someFunction$LocalClass annotatedProperty -m 2 0/SomeClass$someFunction$LocalClass getAnnotatedProperty -m 1 0/SomeClass$someFunction$LocalClass annotatedFunction +m 1 0/SomeClass$someFunction$LocalClass getAnnotatedProperty +a kotlin.inline 2 +m 2 0/SomeClass$someFunction$LocalClass annotatedFunction diff --git a/plugins/annotation-collector/testData/collectToFile/localClasses/localClasses.kt b/plugins/annotation-collector/testData/collectToFile/localClasses/localClasses.kt index 9799946357b..e3a234b2222 100644 --- a/plugins/annotation-collector/testData/collectToFile/localClasses/localClasses.kt +++ b/plugins/annotation-collector/testData/collectToFile/localClasses/localClasses.kt @@ -1,18 +1,13 @@ package org.test -import javax.inject.* - public class SomeClass { public fun someFunction() { - [Named("LocalKotlinClass")] - class LocalClass { + [Deprecated] class LocalClass { - [Inject] - public var annotatedProperty: String? = null + public Deprecated var annotatedProperty: String? = null - [Inject] - public fun annotatedFunction() { + public inline fun annotatedFunction() { } diff --git a/plugins/annotation-collector/testData/collectToFile/methodAnnotations/annotations.txt b/plugins/annotation-collector/testData/collectToFile/methodAnnotations/annotations.txt index 0df56be2835..293673eb739 100644 --- a/plugins/annotation-collector/testData/collectToFile/methodAnnotations/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/methodAnnotations/annotations.txt @@ -1,5 +1,3 @@ -a javax.inject.Inject 0 +a java.lang.Deprecated 0 p org.test 0 -m 0 0/SomeClass annotatedFunction -a javax.inject.Named 1 -m 1 0/SomeClass$annotatedFunction$1 invoke +m 0 0/SomeClass$annotatedFunction$1 invoke diff --git a/plugins/annotation-collector/testData/collectToFile/methodAnnotations/methodAnnotations.kt b/plugins/annotation-collector/testData/collectToFile/methodAnnotations/methodAnnotations.kt index 899f22e0737..bf2f599b98d 100644 --- a/plugins/annotation-collector/testData/collectToFile/methodAnnotations/methodAnnotations.kt +++ b/plugins/annotation-collector/testData/collectToFile/methodAnnotations/methodAnnotations.kt @@ -1,14 +1,10 @@ package org.test -import javax.inject.* - public class SomeClass { - Inject public fun annotatedFunction() { - [Named("LocalFunction")] - fun localFunction() { + [Deprecated] fun localFunction() { } diff --git a/plugins/annotation-collector/testData/collectToFile/nestedClasses/annotations.txt b/plugins/annotation-collector/testData/collectToFile/nestedClasses/annotations.txt index 1758a1f6214..746edbfad6a 100644 --- a/plugins/annotation-collector/testData/collectToFile/nestedClasses/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/nestedClasses/annotations.txt @@ -1,4 +1,4 @@ -a javax.inject.Named 0 +a java.lang.Deprecated 0 p org.test 0 c 0 0/SomeClass$Companion a org.jetbrains.annotations.NotNull 1 @@ -7,5 +7,4 @@ c 0 0/SomeClass$SomeInnerObject c 0 0/SomeClass$InnerClass c 0 0/SomeClass$InnerClass$InnerClassInInnerClass c 0 0/SomeClass$NestedClass -a java.lang.Deprecated 2 -f 2 0/SomeClass OBJECT$ +f 0 0/SomeClass OBJECT$ diff --git a/plugins/annotation-collector/testData/collectToFile/nestedClasses/nestedClasses.kt b/plugins/annotation-collector/testData/collectToFile/nestedClasses/nestedClasses.kt index 7c4178b08fb..5ca92dac275 100644 --- a/plugins/annotation-collector/testData/collectToFile/nestedClasses/nestedClasses.kt +++ b/plugins/annotation-collector/testData/collectToFile/nestedClasses/nestedClasses.kt @@ -1,30 +1,28 @@ package org.test -import javax.inject.* - public class SomeClass { - Named("CompanionObject") + Deprecated companion object { } - Named("KotlinInnerObject") + Deprecated object SomeInnerObject { } - Named("InnerClass") + Deprecated inner class InnerClass { - Named("InnerClassInInnerClass") + Deprecated inner class InnerClassInInnerClass { } } - Named("NestedClass") + Deprecated class NestedClass { } diff --git a/plugins/annotation-collector/testData/collectToFile/platformStatic/annotations.txt b/plugins/annotation-collector/testData/collectToFile/platformStatic/annotations.txt index f5dd0bca7a0..4d9c66f1134 100644 --- a/plugins/annotation-collector/testData/collectToFile/platformStatic/annotations.txt +++ b/plugins/annotation-collector/testData/collectToFile/platformStatic/annotations.txt @@ -1,7 +1,7 @@ a kotlin.platform.platformStatic 0 p org.test 0 m 0 0/SomeClass$Companion a -a javax.inject.Inject 1 +a kotlin.inline 1 m 1 0/SomeClass$Companion a a org.jetbrains.annotations.NotNull 2 m 2 0/SomeClass$Companion access$init$0 diff --git a/plugins/annotation-collector/testData/collectToFile/platformStatic/platformStatic.kt b/plugins/annotation-collector/testData/collectToFile/platformStatic/platformStatic.kt index bb55b63e23c..a891af9ec55 100644 --- a/plugins/annotation-collector/testData/collectToFile/platformStatic/platformStatic.kt +++ b/plugins/annotation-collector/testData/collectToFile/platformStatic/platformStatic.kt @@ -1,12 +1,11 @@ package org.test -import javax.inject.* import kotlin.platform.platformStatic public class SomeClass { companion object { - platformStatic Inject fun a() { + platformStatic inline fun a() { } }