From 2e31f95554971a0f1913bdb08de159ed73a71425 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 20 Jul 2020 12:57:03 +0300 Subject: [PATCH] Update testData --- ...DataClassWithCustomImplementedMembers.java | 3 ++ .../AnnotationModifiers.java | 1 + .../nullabilityAnnotations/Class.java | 4 ++ .../ClassObjectField.java | 1 + .../ClassWithConstructorAndProperties.java | 2 + .../nullabilityAnnotations/FileFacade.java | 4 ++ .../lightClasses/object/SimpleObject.java | 1 + .../bridges/lambdaWithLongReceiver.txt | 2 +- .../bridges/lambdaWithLongReceiver_1_2.txt | 2 +- .../bridges/lambdaWithLongReceiver_ir.txt | 2 +- .../bridges/lambdaWithMultipleParameters.txt | 12 ++--- .../lambdaWithMultipleParameters_1_2.txt | 12 ++--- .../tailCallOptimizations/unit/override5.txt | 2 +- .../unit/override5_ir.txt | 2 +- .../bytecodeListing/annotations/kt27895.txt | 2 +- .../localClassWithCapturedParams.txt | 2 +- .../annotations/onProperties.txt | 2 +- .../bytecodeListing/callableNameIntrinsic.txt | 2 +- .../coroutines/coroutineFields.txt | 2 +- .../coroutines/coroutineFields_1_3.txt | 2 +- .../coroutines/coroutineFields_ir.txt | 2 +- .../coroutines/spilling/component1.txt | 2 +- .../coroutines/spilling/destructured.txt | 6 +-- .../coroutines/spilling/field.txt | 2 +- .../coroutines/spilling/lambda.txt | 46 +++++++++---------- .../coroutines/spilling/select.txt | 2 +- .../coroutines/spilling/unreachable.txt | 2 +- .../testData/codegen/bytecodeListing/enum.txt | 2 +- .../inlineClasses/nullabilityInExpansion.txt | 24 +++++----- .../bytecodeListing/main/multifileSuspend.txt | 2 +- .../main/multifileSuspend_ir.txt | 2 +- .../bytecodeListing/main/suspendMain.txt | 2 +- .../bytecodeListing/main/suspendMain_ir.txt | 2 +- .../noReceiverInCallableReferenceClasses.txt | 8 ++-- .../bytecodeListing/privateDefaultSetter.txt | 6 +-- compiler/testData/codegen/kapt/dataClass.txt | 2 +- compiler/testData/codegen/kapt/errorTypes.txt | 2 +- .../testData/codegen/kapt/innerClasses.txt | 4 +- .../bytecodeListing/allOpenOnNotClasses.txt | 2 +- .../testData/bytecodeListing/alreadyOpen.txt | 4 +- .../bytecodeListing/anonymousObject.txt | 2 +- .../bytecodeListing/explicitFinal.txt | 6 +-- .../testData/bytecodeListing/noAllOpen.txt | 2 +- .../bytecodeListing/privateMembers.txt | 6 +-- .../bytecodeListing/severalAllOpen.txt | 4 +- .../testData/bytecodeListing/simple.txt | 2 +- .../bytecodeListing/superClassAnnotation.txt | 2 +- .../testData/converter/abstractEnum.txt | 2 + .../testData/converter/annotations.txt | 1 + .../testData/converter/annotations2.txt | 1 + .../converter/annotationsWithTargets.txt | 2 + .../testData/converter/comments.txt | 3 ++ .../testData/converter/dataClass.txt | 2 + .../converter/defaultParameterValueOff.txt | 9 ++++ .../converter/defaultParameterValueOn.txt | 9 ++++ .../testData/converter/enums.txt | 1 + .../converter/errorLocationMapping.txt | 3 ++ .../errorSuperclassCorrectErrorTypes.txt | 2 + .../testData/converter/genericParameters.txt | 1 + .../testData/converter/genericSimple.txt | 1 + .../testData/converter/ignoredMembers.txt | 1 + .../converter/implicitReturnTypes.txt | 4 ++ .../testData/converter/inlineClasses.txt | 1 + .../converter/interfaceImplementation.txt | 1 + .../testData/converter/javadoc.txt | 4 ++ .../testData/converter/jvmOverloads.txt | 1 + .../converter/jvmStaticFieldInParent.txt | 1 + .../testData/converter/kt14998.txt | 4 ++ .../testData/converter/kt18791.txt | 1 + .../testData/converter/kt24272.txt | 3 ++ .../testData/converter/modifiers.txt | 2 + .../testData/converter/nestedClasses.txt | 1 + .../testData/converter/nestedClasses2.txt | 1 + .../converter/nestedClassesNonRootPackage.txt | 1 + .../testData/converter/nonExistentClass.txt | 4 ++ .../nonExistentClassTypesConversion.txt | 5 ++ .../nonExistentClassWIthoutCorrection.txt | 4 ++ .../converter/propertyAnnotations.txt | 1 + .../testData/converter/recentlyNullable.txt | 1 + .../converter/repeatableAnnotations.txt | 1 + .../converter/secondaryConstructor.txt | 1 + .../testData/converter/strangeIdentifiers.txt | 1 + .../converter/unsafePropertyInitializers.txt | 19 ++++++++ .../DefaultParameterValues.it.txt | 1 + .../testData/kotlinRunner/Overloads.it.txt | 1 + .../bytecodeListing/annoOnNotClass.txt | 2 +- 86 files changed, 216 insertions(+), 98 deletions(-) diff --git a/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java b/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java index 3ee9e702264..a5a92b58574 100644 --- a/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java +++ b/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java @@ -2,6 +2,7 @@ public final class Wrapper { public Wrapper() { /* compiled code */ } public static final class Equals { + @org.jetbrains.annotations.NotNull private final p.G code; public boolean equals(@org.jetbrains.annotations.Nullable java.lang.Object other) { /* compiled code */ } @@ -24,6 +25,7 @@ public final class Wrapper { } public static final class HashCode { + @org.jetbrains.annotations.NotNull private final p.G code; public int hashCode() { /* compiled code */ } @@ -46,6 +48,7 @@ public final class Wrapper { } public static final class ToString { + @org.jetbrains.annotations.NotNull private final p.G code; @org.jetbrains.annotations.NotNull diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java b/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java index 9bc19bdd1ad..6e5eb025bc7 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java +++ b/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java @@ -1,6 +1,7 @@ public final class A { @kotlin.jvm.Transient @kotlin.jvm.Volatile + @org.jetbrains.annotations.NotNull private transient volatile java.lang.String c; @kotlin.jvm.Synchronized diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java index 43b65106128..0ef75ff2caa 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java @@ -1,7 +1,11 @@ public final class Class { + @org.jetbrains.annotations.Nullable private final java.lang.String nullableVal; + @org.jetbrains.annotations.Nullable private java.lang.String nullableVar; + @org.jetbrains.annotations.NotNull private final java.lang.String notNullVal; + @org.jetbrains.annotations.NotNull private java.lang.String notNullVar; private final java.lang.String privateNN; private final java.lang.String privateN; diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java index 11241e7c7cf..d91f90240ab 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java @@ -1,4 +1,5 @@ public final class ClassObjectField { + @org.jetbrains.annotations.Nullable private static final java.lang.String x; private static final java.lang.String y; @org.jetbrains.annotations.NotNull diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java index 39844f560dd..753a9a6beb2 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java @@ -1,5 +1,7 @@ public final class ClassWithConstructorAndProperties { + @org.jetbrains.annotations.Nullable private final java.lang.String nullable; + @org.jetbrains.annotations.NotNull private final java.lang.String notNull; @org.jetbrains.annotations.Nullable diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java index 592f190a334..07a2a1ef988 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java @@ -1,7 +1,11 @@ public final class FileFacadeKt { + @org.jetbrains.annotations.Nullable private static final java.lang.String nullableVal; + @org.jetbrains.annotations.Nullable private static java.lang.String nullableVar; + @org.jetbrains.annotations.NotNull private static final java.lang.String notNullVal; + @org.jetbrains.annotations.NotNull private static java.lang.String notNullVar; private static final java.lang.String privateNn; private static final java.lang.String privateN; diff --git a/compiler/testData/asJava/lightClasses/object/SimpleObject.java b/compiler/testData/asJava/lightClasses/object/SimpleObject.java index 62f4aae04d7..b44dd9e142e 100644 --- a/compiler/testData/asJava/lightClasses/object/SimpleObject.java +++ b/compiler/testData/asJava/lightClasses/object/SimpleObject.java @@ -1,5 +1,6 @@ public final class A { private static final int c; + @org.jetbrains.annotations.NotNull private static java.lang.String v; public static final int cc = 1; @org.jetbrains.annotations.NotNull diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.txt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.txt index 5490443e421..46cec7ac4f2 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.txt +++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.txt @@ -2,7 +2,7 @@ @kotlin.Metadata final class LambdaWithLongReceiverKt$box$1$1 { field label: int - private field p$: long + private synthetic field p$: long inner (anonymous) class LambdaWithLongReceiverKt$box$1 inner (anonymous) class LambdaWithLongReceiverKt$box$1$1 method (p0: kotlin.coroutines.Continuation): void diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_1_2.txt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_1_2.txt index 89439e26742..f8acaf22ca9 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_1_2.txt +++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_1_2.txt @@ -1,6 +1,6 @@ @kotlin.Metadata final class LambdaWithLongReceiverKt$box$1$1 { - private field p$: long + private synthetic field p$: long inner (anonymous) class LambdaWithLongReceiverKt$box$1 inner (anonymous) class LambdaWithLongReceiverKt$box$1$1 method (p0: kotlin.coroutines.experimental.Continuation): void diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt index 5490443e421..46cec7ac4f2 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt +++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt @@ -2,7 +2,7 @@ @kotlin.Metadata final class LambdaWithLongReceiverKt$box$1$1 { field label: int - private field p$: long + private synthetic field p$: long inner (anonymous) class LambdaWithLongReceiverKt$box$1 inner (anonymous) class LambdaWithLongReceiverKt$box$1$1 method (p0: kotlin.coroutines.Continuation): void diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.txt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.txt index 574196d4841..4b3fdeaf256 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.txt +++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.txt @@ -2,12 +2,12 @@ @kotlin.Metadata final class LambdaWithMultipleParametersKt$box$1$1 { field label: int - private field p$0: java.lang.String - private field p$1: long - private field p$2: long - private field p$3: long - private field p$4: long - private field p$5: long + private synthetic field p$0: java.lang.String + private synthetic field p$1: long + private synthetic field p$2: long + private synthetic field p$3: long + private synthetic field p$4: long + private synthetic field p$5: long inner (anonymous) class LambdaWithMultipleParametersKt$box$1 inner (anonymous) class LambdaWithMultipleParametersKt$box$1$1 method (p0: kotlin.coroutines.Continuation): void diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_1_2.txt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_1_2.txt index df3e141fdfd..39da5652dc4 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_1_2.txt +++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_1_2.txt @@ -1,11 +1,11 @@ @kotlin.Metadata final class LambdaWithMultipleParametersKt$box$1$1 { - private field p$0: java.lang.String - private field p$1: long - private field p$2: long - private field p$3: long - private field p$4: long - private field p$5: long + private synthetic field p$0: java.lang.String + private synthetic field p$1: long + private synthetic field p$2: long + private synthetic field p$3: long + private synthetic field p$4: long + private synthetic field p$5: long inner (anonymous) class LambdaWithMultipleParametersKt$box$1 inner (anonymous) class LambdaWithMultipleParametersKt$box$1$1 method (p0: kotlin.coroutines.experimental.Continuation): void diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5.txt index abc9098619b..8d84a24b4fd 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5.txt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5.txt @@ -59,7 +59,7 @@ public final class Override5Kt$inlineMe$1 { @kotlin.Metadata public final class Override5Kt { - private static field c: kotlin.coroutines.Continuation + private static @org.jetbrains.annotations.Nullable field c: kotlin.coroutines.Continuation inner (anonymous) class Override5Kt$box$1 inner (anonymous) class Override5Kt$inlineMe$1 public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5_ir.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5_ir.txt index d5f4a906680..b452088e980 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5_ir.txt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override5_ir.txt @@ -59,7 +59,7 @@ public final class Override5Kt$inlineMe$1 { @kotlin.Metadata public final class Override5Kt { - private static field c: kotlin.coroutines.Continuation + private static @org.jetbrains.annotations.Nullable field c: kotlin.coroutines.Continuation inner (anonymous) class Override5Kt$box$1 inner (anonymous) class Override5Kt$inlineMe$1 static method (): void diff --git a/compiler/testData/codegen/bytecodeListing/annotations/kt27895.txt b/compiler/testData/codegen/bytecodeListing/annotations/kt27895.txt index 856a8d6bbda..51a7f63c10f 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/kt27895.txt +++ b/compiler/testData/codegen/bytecodeListing/annotations/kt27895.txt @@ -6,7 +6,7 @@ public annotation class Anno @kotlin.Metadata public final class C { - private final @Anno field json: java.lang.String + private final @Anno @org.jetbrains.annotations.NotNull field json: java.lang.String private final field x: int public method (p0: int): void public final method component1(): int diff --git a/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.txt b/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.txt index c3edfb04342..88c56416c8a 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.txt +++ b/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.txt @@ -2,7 +2,7 @@ public final class LocalClassWithCapturedParamsKt$localCaptured$A { synthetic final field $z: int private final field x: int - private final field z: java.lang.String + private final @org.jetbrains.annotations.NotNull field z: java.lang.String inner (local) class LocalClassWithCapturedParamsKt$localCaptured$A A public method (p0: int, @Simple @org.jetbrains.annotations.NotNull p1: java.lang.String): void public final method getX(): int diff --git a/compiler/testData/codegen/bytecodeListing/annotations/onProperties.txt b/compiler/testData/codegen/bytecodeListing/annotations/onProperties.txt index 0b23689f3a7..6c0a8159bad 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/onProperties.txt +++ b/compiler/testData/codegen/bytecodeListing/annotations/onProperties.txt @@ -2,7 +2,7 @@ public final class A { synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private @AnnField field p: int - private final @AnnDelegate field s$delegate: CustomDelegate + private final @AnnDelegate @org.jetbrains.annotations.NotNull field s$delegate: CustomDelegate private final @AnnField field x: int private field y: int static method (): void diff --git a/compiler/testData/codegen/bytecodeListing/callableNameIntrinsic.txt b/compiler/testData/codegen/bytecodeListing/callableNameIntrinsic.txt index 0a2281b3094..d2e9988c7f3 100644 --- a/compiler/testData/codegen/bytecodeListing/callableNameIntrinsic.txt +++ b/compiler/testData/codegen/bytecodeListing/callableNameIntrinsic.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private final field a: java.lang.String + private final @org.jetbrains.annotations.NotNull field a: java.lang.String public method (): void public final @org.jetbrains.annotations.NotNull method b(): java.lang.String public final @org.jetbrains.annotations.NotNull method getA(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt index 024e32fbda1..0408e4da377 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt @@ -42,7 +42,7 @@ final class CoroutineFieldsKt$box$1 { field L$0: java.lang.Object field L$1: java.lang.Object field L$2: java.lang.Object - private field p$: Controller + private synthetic field p$: Controller inner (anonymous) class CoroutineFieldsKt$box$1 method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_1_3.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_1_3.txt index 95f9d294e2f..e2452a4b1eb 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_1_3.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_1_3.txt @@ -42,7 +42,7 @@ final class CoroutineFieldsKt$box$1 { field L$1: java.lang.Object field L$2: java.lang.Object field label: int - private field p$: Controller + private synthetic field p$: Controller inner (anonymous) class CoroutineFieldsKt$box$1 method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt index 32fd326cad1..6dad69c4957 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt @@ -41,7 +41,7 @@ final class CoroutineFieldsKt$box$1 { field L$0: java.lang.Object field L$1: java.lang.Object field label: int - private field p$: Controller + private synthetic field p$: Controller inner (anonymous) class CoroutineFieldsKt$box$1 method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt index 65e27160498..2bb24bbd560 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt @@ -3,7 +3,7 @@ final class Component1Kt$test$1 { field L$0: java.lang.Object field label: int - private field p$: Foo + private synthetic field p$: Foo inner (anonymous) class Component1Kt$test$1 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/destructured.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/destructured.txt index 6d93164f7d2..d7685d2b4ea 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/destructured.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/destructured.txt @@ -13,7 +13,7 @@ final class DestructuredKt$test$1 { @kotlin.Metadata final class DestructuredKt$test$2 { field label: int - private field p$0: kotlin.Pair + private synthetic field p$0: kotlin.Pair inner (anonymous) class DestructuredKt$test$2 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -25,7 +25,7 @@ final class DestructuredKt$test$2 { @kotlin.Metadata final class DestructuredKt$test$3 { field label: int - private field p$0: kotlin.Pair + private synthetic field p$0: kotlin.Pair inner (anonymous) class DestructuredKt$test$3 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -37,7 +37,7 @@ final class DestructuredKt$test$3 { @kotlin.Metadata final class DestructuredKt$test$4 { field label: int - private field p$0: kotlin.Pair + private synthetic field p$0: kotlin.Pair inner (anonymous) class DestructuredKt$test$4 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt index e6e219249de..f33478c4fef 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt @@ -2,7 +2,7 @@ @kotlin.Metadata final class FieldKt$test$1 { field label: int - private field p$: Foo + private synthetic field p$: Foo inner (anonymous) class FieldKt$test$1 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/lambda.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/lambda.txt index 55626dc0c36..323db59ce78 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/lambda.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/lambda.txt @@ -2,8 +2,8 @@ @kotlin.Metadata final class LambdaKt$test$1 { field label: int - private field p$0: double - private field p$1: java.lang.String + private synthetic field p$0: double + private synthetic field p$1: java.lang.String inner (anonymous) class LambdaKt$test$1 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -15,8 +15,8 @@ final class LambdaKt$test$1 { @kotlin.Metadata final class LambdaKt$test$10 { field label: int - private field p$1: java.lang.String - private field p$: long + private synthetic field p$1: java.lang.String + private synthetic field p$: long inner (anonymous) class LambdaKt$test$10 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -28,7 +28,7 @@ final class LambdaKt$test$10 { @kotlin.Metadata final class LambdaKt$test$11 { field label: int - private field p$: long + private synthetic field p$: long inner (anonymous) class LambdaKt$test$11 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -51,8 +51,8 @@ final class LambdaKt$test$12 { @kotlin.Metadata final class LambdaKt$test$13 { field label: int - private field p$0: java.lang.String - private field p$: long + private synthetic field p$0: java.lang.String + private synthetic field p$: long inner (anonymous) class LambdaKt$test$13 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -64,7 +64,7 @@ final class LambdaKt$test$13 { @kotlin.Metadata final class LambdaKt$test$14 { field label: int - private field p$: long + private synthetic field p$: long inner (anonymous) class LambdaKt$test$14 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -76,7 +76,7 @@ final class LambdaKt$test$14 { @kotlin.Metadata final class LambdaKt$test$15 { field label: int - private field p$0: java.lang.String + private synthetic field p$0: java.lang.String inner (anonymous) class LambdaKt$test$15 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -99,7 +99,7 @@ final class LambdaKt$test$16 { @kotlin.Metadata final class LambdaKt$test$17 { field label: int - private field p$: long + private synthetic field p$: long inner (anonymous) class LambdaKt$test$17 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -111,7 +111,7 @@ final class LambdaKt$test$17 { @kotlin.Metadata final class LambdaKt$test$2 { field label: int - private field p$0: double + private synthetic field p$0: double inner (anonymous) class LambdaKt$test$2 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -123,7 +123,7 @@ final class LambdaKt$test$2 { @kotlin.Metadata final class LambdaKt$test$3 { field label: int - private field p$1: java.lang.String + private synthetic field p$1: java.lang.String inner (anonymous) class LambdaKt$test$3 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -135,7 +135,7 @@ final class LambdaKt$test$3 { @kotlin.Metadata final class LambdaKt$test$4 { field label: int - private field p$0: double + private synthetic field p$0: double inner (anonymous) class LambdaKt$test$4 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -147,7 +147,7 @@ final class LambdaKt$test$4 { @kotlin.Metadata final class LambdaKt$test$5 { field label: int - private field p$1: java.lang.String + private synthetic field p$1: java.lang.String inner (anonymous) class LambdaKt$test$5 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -159,9 +159,9 @@ final class LambdaKt$test$5 { @kotlin.Metadata final class LambdaKt$test$6 { field label: int - private field p$0: double - private field p$1: java.lang.String - private field p$: long + private synthetic field p$0: double + private synthetic field p$1: java.lang.String + private synthetic field p$: long inner (anonymous) class LambdaKt$test$6 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -173,8 +173,8 @@ final class LambdaKt$test$6 { @kotlin.Metadata final class LambdaKt$test$7 { field label: int - private field p$0: double - private field p$: long + private synthetic field p$0: double + private synthetic field p$: long inner (anonymous) class LambdaKt$test$7 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -186,8 +186,8 @@ final class LambdaKt$test$7 { @kotlin.Metadata final class LambdaKt$test$8 { field label: int - private field p$1: java.lang.String - private field p$: long + private synthetic field p$1: java.lang.String + private synthetic field p$: long inner (anonymous) class LambdaKt$test$8 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation @@ -199,8 +199,8 @@ final class LambdaKt$test$8 { @kotlin.Metadata final class LambdaKt$test$9 { field label: int - private field p$0: double - private field p$: long + private synthetic field p$0: double + private synthetic field p$: long inner (anonymous) class LambdaKt$test$9 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(p0: long, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.txt index 86cdf21238f..79f4e059e10 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.txt @@ -32,7 +32,7 @@ final class SelectKt$produceNumbers$1$1$1 { @kotlin.Metadata final class SelectKt$produceNumbers$1 { field label: int - private field p$: ProducerScope + private synthetic field p$: ProducerScope inner (anonymous) class SelectKt$produceNumbers$1 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/unreachable.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/unreachable.txt index 227e3929c3f..469b7dfc8af 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/unreachable.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/unreachable.txt @@ -2,7 +2,7 @@ @kotlin.Metadata final class UnreachableKt$test$1 { field label: int - private field p$0: java.lang.String + private synthetic field p$0: java.lang.String inner (anonymous) class UnreachableKt$test$1 method (p0: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation diff --git a/compiler/testData/codegen/bytecodeListing/enum.txt b/compiler/testData/codegen/bytecodeListing/enum.txt index bb8fadbfc6c..35b17ef43f1 100644 --- a/compiler/testData/codegen/bytecodeListing/enum.txt +++ b/compiler/testData/codegen/bytecodeListing/enum.txt @@ -31,7 +31,7 @@ public final enum class WithConstructor { public final enum static field A: WithConstructor public final enum static field B: WithConstructor public final enum static field C: WithConstructor - private final field x: java.lang.String + private final @org.jetbrains.annotations.NotNull field x: java.lang.String static method (): void private method (p0: java.lang.String, p1: int, p2: java.lang.String): void public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.txt index 5b4b5866caf..f8bcd64bb70 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.txt @@ -20,7 +20,7 @@ public final class NullabilityInExpansionKt { @kotlin.Metadata public final class Q1 { - private final field x: java.lang.Integer + private final @org.jetbrains.annotations.Nullable field x: java.lang.Integer private synthetic method (p0: java.lang.Integer): void public synthetic final static method box-impl(p0: java.lang.Integer): Q1 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: java.lang.Integer): java.lang.Integer @@ -37,7 +37,7 @@ public final class Q1 { @kotlin.Metadata public final class Q2 { - private final field z: java.lang.Integer + private final @org.jetbrains.annotations.NotNull field z: java.lang.Integer private synthetic method (p0: java.lang.Integer): void public synthetic final static method box-impl(p0: java.lang.Integer): Q2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.Integer): java.lang.Integer @@ -54,7 +54,7 @@ public final class Q2 { @kotlin.Metadata public final class QN { - private final field z: Q1 + private final @org.jetbrains.annotations.Nullable field z: Q1 private synthetic method (p0: Q1): void public synthetic final static method box-impl(p0: Q1): QN public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: Q1): Q1 @@ -71,7 +71,7 @@ public final class QN { @kotlin.Metadata public final class S1 { - private final field x: java.lang.String + private final @org.jetbrains.annotations.NotNull field x: java.lang.String private synthetic method (p0: java.lang.String): void public synthetic final static method box-impl(p0: java.lang.String): S1 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String @@ -88,7 +88,7 @@ public final class S1 { @kotlin.Metadata public final class S2 { - private final field z: java.lang.String + private final @org.jetbrains.annotations.NotNull field z: java.lang.String private synthetic method (p0: java.lang.String): void public synthetic final static method box-impl(p0: java.lang.String): S2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String @@ -105,7 +105,7 @@ public final class S2 { @kotlin.Metadata public final class SN { - private final field z: java.lang.String + private final @org.jetbrains.annotations.Nullable field z: java.lang.String private synthetic method (p0: java.lang.String): void public synthetic final static method box-impl(p0: java.lang.String): SN public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: java.lang.String): java.lang.String @@ -122,7 +122,7 @@ public final class SN { @kotlin.Metadata public final class SN2 { - private final field z: java.lang.String + private final @org.jetbrains.annotations.NotNull field z: java.lang.String private synthetic method (p0: java.lang.String): void public synthetic final static method box-impl(p0: java.lang.String): SN2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String @@ -139,7 +139,7 @@ public final class SN2 { @kotlin.Metadata public final class W1 { - private final field x: java.lang.String + private final @org.jetbrains.annotations.Nullable field x: java.lang.String private synthetic method (p0: java.lang.String): void public synthetic final static method box-impl(p0: java.lang.String): W1 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: java.lang.String): java.lang.String @@ -156,7 +156,7 @@ public final class W1 { @kotlin.Metadata public final class W2 { - private final field z: java.lang.String + private final @org.jetbrains.annotations.NotNull field z: java.lang.String private synthetic method (p0: java.lang.String): void public synthetic final static method box-impl(p0: java.lang.String): W2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String @@ -173,7 +173,7 @@ public final class W2 { @kotlin.Metadata public final class WN { - private final field z: W1 + private final @org.jetbrains.annotations.Nullable field z: W1 private synthetic method (p0: W1): void public synthetic final static method box-impl(p0: W1): WN public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: W1): W1 @@ -224,7 +224,7 @@ public final class Z2 { @kotlin.Metadata public final class ZN { - private final field z: Z1 + private final @org.jetbrains.annotations.Nullable field z: Z1 private synthetic method (p0: Z1): void public synthetic final static method box-impl(p0: Z1): ZN public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: Z1): Z1 @@ -241,7 +241,7 @@ public final class ZN { @kotlin.Metadata public final class ZN2 { - private final field z: Z1 + private final @org.jetbrains.annotations.NotNull field z: Z1 private synthetic method (p0: Z1): void public synthetic final static method box-impl(p0: Z1): ZN2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: Z1): Z1 diff --git a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.txt b/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.txt index c25b4bf91e9..664eca9ce97 100644 --- a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.txt +++ b/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.txt @@ -6,7 +6,7 @@ public final class Hello/Foo { @kotlin.Metadata synthetic final class Hello/Foo__MultifileSuspendKt$$$main { - private final field args: java.lang.String[] + private synthetic final field args: java.lang.String[] synthetic method (p0: java.lang.String[]): void public synthetic final method invoke(p0: java.lang.Object): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend_ir.txt b/compiler/testData/codegen/bytecodeListing/main/multifileSuspend_ir.txt index fc673c4782c..e18f47c56b4 100644 --- a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/main/multifileSuspend_ir.txt @@ -6,7 +6,7 @@ public final class Hello/Foo { @kotlin.Metadata synthetic final class Hello/Foo__MultifileSuspendKt$main$2 { - private field args: java.lang.String[] + private synthetic field args: java.lang.String[] inner (anonymous) class Hello/Foo__MultifileSuspendKt$main$2 method (@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object diff --git a/compiler/testData/codegen/bytecodeListing/main/suspendMain.txt b/compiler/testData/codegen/bytecodeListing/main/suspendMain.txt index e98f84dbc6a..9f3345d8f62 100644 --- a/compiler/testData/codegen/bytecodeListing/main/suspendMain.txt +++ b/compiler/testData/codegen/bytecodeListing/main/suspendMain.txt @@ -1,6 +1,6 @@ @kotlin.Metadata synthetic final class SuspendMainKt$$$main { - private final field args: java.lang.String[] + private synthetic final field args: java.lang.String[] synthetic method (p0: java.lang.String[]): void public synthetic final method invoke(p0: java.lang.Object): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/main/suspendMain_ir.txt b/compiler/testData/codegen/bytecodeListing/main/suspendMain_ir.txt index 1b4450c04fa..01765d306c5 100644 --- a/compiler/testData/codegen/bytecodeListing/main/suspendMain_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/main/suspendMain_ir.txt @@ -1,6 +1,6 @@ @kotlin.Metadata synthetic final class SuspendMainKt$main$2 { - private field args: java.lang.String[] + private synthetic field args: java.lang.String[] inner (anonymous) class SuspendMainKt$main$2 method (@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object diff --git a/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.txt b/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.txt index 8ba17633e61..958f19fc6f7 100644 --- a/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.txt +++ b/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.txt @@ -40,10 +40,10 @@ synthetic final class NoReceiverInCallableReferenceClassesKt$aFoo$1 { @kotlin.Metadata public final class NoReceiverInCallableReferenceClassesKt { - private final static field A_bar: kotlin.reflect.KProperty1 - private final static field A_foo: kotlin.reflect.KFunction - private final static field aBar: kotlin.reflect.KProperty0 - private final static field aFoo: kotlin.reflect.KFunction + private final static @org.jetbrains.annotations.NotNull field A_bar: kotlin.reflect.KProperty1 + private final static @org.jetbrains.annotations.NotNull field A_foo: kotlin.reflect.KFunction + private final static @org.jetbrains.annotations.NotNull field aBar: kotlin.reflect.KProperty0 + private final static @org.jetbrains.annotations.NotNull field aFoo: kotlin.reflect.KFunction inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_foo$1 inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aFoo$1 static method (): void diff --git a/compiler/testData/codegen/bytecodeListing/privateDefaultSetter.txt b/compiler/testData/codegen/bytecodeListing/privateDefaultSetter.txt index 32ef69df8d7..9a1e05de4f5 100644 --- a/compiler/testData/codegen/bytecodeListing/privateDefaultSetter.txt +++ b/compiler/testData/codegen/bytecodeListing/privateDefaultSetter.txt @@ -1,8 +1,8 @@ @kotlin.Metadata public class Test { - private field internalProperty: java.lang.String - private field protectedProperty: java.lang.String - private field publicProperty: java.lang.String + private @org.jetbrains.annotations.NotNull field internalProperty: java.lang.String + private @org.jetbrains.annotations.NotNull field protectedProperty: java.lang.String + private @org.jetbrains.annotations.NotNull field publicProperty: java.lang.String public method (): void public final @org.jetbrains.annotations.NotNull method getInternalProperty$test_module(): java.lang.String protected final @org.jetbrains.annotations.NotNull method getProtectedProperty(): java.lang.String diff --git a/compiler/testData/codegen/kapt/dataClass.txt b/compiler/testData/codegen/kapt/dataClass.txt index 88c37d04f88..5a187fce7c9 100644 --- a/compiler/testData/codegen/kapt/dataClass.txt +++ b/compiler/testData/codegen/kapt/dataClass.txt @@ -1,7 +1,7 @@ @kotlin.Metadata public final class User { private final field age: int - private final field name: java.lang.String + private final @org.jetbrains.annotations.NotNull field name: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int): void public final @org.jetbrains.annotations.NotNull method component1(): java.lang.String public final method component2(): int diff --git a/compiler/testData/codegen/kapt/errorTypes.txt b/compiler/testData/codegen/kapt/errorTypes.txt index 77f4d0a0685..4c520aed8a4 100644 --- a/compiler/testData/codegen/kapt/errorTypes.txt +++ b/compiler/testData/codegen/kapt/errorTypes.txt @@ -1,7 +1,7 @@ @kotlin.Metadata @kotlin.Suppress public final class A { - private final field a: error.NonExistentClass + private final @org.jetbrains.annotations.NotNull field a: error.NonExistentClass public method (): void public final @org.jetbrains.annotations.NotNull method getA(): error.NonExistentClass } diff --git a/compiler/testData/codegen/kapt/innerClasses.txt b/compiler/testData/codegen/kapt/innerClasses.txt index 7441afb12b9..c4783d1d26e 100644 --- a/compiler/testData/codegen/kapt/innerClasses.txt +++ b/compiler/testData/codegen/kapt/innerClasses.txt @@ -37,8 +37,8 @@ public final class test/TopLevel$NestedClass { @kotlin.Metadata public final class test/TopLevel { public final static @org.jetbrains.annotations.NotNull field Companion: test.TopLevel$Companion - private final static field q: java.lang.String - private final field x: java.lang.String + private final static @org.jetbrains.annotations.NotNull field q: java.lang.String + private final @org.jetbrains.annotations.NotNull field x: java.lang.String private final field y: int inner class test/TopLevel$Companion inner class test/TopLevel$InnerInterface diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.txt index d71ab9281de..a698c1c0fac 100644 --- a/plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.txt +++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.txt @@ -19,7 +19,7 @@ public interface Intf @kotlin.Metadata public final class MyClass { - private @AllOpen field prop: java.lang.String + private @AllOpen @org.jetbrains.annotations.NotNull field prop: java.lang.String public method (): void public final @AllOpen @org.jetbrains.annotations.NotNull method getProp(): java.lang.String public final @AllOpen method method(): void diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.txt index 450ffc132e9..27c53918015 100644 --- a/plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.txt +++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.txt @@ -11,7 +11,7 @@ public class Test1 { @AllOpen @kotlin.Metadata public class Test2 { - private final field prop: java.lang.String + private final @org.jetbrains.annotations.NotNull field prop: java.lang.String public method (): void public @org.jetbrains.annotations.NotNull method getProp(): java.lang.String public method method(): void @@ -20,7 +20,7 @@ public class Test2 { @AllOpen @kotlin.Metadata public class Test3 { - private final field prop: java.lang.String + private final @org.jetbrains.annotations.NotNull field prop: java.lang.String public method (): void public @org.jetbrains.annotations.NotNull method getProp(): java.lang.String public method method(): void diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.txt index 2fca33661ae..e5f53198b05 100644 --- a/plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.txt +++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.txt @@ -28,7 +28,7 @@ final class Test$b$2 { @AllOpen @kotlin.Metadata public class Test { - private final field a: java.lang.Runnable + private final @org.jetbrains.annotations.NotNull field a: java.lang.Runnable inner (anonymous) class Test$a$1 inner (anonymous) class Test$b$1 inner (anonymous) class Test$b$2 diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.txt index 43e7f5b103f..6d540c89207 100644 --- a/plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.txt +++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.txt @@ -11,9 +11,9 @@ public final class Test1 { @AllOpen @kotlin.Metadata public class Test2 { - private final field prop1: java.lang.String - private final field prop2: java.lang.String - private field prop3: java.lang.String + private final @org.jetbrains.annotations.NotNull field prop1: java.lang.String + private final @org.jetbrains.annotations.NotNull field prop2: java.lang.String + private @org.jetbrains.annotations.NotNull field prop3: java.lang.String public method (): void public @org.jetbrains.annotations.NotNull method getProp1(): java.lang.String public final @org.jetbrains.annotations.NotNull method getProp2(): java.lang.String diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.txt index e608d41a98f..3bbecec5672 100644 --- a/plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.txt +++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class Test { - private final field prop: java.lang.String + private final @org.jetbrains.annotations.NotNull field prop: java.lang.String public method (): void public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String public final method method(): void diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.txt index 8ddf20491c9..b327b9b0d6e 100644 --- a/plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.txt +++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.txt @@ -5,10 +5,10 @@ public annotation class AllOpen @AllOpen @kotlin.Metadata class Test { - private final field internalProp: java.lang.String + private final @org.jetbrains.annotations.NotNull field internalProp: java.lang.String private final field privateProp: java.lang.String - private final field protectedProp: java.lang.String - private final field publicProp: java.lang.String + private final @org.jetbrains.annotations.NotNull field protectedProp: java.lang.String + private final @org.jetbrains.annotations.NotNull field publicProp: java.lang.String public method (): void public @org.jetbrains.annotations.NotNull method getInternalProp$test_module(): java.lang.String protected @org.jetbrains.annotations.NotNull method getProtectedProp(): java.lang.String diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.txt index ce523f61242..455444f63fd 100644 --- a/plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.txt +++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.txt @@ -10,8 +10,8 @@ public annotation class AllOpen2 @AllOpen2 @kotlin.Metadata public class Test { - private final field prop: java.lang.String + private final @org.jetbrains.annotations.NotNull field prop: java.lang.String public method (): void public @org.jetbrains.annotations.NotNull method getProp(): java.lang.String public method method(): void -} \ No newline at end of file +} diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/simple.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/simple.txt index 84dd33b4287..6a19c507f73 100644 --- a/plugins/allopen/allopen-cli/testData/bytecodeListing/simple.txt +++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/simple.txt @@ -5,7 +5,7 @@ public annotation class AllOpen @AllOpen @kotlin.Metadata public class Test { - private final field prop: java.lang.String + private final @org.jetbrains.annotations.NotNull field prop: java.lang.String public method (): void public @org.jetbrains.annotations.NotNull method getProp(): java.lang.String public method method(): void diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt index 6896daec00c..a9d9102ed51 100644 --- a/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt +++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt @@ -10,7 +10,7 @@ public class BaseImpl { @kotlin.Metadata public class BaseImpl2_ShouldBeOpen { - private final field baseImpl2Property_ShouldBeOpen: java.lang.String + private final @org.jetbrains.annotations.NotNull field baseImpl2Property_ShouldBeOpen: java.lang.String public method (): void public method baseImpl2Method_ShouldBeOpen(): void public @org.jetbrains.annotations.NotNull method getBaseImpl2Property_ShouldBeOpen(): java.lang.String diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt index df79522ca78..5da6cc6ef88 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt @@ -60,6 +60,7 @@ import java.lang.System; public enum E3 { /*public static final*/ X /* = new E3() */, /*public static final*/ Y /* = new E3() */; + @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; @org.jetbrains.annotations.NotNull() @@ -79,6 +80,7 @@ import java.lang.System; @kotlin.Metadata() public enum E4 { /*public static final*/ X /* = new E4() */; + @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; private final int b = 0; private final long c = 0L; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt index 3da7e5a1861..ddbaa8f4059 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt @@ -99,6 +99,7 @@ import java.lang.System; @Anno2(i = 6, s = "BCD", ii = {4, 5, 6}, ss = {"Z", "X"}, a = @Anno1(), color = Colors.WHITE, colors = {Colors.WHITE}, clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class}) @Anno3(value = "value") public final class TestAnno2 { + @org.jetbrains.annotations.NotNull() @Anno3(value = "field") private java.lang.String b = "property initializer"; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt index f0590863f87..1ecb47c7377 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt @@ -75,6 +75,7 @@ import java.lang.System; @kotlin.Metadata() @Anno(value = "clazz") public abstract class Test { + @org.jetbrains.annotations.NotNull() private java.lang.String v; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt index 13c9f7c7c75..71efe5e7a30 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt @@ -12,6 +12,7 @@ import java.lang.System; @kotlin.Metadata() public final class Bar { + @org.jetbrains.annotations.NotNull() @FieldAnno() private final java.lang.String a = ""; @@ -71,6 +72,7 @@ import java.lang.System; @kotlin.Metadata() public final class Foo { + @org.jetbrains.annotations.NotNull() @FieldAnno() private final java.lang.String a = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt index c3d7168f758..27375cccb3c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt @@ -62,6 +62,7 @@ public final class Test { /** * prop2. */ + @org.jetbrains.annotations.NotNull() private final java.lang.String prop2 = ""; /** @@ -128,6 +129,7 @@ import java.lang.System; */ @kotlin.Metadata() public final class Test2 { + @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; @org.jetbrains.annotations.NotNull() @@ -151,6 +153,7 @@ import java.lang.System; */ @kotlin.Metadata() public final class Test3 { + @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt index 86754ee31d5..7342fc46d0d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt @@ -2,7 +2,9 @@ import java.lang.System; @kotlin.Metadata() public final class User { + @org.jetbrains.annotations.NotNull() private final java.lang.String firstName = null; + @org.jetbrains.annotations.NotNull() private final java.lang.String secondName = null; private final int age = 0; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt index 55019723ccf..a20dea0e171 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt @@ -25,14 +25,23 @@ public final class Foo { private final long l = 0L; private final float f = 0.0F; private final double d = 0.0; + @org.jetbrains.annotations.NotNull() private final java.lang.String s = null; + @org.jetbrains.annotations.NotNull() private final int[] iarr = null; + @org.jetbrains.annotations.NotNull() private final long[] larr = null; + @org.jetbrains.annotations.NotNull() private final double[] darr = null; + @org.jetbrains.annotations.NotNull() private final java.lang.String[] sarr = null; + @org.jetbrains.annotations.NotNull() private final java.lang.Class cl = null; + @org.jetbrains.annotations.NotNull() private final java.lang.Class[] clarr = null; + @org.jetbrains.annotations.NotNull() private final Em em = null; + @org.jetbrains.annotations.NotNull() private final Em[] emarr = null; public final void foo(int a) { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt index 8f5df864d39..a9a400e9d5f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt @@ -25,14 +25,23 @@ public final class Foo { private final long l = -10L; private final float f = 1.0F; private final double d = -1.0; + @org.jetbrains.annotations.NotNull() private final java.lang.String s = "foo"; + @org.jetbrains.annotations.NotNull() private final int[] iarr = {1, 2, 3}; + @org.jetbrains.annotations.NotNull() private final long[] larr = {-1L, 0L, 1L}; + @org.jetbrains.annotations.NotNull() private final double[] darr = {7.3}; + @org.jetbrains.annotations.NotNull() private final java.lang.String[] sarr = {"a", "bc"}; + @org.jetbrains.annotations.NotNull() private final java.lang.Class cl = null; + @org.jetbrains.annotations.NotNull() private final java.lang.Class[] clarr = null; + @org.jetbrains.annotations.NotNull() private final Em em = Em.BAR; + @org.jetbrains.annotations.NotNull() private final Em[] emarr = {Em.FOO, Em.BAR}; public final void foo(int a) { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt index 76b4edbe8f5..90bb77c418d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt @@ -30,6 +30,7 @@ import java.lang.System; public enum Enum2 { /*public static final*/ RED /* = new Enum2() */, /*public static final*/ WHITE /* = new Enum2() */; + @org.jetbrains.annotations.NotNull() private final java.lang.String col = null; private final int col2 = 0; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt index 9e4384810d2..d2059974e1b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt @@ -28,8 +28,11 @@ import kotlin.reflect.KClass; @kotlin.Metadata() public final class ErrorInConstructorParameter { + @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; + @org.jetbrains.annotations.NotNull() private final ABC b = null; + @org.jetbrains.annotations.NotNull() private final java.util.List c = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt index 175f14cf90e..01c641b3783 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt @@ -177,6 +177,7 @@ import java.lang.System; @kotlin.Metadata() public final class TFooBar extends Foo implements test.Intf, Bar { + @org.jetbrains.annotations.NotNull() private final X a = null; @org.jetbrains.annotations.NotNull() @@ -198,6 +199,7 @@ import java.lang.System; @kotlin.Metadata() public final class TFooBar2 implements Foo, Bar { + @org.jetbrains.annotations.NotNull() private final X a = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt index 1669cc37d58..3124b0ba9ac 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt @@ -2,6 +2,7 @@ import java.lang.System; @kotlin.Metadata() public final class MappedList extends kotlin.collections.AbstractList implements java.util.List { + @org.jetbrains.annotations.NotNull() private final java.util.List list = null; private final kotlin.jvm.functions.Function1 function = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt index 1f000a116be..2cc611e3767 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt @@ -51,6 +51,7 @@ import java.lang.System; @kotlin.Metadata() public final class MyClass extends BaseClass implements Intf, OtherIntf { + @org.jetbrains.annotations.Nullable() private final java.util.List> fld = null; @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt index 163e9b402f6..5becde66c24 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt @@ -4,6 +4,7 @@ import java.lang.System; public final class Test { @org.jetbrains.annotations.NotNull() public final java.lang.String ignoredProperty = ""; + @org.jetbrains.annotations.NotNull() private final java.lang.String nonIgnoredProperty = ""; public final void nonIgnoredFun() { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt index b6a5eb9809e..c8072353f9f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt @@ -19,6 +19,7 @@ import java.lang.System; @kotlin.Metadata() public final class Cl { + @org.jetbrains.annotations.NotNull() private java.lang.String name; @org.jetbrains.annotations.NotNull() @@ -48,8 +49,11 @@ public final class TestKt { public TestKt() { super(); } + @org.jetbrains.annotations.NotNull() private static final lib.Prop TEST = null; + @org.jetbrains.annotations.NotNull() private static final lib.Prop[] TESTS_ARRAY = null; + @org.jetbrains.annotations.NotNull() private static final java.util.List> TESTS_LIST = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt index 357f4909c69..adbce593298 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt @@ -6,6 +6,7 @@ public final class Cl { public Cl() { super(); } + @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt b/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt index 2fb7fa3521c..fe33cd8aad0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt @@ -14,6 +14,7 @@ import java.lang.System; @kotlin.Metadata() public final class Product2 implements Named { + @org.jetbrains.annotations.Nullable() private java.lang.String name; @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt index 7e156137818..c8e28d7075d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt @@ -32,12 +32,14 @@ public final class B { * member * comment. */ + @org.jetbrains.annotations.NotNull() private final java.lang.String a = ""; /** * Mixed * tabs/spaces */ + @org.jetbrains.annotations.NotNull() private final java.lang.String b = ""; /** @@ -45,12 +47,14 @@ public final class B { * * first item * * second item */ + @org.jetbrains.annotations.NotNull() private final java.lang.String c = ""; /** * Without * stars */ + @org.jetbrains.annotations.NotNull() private final java.lang.String d = ""; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt index 53eed47076c..2b92efc2804 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt @@ -4,6 +4,7 @@ import java.lang.System; public final class State { private final int someInt = 0; private final long someLong = 0L; + @org.jetbrains.annotations.NotNull() private final java.lang.String someString = null; public final int getSomeInt() { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt index 1e2b5d09953..74e088d08fa 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt @@ -2,6 +2,7 @@ import java.lang.System; @kotlin.Metadata() public final class Test { + @org.jetbrains.annotations.NotNull() private static final java.lang.String test = ""; @org.jetbrains.annotations.NotNull() public static final Test.A A = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt index 2f681e095e4..3bf3b1ad424 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt @@ -13,7 +13,9 @@ public final class Outer { @kotlin.Metadata() final class Inner { + @org.jetbrains.annotations.NotNull() private final java.lang.String foo = null; + @org.jetbrains.annotations.NotNull() private final java.lang.String bar = null; @org.jetbrains.annotations.NotNull() @@ -35,7 +37,9 @@ public final class Outer { @kotlin.Metadata() static final class Nested { + @org.jetbrains.annotations.NotNull() private final java.lang.String foo = null; + @org.jetbrains.annotations.NotNull() private final java.lang.String bar = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt index 27591da2145..88d1bf86686 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt @@ -89,6 +89,7 @@ import java.lang.System; @kotlin.Metadata() public final class JJ { + @org.jetbrains.annotations.NotNull() private static final java.lang.String b = null; @org.jetbrains.annotations.NotNull() public static final app.JJ INSTANCE = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt index 5bcb8492ac5..b3fbf47e87c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt @@ -2,6 +2,7 @@ import java.lang.System; @kotlin.Metadata() public final class Foo { + @org.jetbrains.annotations.NotNull() private final Foo.Bar bar = null; private final java.lang.String string = null; @@ -17,7 +18,9 @@ public final class Foo { @kotlin.Metadata() public static final class Bar { + @org.jetbrains.annotations.NotNull() private final java.util.ArrayList bars = null; + @org.jetbrains.annotations.NotNull() private final java.lang.String string = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt index d95a5370fd4..f54ffd3f1da 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt @@ -28,7 +28,9 @@ import java.lang.System; @kotlin.Metadata() public final class Modifiers { + @org.jetbrains.annotations.NotNull() private final transient java.lang.String transientField = ""; + @org.jetbrains.annotations.NotNull() private volatile java.lang.String volatileField = ""; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt index 81b069fba1c..cc890eed4ce 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt @@ -2,6 +2,7 @@ import java.lang.System; @kotlin.Metadata() public final class A { + @org.jetbrains.annotations.Nullable() private final A x = null; @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt index 616a7c6231b..595a64167ff 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt @@ -242,6 +242,7 @@ import java.lang.System; @kotlin.Metadata() @IFoo.IBar.Anno(value = {IFoo.IBar.IZoo.class, Foo.Bar.class}) 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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt index 8a6c3b999dc..4b911cb1093 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt @@ -250,6 +250,7 @@ import java.lang.System; @kotlin.Metadata() @test.IFoo.IBar.Anno(value = {test.IFoo.IBar.IZoo.class, test.Foo.Bar.class}) 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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt index 422dff505d1..0c835f604aa 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt @@ -3,9 +3,13 @@ import java.lang.System; @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) @kotlin.Metadata() public final class NonExistentType { + @org.jetbrains.annotations.Nullable() private static final ABCDEF a = null; + @org.jetbrains.annotations.Nullable() private static final java.util.List b = null; + @org.jetbrains.annotations.NotNull() private static final Function1 c = null; + @org.jetbrains.annotations.Nullable() private static final ABCDEF, kotlin.Unit>> d = null; @org.jetbrains.annotations.NotNull() public static final NonExistentType INSTANCE = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt index 886fca9c2a4..660b3b0dcca 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt @@ -49,8 +49,11 @@ import kotlin.reflect.KClass; @Anno(a = Blah.class, b = {NoFoo1.class, NoBar1.class}, c = {NoFoo2.class, kotlin.String.class}, d = {kotlin.Boolean.class, NoBar3.class}) public final class Test { public ABC a; + @org.jetbrains.annotations.Nullable() private final ABC b = null; + @org.jetbrains.annotations.Nullable() private final java.util.List c = null; + @org.jetbrains.annotations.Nullable() private final java.util.List>>> d = null; public java.util.List> e; public ABC f; @@ -66,7 +69,9 @@ public final class Test { public ABC coocoo3; public ABC> coocoo31; public ABC nested; + @org.jetbrains.annotations.NotNull() private final java.lang.Object m = null; + @org.jetbrains.annotations.NotNull() private final java.lang.String n = ""; public java.util.List>>>>>>>>> o11; public java.util.List>>>>>>>> o10; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt index 4f7a70635ff..b3e1e450e83 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt @@ -12,9 +12,13 @@ import java.lang.System; @kotlin.Metadata() public final class NonExistentType { + @org.jetbrains.annotations.Nullable() private static final error.NonExistentClass a = null; + @org.jetbrains.annotations.Nullable() private static final java.util.List b = null; + @org.jetbrains.annotations.NotNull() private static final kotlin.jvm.functions.Function1 c = null; + @org.jetbrains.annotations.Nullable() private static final error.NonExistentClass d = null; public static java.lang.String string2; public static error.NonExistentClass coocoo; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt index dc1be19528c..4452a93f9e6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt @@ -24,6 +24,7 @@ import java.lang.System; @kotlin.Metadata() public final class Test { + @org.jetbrains.annotations.NotNull() private final java.lang.String prop = "A"; @Anno2() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt index 42019388194..60e2db544c7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt @@ -25,6 +25,7 @@ import java.lang.System; @kotlin.Metadata() public final class KBox implements androidx.annotation.Box { + @org.jetbrains.annotations.NotNull() private final androidx.annotation.Box delegate = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt index ea81cca8e79..75af5872492 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt @@ -183,6 +183,7 @@ import java.lang.System; @kotlin.Metadata() public final class Test { + @org.jetbrains.annotations.NotNull() private final java.lang.String value = ""; @lib.Anno(value = "3", construct = {"C"}) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt b/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt index 1f7a6d97238..b032273355c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt @@ -17,6 +17,7 @@ import java.lang.System; @kotlin.Metadata() public final class Product2 implements secondary.Named { + @org.jetbrains.annotations.Nullable() private java.lang.String name; @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt index 448e50b3f07..eac1a965387 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt @@ -17,6 +17,7 @@ import java.lang.System; @kotlin.Metadata() public enum StrangeEnum { /*public static final*/ InvalidFieldName /* = new StrangeEnum() */; + @org.jetbrains.annotations.NotNull() private final java.lang.String size = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt index 70c37ab85d6..b929d8e55a1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt @@ -2,6 +2,7 @@ import java.lang.System; @kotlin.Metadata() public final class Boo { + @org.jetbrains.annotations.NotNull() private static final java.lang.String z = null; @org.jetbrains.annotations.NotNull() public static final Boo INSTANCE = null; @@ -31,17 +32,23 @@ public final class Foo { @org.jetbrains.annotations.NotNull() public static final java.lang.String aString = "foo"; public static final int aInt = 3; + @org.jetbrains.annotations.NotNull() private static final java.lang.String bString = "bar"; private static final int bInt = 5; + @org.jetbrains.annotations.NotNull() private static java.lang.String cString = "baz"; private static int cInt = 7; + @org.jetbrains.annotations.NotNull() private static final java.lang.String d = null; private static final int e = 0; private static final int f = 8; + @org.jetbrains.annotations.NotNull() private static final java.lang.String g = "ab"; private static final int h = -4; private static final int i = 2147483647; + @org.jetbrains.annotations.NotNull() private static final java.lang.String j = null; + @org.jetbrains.annotations.NotNull() private static final java.lang.String k = null; @org.jetbrains.annotations.NotNull() public static final Foo INSTANCE = null; @@ -119,18 +126,30 @@ import java.lang.System; @kotlin.Metadata() public final class HavingState { + @org.jetbrains.annotations.NotNull() private final State state = State.START; + @org.jetbrains.annotations.NotNull() private final State[] stateArray = {State.START}; + @org.jetbrains.annotations.NotNull() private final java.lang.String[] stringArray = {"foo"}; + @org.jetbrains.annotations.NotNull() private final java.util.List stringList = null; + @org.jetbrains.annotations.NotNull() private final java.lang.Integer[] intArray = {1}; + @org.jetbrains.annotations.NotNull() private final float[] floatArray = {-1.0F}; + @org.jetbrains.annotations.NotNull() private final java.util.List intList = null; private final int uint = 1; + @org.jetbrains.annotations.NotNull() private final kotlin.UInt[] uintArray = {1}; + @org.jetbrains.annotations.NotNull() private final java.util.List uintList = null; + @org.jetbrains.annotations.NotNull() private final kotlin.reflect.KClass clazz = null; + @org.jetbrains.annotations.NotNull() private final java.lang.Class javaClass = null; + @org.jetbrains.annotations.NotNull() private final kotlin.reflect.KClass anonymous = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt index 2981b4dfead..17ea210a959 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt @@ -23,6 +23,7 @@ import java.lang.System; @kotlin.Metadata() @Anno() public final class User { + @org.jetbrains.annotations.NotNull() private final java.lang.String name = "John"; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt index 5921b537e36..9fb0cd3bbc5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt @@ -25,6 +25,7 @@ import java.lang.System; public final class State { private final int someInt = 0; private final long someLong = 0L; + @org.jetbrains.annotations.NotNull() private final java.lang.String someString = null; public final int getSomeInt() { diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass.txt b/plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass.txt index 7b2e43b7e08..1c67b11a588 100644 --- a/plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass.txt +++ b/plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass.txt @@ -16,7 +16,7 @@ public interface Intf @kotlin.Metadata public final class MyClass { - private @NoArg field abc: java.lang.String + private @NoArg @org.jetbrains.annotations.NotNull field abc: java.lang.String public method (p0: int): void public final @NoArg @org.jetbrains.annotations.NotNull method getAbc(): java.lang.String public final @NoArg method setAbc(@org.jetbrains.annotations.NotNull p0: java.lang.String): void