From 6c79b184c08cd2dc3082f8f946d0b64b458a0201 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 28 Feb 2019 11:34:18 +0300 Subject: [PATCH] FIR Java types: add Kotlin/Java mapping & mutability enhancements Related to KT-29937 --- .../fir/java/enhancement/javaTypeUtils.kt | 47 ++++++++++++++----- .../AnnotatedValueParameter.fir.txt | 2 +- .../CustomProjectionKind.fir.txt | 2 +- .../MethodWithFunctionTypes.fir.txt | 2 +- .../MethodWithGenerics.fir.txt | 2 +- .../MethodWithMappedClasses.fir.txt | 4 +- .../error/WrongProjectionKind.fir.txt | 2 +- .../error/WrongReturnTypeStructure.fir.txt | 2 +- .../WrongValueParameterStructure1.fir.txt | 2 +- .../return/SubclassOfCollection.fir.txt | 2 +- .../compiledJava/library/LoadIterable.fir.txt | 4 +- .../compiledJava/library/LoadIterator.fir.txt | 4 +- .../modality/ModalityOfFakeOverrides.fir.txt | 2 +- .../mutability/LoadIterable.fir.txt | 8 ++-- .../LoadIterableWithConflict.fir.txt | 4 +- .../LoadIterableWithNullability.fir.txt | 8 ++-- .../ReadOnlyExtendsWildcard.fir.txt | 2 +- .../compiledJava/notNull/NotNullField.fir.txt | 6 +-- .../notNull/NotNullMethod.fir.txt | 2 +- .../notNull/NotNullParameter.fir.txt | 2 +- ...perclassesInconsistentGenericTypes.fir.txt | 2 +- .../basicWithAnnotatedJava/extraDump.java.txt | 2 +- .../extraDump.java.txt | 4 +- 23 files changed, 70 insertions(+), 47 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt index c5bfbf7d8a7..6815e47cf27 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.load.java.descriptors.StringDefaultValue import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.load.java.typeEnhancement.* import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.utils.addToStdlib.safeAs @@ -78,6 +79,24 @@ private fun JavaType.subtreeSize(): Int { return 1 + typeArguments.sumBy { it.subtreeSize() } } +private val KOTLIN_COLLECTIONS = FqName("kotlin.collections") + +private val KOTLIN_COLLECTIONS_PREFIX_LENGTH = KOTLIN_COLLECTIONS.asString().length + 1 + +private fun ClassId.readOnlyToMutable(): ClassId? { + val mutableFqName = JavaToKotlinClassMap.readOnlyToMutable(asSingleFqName().toUnsafe()) + return mutableFqName?.let { + ClassId(KOTLIN_COLLECTIONS, FqName(it.asString().substring(KOTLIN_COLLECTIONS_PREFIX_LENGTH)), false) + } +} + +private fun ClassId.mutableToReadOnly(): ClassId? { + val readOnlyFqName = JavaToKotlinClassMap.mutableToReadOnly(asSingleFqName().toUnsafe()) + return readOnlyFqName?.let { + ClassId(KOTLIN_COLLECTIONS, FqName(it.asString().substring(KOTLIN_COLLECTIONS_PREFIX_LENGTH)), false) + } +} + private fun JavaClassifierType.enhanceInflexibleType( session: FirSession, annotations: List, @@ -87,7 +106,16 @@ private fun JavaClassifierType.enhanceInflexibleType( index: Int ): ConeLookupTagBasedType { val originalSymbol = when (val classifier = classifier) { - is JavaClass -> session.service().getClassLikeSymbolByFqName(classifier.classId!!)!! + is JavaClass -> { + val classId = classifier.classId!! + var mappedId = JavaToKotlinClassMap.mapJavaToKotlin(classId.asSingleFqName()) + if (mappedId != null) { + if (position == TypeComponentPosition.FLEXIBLE_LOWER) { + mappedId = mappedId.readOnlyToMutable() ?: mappedId + } + } + session.service().getClassLikeSymbolByFqName(mappedId ?: classId)!! + } is JavaTypeParameter -> createTypeParameterSymbol(session, classifier.name) else -> return toNotNullConeKotlinType(session) } @@ -156,23 +184,18 @@ private fun ConeClassifierSymbol.enhanceMutability( ): EnhanceDetailsResult { if (!position.shouldEnhance()) return this.noChange() if (this !is FirClassSymbol) return this.noChange() // mutability is not applicable for type parameters - val fqNameUnsafe = classId.asSingleFqName().toUnsafe() when (qualifiers.mutability) { MutabilityQualifier.READ_ONLY -> { - val readOnlyFqName = JavaToKotlinClassMap.mutableToReadOnly(fqNameUnsafe) - if (position == TypeComponentPosition.FLEXIBLE_LOWER && readOnlyFqName != null) { - return FirClassSymbol(ClassId(classId.packageFqName, readOnlyFqName, false)).apply { - bind(fir) - }.enhancedMutability() + val readOnlyId = classId.mutableToReadOnly() + if (position == TypeComponentPosition.FLEXIBLE_LOWER && readOnlyId != null) { + return FirClassSymbol(readOnlyId).enhancedMutability() } } MutabilityQualifier.MUTABLE -> { - val mutableFqName = JavaToKotlinClassMap.readOnlyToMutable(fqNameUnsafe) - if (position == TypeComponentPosition.FLEXIBLE_UPPER && mutableFqName != null) { - return FirClassSymbol(ClassId(classId.packageFqName, mutableFqName, false)).apply { - bind(fir) - }.enhancedMutability() + val mutableId = classId.readOnlyToMutable() + if (position == TypeComponentPosition.FLEXIBLE_UPPER && mutableId != null) { + return FirClassSymbol(mutableId).enhancedMutability() } } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt index 45861b8e182..1ac2158f44d 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt @@ -1,4 +1,4 @@ public open class AnnotatedValueParameter : R|java/lang/Object| { - public open operator function f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft>, java/util/List>>|): R|kotlin/Unit| + public open operator function f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft>, kotlin/collections/List>>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt index c94163e2c27..2bebe1ca4f5 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt @@ -1,4 +1,4 @@ public open class CustomProjectionKind : R|java/lang/Object| { - public open operator function foo(): R|ft>, java/util/List>>| + public open operator function foo(): R|ft>, kotlin/collections/List>>| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt index 06bbb7dea11..c7cf1146190 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt @@ -1,4 +1,4 @@ public open class MethodWithFunctionTypes : R|java/lang/Object| { - public open operator function foo(f: R|ft, ft>, kotlin/jvm/functions/Function1, ft>>|): R|ft>, kotlin/jvm/functions/Function0>>| + public open operator function foo(f: R|ft, ft>, kotlin/Function1, ft>>|): R|ft>, kotlin/Function0>>| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt index ee9b7ffa89c..aa8ddf646a0 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt @@ -1,4 +1,4 @@ public open class MethodWithGenerics : R|java/lang/Object| { - public open operator function foo(a: R|ft|!, b: R|ft, ft>, java/util/Map.Entry, ft>>>, java/util/List, ft>, java/util/Map.Entry, ft>>>>|): R|ft|! + public open operator function foo(a: R|ft|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>>>>|): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt index 925513ba1ab..53ff599c332 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt @@ -1,6 +1,6 @@ public open class MethodWithMappedClasses : R|java/lang/Object| { - public open operator function copy(dest: R|ft, java/util/List?>|!, src: R|ft>, java/util/List>>|): R|kotlin/Unit| + public open operator function copy(dest: R|ft, java/util/List?>|!, src: R|ft>, kotlin/collections/List>>|): R|kotlin/Unit| - public open operator function copyMap(dest: R|ft, *>, java/util/Map, *>>|, src: R|ft, ft>, java/util/Map, ft>>|): R|kotlin/Unit| + public open operator function copyMap(dest: R|ft, *>, kotlin/collections/Map, *>>|, src: R|ft, ft>, kotlin/collections/Map, ft>>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt index 1949ada7afa..44d5b0530f7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt @@ -1,4 +1,4 @@ public open class WrongProjectionKind : R|java/lang/Object| { - public open operator function copy(from: R|kotlin/Array>|, to: R|kotlin/Array>|): R|ft>, java/util/List>>| + public open operator function copy(from: R|kotlin/Array>|, to: R|kotlin/Array>|): R|ft>, kotlin/collections/List>>| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt index 2347e48dee4..0bf1a078c1e 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt @@ -1,4 +1,4 @@ public open class WrongReturnTypeStructure : R|java/lang/Object| { - public open operator function foo(a: R|ft|!, b: R|ft, ft>, java/util/Map.Entry, ft>>>, java/util/List, ft>, java/util/Map.Entry, ft>>>>|): R|ft|! + public open operator function foo(a: R|ft|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>>>>|): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt index 6993b31c3fe..bc7fc027f7a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt @@ -1,4 +1,4 @@ public open class WrongValueParameterStructure1 : R|java/lang/Object| { - public open operator function foo(a: R|ft|!, b: R|ft, ft>, java/util/Map.Entry, ft>>>, java/util/List, ft>, java/util/Map.Entry, ft>>>>|): R|ft|! + public open operator function foo(a: R|ft|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>>>>|): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt index 5bfe1b5a75d..3aaf597b0e7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt @@ -1,4 +1,4 @@ public abstract interface SubclassOfCollection : R|java/util/Collection| { - public abstract operator function iterator(): R|ft>, java/util/Iterator>>| + public abstract operator function iterator(): R|ft>, kotlin/collections/Iterator>>| } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt index e309884fbae..94e4345df4c 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterable : R|java/lang/Object| { - public abstract operator function getIterable(): R|ft>, java/lang/Iterable>>| + public abstract operator function getIterable(): R|ft>, kotlin/collections/Iterable>>| - public abstract operator function setIterable(Iterable: R|ft>, java/lang/Iterable>>|): R|kotlin/Unit| + public abstract operator function setIterable(Iterable: R|ft>, kotlin/collections/Iterable>>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt index 22c7ca47025..a13a2057bc9 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterator : R|java/lang/Object| { - public abstract operator function getIterator(): R|ft>, java/util/Iterator>>| + public abstract operator function getIterator(): R|ft>, kotlin/collections/Iterator>>| - public abstract operator function setIterator(iterator: R|ft>, java/util/Iterator>>|): R|kotlin/Unit| + public abstract operator function setIterator(iterator: R|ft>, kotlin/collections/Iterator>>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt index e89c29120f7..cb6f61254e7 100644 --- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt +++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt @@ -1,5 +1,5 @@ public open class ModalityOfFakeOverrides : R|java/util/AbstractList| { - @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator function get(index: R|kotlin/Int|): R|ft| + @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator function get(index: R|kotlin/Int|): R|ft| @R|java/lang/Override|() public open operator function size(): R|kotlin/Int| diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt index 2bed4be30bf..f5b3488ab4b 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt @@ -1,10 +1,10 @@ public abstract interface LoadIterable : R|java/lang/Object| { - @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft>, java/lang/Iterable>>| + @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft>, kotlin/collections/MutableIterable>>| - public abstract operator function setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, java/lang/Iterable>>|): R|kotlin/Unit| + public abstract operator function setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/MutableIterable>>|): R|kotlin/Unit| - @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator function getReadOnlyIterable(): R|ft>, java/lang/Iterable>>| + @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator function getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>>| - public abstract operator function setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft>, java/lang/Iterable>>|): R|kotlin/Unit| + public abstract operator function setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft>, kotlin/collections/Iterable>>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt index c56a5e39ae1..bd42f9abc50 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterableWithConflict : R|java/lang/Object| { - @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft>, java/lang/Iterable>>| + @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft>, kotlin/collections/Iterable>>| - public abstract operator function setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, java/lang/Iterable>>|): R|kotlin/Unit| + public abstract operator function setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/Iterable>>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt index b493f88a74b..f9f3a729804 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt @@ -1,10 +1,10 @@ public abstract interface LoadIterableWithNullability : R|java/lang/Object| { - @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft>, java/lang/Iterable>>| + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft>, kotlin/collections/MutableIterable>>| - public abstract operator function setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft>, java/lang/Iterable>>|): R|kotlin/Unit| + public abstract operator function setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft>, kotlin/collections/MutableIterable>>|): R|kotlin/Unit| - @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator function getReadOnlyIterable(): R|ft>, java/lang/Iterable>>| + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator function getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>>| - public abstract operator function setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft>, java/lang/Iterable>>|): R|kotlin/Unit| + public abstract operator function setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft>, kotlin/collections/Iterable>>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt index cfde63a22c6..b16ae8e4016 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt @@ -1,6 +1,6 @@ public abstract interface ReadOnlyExtendsWildcard : R|java/lang/Object| { public abstract operator function bar(): R|kotlin/Unit| - public abstract operator function foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft, java/util/List?>|!, @R|org/jetbrains/annotations/NotNull|() y: R|ft, java/lang/Comparable<*>>|): R|kotlin/Unit| + public abstract operator function foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft, java/util/List?>|!, @R|org/jetbrains/annotations/NotNull|() y: R|ft, kotlin/Comparable<*>>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt index 117a1149ebb..6062966b2b3 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt @@ -1,6 +1,6 @@ public open class NotNullField : R|java/lang/Object| { - @R|org/jetbrains/annotations/NotNull|() public open property hi(var): R|ft| - public get(): R|ft| - public set(value: R|ft|): kotlin/Unit + @R|org/jetbrains/annotations/NotNull|() public open property hi(var): R|ft| + public get(): R|ft| + public set(value: R|ft|): kotlin/Unit } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt index 9afe8d17667..47dffd65417 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt @@ -1,4 +1,4 @@ public open class NotNullMethod : R|java/lang/Object| { - @R|org/jetbrains/annotations/NotNull|() public open operator function hi(): R|ft| + @R|org/jetbrains/annotations/NotNull|() public open operator function hi(): R|ft| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt index 05e25a3b658..8d5ee2d2151 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt @@ -1,4 +1,4 @@ public open class NotNullParameter : R|java/lang/Object| { - public open operator function hi(@R|org/jetbrains/annotations/NotNull|() param: R|ft|): R|kotlin/Unit| + public open operator function hi(@R|org/jetbrains/annotations/NotNull|() param: R|ft|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt index a09b2bd816f..e83975a490c 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt @@ -1,5 +1,5 @@ public abstract interface TwoSuperclassesInconsistentGenericTypes : R|java/lang/Object| { - public abstract operator function foo(): R|ft>, java/util/List>>| + public abstract operator function foo(): R|ft>, kotlin/collections/List>>| public abstract operator function dummy(): R|kotlin/Unit| diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt index 03fe461403f..86f62d09d53 100644 --- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt @@ -1,4 +1,4 @@ public open class Annotated : R|java/lang/Object| { - @R|org/jetbrains/annotations/NotNull|() public open operator function foo(@R|org/jetbrains/annotations/Nullable|() param: R|ft|?): R|ft| + @R|org/jetbrains/annotations/NotNull|() public open operator function foo(@R|org/jetbrains/annotations/Nullable|() param: R|ft|?): R|ft| } diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt index 1eb692bece8..540f08d3313 100644 --- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt @@ -1,8 +1,8 @@ public open class Annotated : R|java/lang/Object| { - @R|org/jetbrains/annotations/NotNull|() public open operator function foo(@R|org/jetbrains/annotations/Nullable|() param: R|ft|?): R|ft| + @R|org/jetbrains/annotations/NotNull|() public open operator function foo(@R|org/jetbrains/annotations/Nullable|() param: R|ft|?): R|ft| } public open class AnnotatedDerived : R|Annotated| { - public open operator function foo(param: R|ft|?): R|ft| + public open operator function foo(param: R|ft|?): R|ft| }