diff --git a/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt b/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt index 0f7b2b05233..672f3f2f4f0 100644 --- a/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt +++ b/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt @@ -1,5 +1,5 @@ public/*package*/ open class ArraysUtilJVM : R|kotlin/Any| { - public/*package*/ open static fun !|> asList(p0: T[]): java.util.List + public/*package*/ open static fun |> asList(p0: T[]): java.util.List public/*package*/ constructor(): R|kotlin/collections/ArraysUtilJVM| @@ -304,4 +304,3 @@ public abstract class ShortIterator : R|kotlin/collections/Iterator!| + @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft| @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|@EnhancedNullability kotlin/CharSequence?|): R|@EnhancedNullability kotlin/String?| diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt index ea26edcf306..101feec5052 100644 --- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt +++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt @@ -3,7 +3,7 @@ @R|javax/annotation/Nonnull|() public open field nonNullField: R|@EnhancedNullability kotlin/String| - public open fun foo(q: R|ft!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft!| + public open fun foo(q: R|ft|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft| @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String| diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt index 19f6609f44f..72ab2f396d2 100644 --- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt +++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt @@ -1,7 +1,7 @@ @R|spr/NonNullApi|() public open class A : R|kotlin/Any| { public open fun foo(x: R|@EnhancedNullability kotlin/String|, @R|spr/Nullable|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|@EnhancedNullability kotlin/String| - @R|spr/ForceFlexibility|() public open fun bar(x: R|ft!|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|ft!| + @R|spr/ForceFlexibility|() public open fun bar(x: R|ft|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|ft| public constructor(): R|A| diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt index e24bdece177..58e03ee2bbe 100644 --- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt +++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt @@ -5,7 +5,7 @@ public open fun baz(@R|spr/UnknownNullability|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit| - public open fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft!|): R|kotlin/Unit| + public open fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft|): R|kotlin/Unit| public constructor(): R|A| diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt index 081f09c7457..48fa03cca5d 100644 --- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt +++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt @@ -7,7 +7,7 @@ public open fun bar(): R|@EnhancedNullability kotlin/String| - @R|javax/annotation/Nullable|() public open fun baz(): R|ft<@EnhancedNullability kotlin/collections/MutableList!>?, @EnhancedNullability kotlin/collections/List!>?>?| + @R|javax/annotation/Nullable|() public open fun baz(): R|ft<@EnhancedNullability kotlin/collections/MutableList>?, @EnhancedNullability kotlin/collections/List>?>| public constructor(): R|A| diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt index 86f8ac894f4..b419e930a11 100644 --- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt +++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt @@ -1,7 +1,7 @@ @R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|kotlin/Any| { @R|javax/annotation/Nullable|() public open field field: R|@EnhancedNullability kotlin/String?| - public open fun foo(q: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft!| + public open fun foo(q: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft| @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String| diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt index 31058113c9e..2a24e346a56 100644 --- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt +++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt @@ -1,7 +1,7 @@ public open class A : R|kotlin/Any| { @R|javax/annotation/Nullable|() public open field field: R|@EnhancedNullability kotlin/String?| - public open fun foo(q: R|ft!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft!| + public open fun foo(q: R|ft|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft| @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String| @@ -11,7 +11,7 @@ public open class A : R|kotlin/Any| { public open class A2 : R|kotlin/Any| { @R|javax/annotation/Nullable|() public open field field: R|@EnhancedNullability kotlin/String?| - public open fun foo(q: R|ft!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft!| + public open fun foo(q: R|ft|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft| @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String| diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt index dbd34e15d79..70ed02034c9 100644 --- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt +++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt @@ -1,11 +1,11 @@ @R|spr/NonNullApi|() public open class A : R|kotlin/Any| { - public open field field: R|ft!| + public open field field: R|ft| public open fun foo(x: R|@EnhancedNullability kotlin/String|, @R|spr/Nullable|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|@EnhancedNullability kotlin/String| public open fun bar(): R|@EnhancedNullability kotlin/String| - @R|spr/Nullable|() public open fun baz(): R|ft<@EnhancedNullability kotlin/collections/MutableList!>?, @EnhancedNullability kotlin/collections/List!>?>?| + @R|spr/Nullable|() public open fun baz(): R|ft<@EnhancedNullability kotlin/collections/MutableList>?, @EnhancedNullability kotlin/collections/List>?>| public constructor(): R|A| diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt index 6391110a2fe..f89bf50150a 100644 --- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt +++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt @@ -1,11 +1,11 @@ public open class A : R|kotlin/Any| { - public open field field: R|ft!| + public open field field: R|ft| - public open fun foo(x: R|ft!|, @R|spr/Nullable|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft!| + public open fun foo(x: R|ft|, @R|spr/Nullable|() y: R|@EnhancedNullability kotlin/CharSequence?|): R|ft| - public open fun bar(): R|ft!| + public open fun bar(): R|ft| - @R|spr/Nullable|() public open fun baz(): R|ft<@EnhancedNullability kotlin/collections/MutableList!>?, @EnhancedNullability kotlin/collections/List!>?>?| + @R|spr/Nullable|() public open fun baz(): R|ft<@EnhancedNullability kotlin/collections/MutableList>?, @EnhancedNullability kotlin/collections/List>?>| public constructor(): R|test/A| diff --git a/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt index be553283c51..0d6eebb5231 100644 --- a/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt +++ b/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt @@ -1,4 +1,4 @@ -public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap!, ft!>| { +public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap, ft>| { public constructor(): R|AbstractMap| } diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt index 994abb4f8b0..9e9c34facd3 100644 --- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt +++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt @@ -1,6 +1,5 @@ -public final fun array(a: R|kotlin/Array|): R|ft!>, kotlin/Array!>?>!| +public final fun array(a: R|kotlin/Array|): R|ft>, kotlin/Array>?>| -public final fun list(): R|ft!>, kotlin/collections/List!>?>!| - -public final fun printStream(): R|ft!| +public final fun list(): R|ft>, kotlin/collections/List>?>| +public final fun printStream(): R|ft| diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt index 8ce9ec7d6fc..8be77c6f817 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt @@ -1,4 +1,4 @@ FILE: main.kt public final fun test(list: R|kotlin/collections/List|, string: R|kotlin/String|): R|kotlin/Unit| { - R|/Matchers.assertThat|, kotlin/collections/List?>!|>(R|/list|, R|/Matchers.hasItem|!|>(R|/string|)) + R|/Matchers.assertThat|, kotlin/collections/List?>|>(R|/list|, R|/Matchers.hasItem||>(R|/string|)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt index 3664f40461b..e46f9fad432 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt @@ -7,7 +7,7 @@ FILE: main.kt public abstract interface PsiClass : R|kotlin/Any| { } public final fun test(): R|kotlin/Unit| { - lval processor: R|AdapterProcessor!, ft!>| = R|/AdapterProcessor.AdapterProcessor|!|, R|ft!|>(R|/Function|!|, R|PsiClass?|>( = Function@fun (method: R|PsiMethod?|): R|PsiClass?| { + lval processor: R|AdapterProcessor, ft>| = R|/AdapterProcessor.AdapterProcessor||, R|ft|>(R|/Function||, R|PsiClass?|>( = Function@fun (method: R|PsiMethod?|): R|PsiClass?| { ^ R|/method|?.{ $subj$.R|/PsiMethod.containingClass| } } )) diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/typeMismatchOnExpectedJavaMap.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/typeMismatchOnExpectedJavaMap.fir.txt index 56ced3756e0..c391b06e524 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/typeMismatchOnExpectedJavaMap.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/typeMismatchOnExpectedJavaMap.fir.txt @@ -1,4 +1,4 @@ FILE: main.kt public final fun test(executor: R|BuildActionExecuter|, modelType: R|java/lang/Class|, env: R|kotlin/collections/Map|): R|kotlin/Unit| { - lval model: R|ft!>, BuildActionExecuter!>?>!| = R|/executor|.R|SubstitutionOverride!>, BuildActionExecuter!>?>!|>|(R|/env|) + lval model: R|ft>, BuildActionExecuter>?>| = R|/executor|.R|SubstitutionOverride>, BuildActionExecuter>?>|>|(R|/env|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.fir.txt b/compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.fir.txt index 9ef553ca14f..335695f9393 100644 --- a/compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.fir.txt @@ -20,13 +20,13 @@ FILE: main.kt } public final fun test_1(): R|kotlin/Unit| { - lval map: R|util/HashMap!, ft!>| = R|util/HashMap.HashMap|!|, R|ft!|>() + lval map: R|util/HashMap, ft>| = R|util/HashMap.HashMap||, R|ft|>() } public final fun test_2(): R|kotlin/Unit| { lval set: R|util/HashSet| = R|util/HashSet.HashSet|() } public final fun test_3(): R|kotlin/Unit| { - lval list: R|foo/ArrayList!>| = R|foo/ArrayList.ArrayList|!|>() + lval list: R|foo/ArrayList>| = R|foo/ArrayList.ArrayList||>() } public final fun test_4(): R|kotlin/Unit| { lval list: R|foo/LinkedList| = R|foo/LinkedList.LinkedList|() diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.fir.txt index 8df815368a9..7b7af18f200 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.fir.txt @@ -5,7 +5,7 @@ FILE: KotlinImporterComponent.kt } public final class State : R|kotlin/Any| { - public constructor(directories: R|kotlin/collections/List| = R|java/util/ArrayList.ArrayList|!|>()): R|simulation/KotlinImporterComponent.State| { + public constructor(directories: R|kotlin/collections/List| = R|java/util/ArrayList.ArrayList||>()): R|simulation/KotlinImporterComponent.State| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndFlexibleType.fir.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndFlexibleType.fir.txt index 9e39732060b..984850a63b4 100644 --- a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndFlexibleType.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndFlexibleType.fir.txt @@ -15,7 +15,7 @@ FILE: main.kt } public final fun test_1(): R|kotlin/Unit| { - lval e: R|ft!| = Q|Utils|.R|/Utils.getEnum|() + lval e: R|ft| = Q|Utils|.R|/Utils.getEnum|() lval s: R|kotlin/String| = when (R|/e|) { ==($subj$, Null(null)) -> { ^test_1 Unit @@ -34,7 +34,7 @@ FILE: main.kt R|/s|.R|kotlin/String.length| } public final fun test_2(): R|kotlin/Unit| { - lval e: R|ft!| = Q|Utils|.R|/Utils.getEnum|() + lval e: R|ft| = Q|Utils|.R|/Utils.getEnum|() lval s: R|kotlin/String| = when (R|/e|) { ==($subj$, Q|E|.R|/E.A|) -> { String() diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt index 5e723192c7e..cc161aa2fcd 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt @@ -13,10 +13,10 @@ FILE: test.kt lval element: R|DE| = R|/d|.R|/Diagnostic.element| R|/Fix.Fix|(R|/element|) } - private final val DERIVED_FACTORY: R|DiagnosticFactory0!>| = R|/DiagnosticFactory0.DiagnosticFactory0|!|>() - private get(): R|DiagnosticFactory0!>| + private final val DERIVED_FACTORY: R|DiagnosticFactory0>| = R|/DiagnosticFactory0.DiagnosticFactory0||>() + private get(): R|DiagnosticFactory0>| public final fun createViaFactory(d: R|EmptyDiagnostic|): R|kotlin/Unit| { - lval casted: R|Diagnostic!>| = R|/DERIVED_FACTORY|.R|SubstitutionOverride!>|>|(R|/d|) + lval casted: R|Diagnostic>| = R|/DERIVED_FACTORY|.R|SubstitutionOverride>|>|(R|/d|) lval element: R|DerivedElement| = R|/casted|.R|/Diagnostic.element| R|/Fix.Fix|(R|/element|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt index 2ffa96454fd..53ce584047d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt @@ -1,5 +1,5 @@ FILE: test.kt public final fun test(): R|kotlin/Unit| { - lval staticReference: R|kotlin/reflect/KMutableProperty0!>| = Q|JavaClass|::R|/JavaClass.staticField| - lval nonStaticReference: R|kotlin/reflect/KMutableProperty1!>| = Q|JavaClass|::R|/JavaClass.nonStaticField| + lval staticReference: R|kotlin/reflect/KMutableProperty0>| = Q|JavaClass|::R|/JavaClass.staticField| + lval nonStaticReference: R|kotlin/reflect/KMutableProperty1>| = Q|JavaClass|::R|/JavaClass.nonStaticField| } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt index 6840cf1e02e..b8078b8094c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt @@ -37,7 +37,7 @@ FILE: O.kt } public final fun local(): R|kotlin/Unit| { - lval y: R|ft!| = this@R|/O.Derived|.R|/Base.foo|() + lval y: R|ft| = this@R|/O.Derived|.R|/Base.foo|() } public final val oo: R|| = object : R|kotlin/Any| { @@ -66,7 +66,7 @@ FILE: O.kt } public final fun local(): R|kotlin/Unit| { - lval y: R|ft!| = this@R|/O.Derived|.R|/Base.foo|() + lval y: R|ft| = this@R|/O.Derived|.R|/Base.foo|() } } diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt index 9ad108acef4..11d5d96abda 100644 --- a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt @@ -1,6 +1,6 @@ FILE: flexibleTypeBug.kt public final fun foo(): R|kotlin/Unit| { - lvar list1: R|ft!>, kotlin/collections/List!>?>!| = Q|java/util/Collections|.R|java/util/Collections.emptyList|!|>() + lvar list1: R|ft>, kotlin/collections/List>?>| = Q|java/util/Collections|.R|java/util/Collections.emptyList||>() lval list2: R|kotlin/collections/List| = R|kotlin/collections/listOf|(String(b)) - R|/list1| = R|/list1|.R|kotlin/collections/plus|!|>(R|/list2|) + R|/list1| = R|/list1|.R|kotlin/collections/plus||>(R|/list2|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.fir.txt b/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.fir.txt index ddfbabd241b..32d1c65669b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.fir.txt @@ -4,5 +4,5 @@ FILE: main.kt public final fun foo(b: R|B|): R|kotlin/Unit| { } public final fun main(b: R|B<*>|): R|kotlin/Unit| { - R|/foo|!|>(R|/b|) + R|/foo||>(R|/b|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt b/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt index 587d6730f8d..303015e0723 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt @@ -7,5 +7,5 @@ FILE: main.kt } public final fun main(): R|kotlin/Unit| { R|/K.K|(Int(0)) - R|/JavaClass.JavaClass|!|>(Int(0)) + R|/JavaClass.JavaClass||>(Int(0)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt b/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt index 261a6dbb0d6..6c2668cf6f1 100644 --- a/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt @@ -1,5 +1,5 @@ FILE: main.kt public final fun test(a: R|A|): R|kotlin/Unit| { lval int: R|kotlin/Int| = R|/a|.R|/A.x| - lval string: R|ft!| = R|/a|.R|/A.getX|() + lval string: R|ft| = R|/a|.R|/A.getX|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt b/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt index 242b737e00b..8f3b3c8fab3 100644 --- a/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt @@ -1,4 +1,4 @@ FILE: main.kt public final fun main(): R|kotlin/Unit| { - lval b: R|ft!| = Q|B|.R|/B.VALUE| + lval b: R|ft| = Q|B|.R|/B.VALUE| } diff --git a/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt b/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt index bd5c39875af..3ab56124c9c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt @@ -24,7 +24,7 @@ FILE: main.kt } public final fun callJava(derived: R|Test.Derived|, derivedRaw: R|Test.DerivedRaw|, v: R|Test.I123|): R|kotlin/Unit| { - R|/derived|.R|/Test.Derived.foo|!|>(R|/v|) + R|/derived|.R|/Test.Derived.foo||>(R|/v|) R|/derivedRaw|.R|/Test.DerivedRaw.foo|(R|/v|) } public final fun callKotlin(derived: R|KDerived|): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt b/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt index f816262f368..87ca7e2b9aa 100644 --- a/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt @@ -1,4 +1,4 @@ FILE: main.kt public final fun main(): R|kotlin/Unit| { - R|/JavaClass.JavaClass|!|>(Null(null)).R|SubstitutionOverride!|>|().R|kotlin/String.length| + R|/JavaClass.JavaClass||>(Null(null)).R|SubstitutionOverride|>|().R|kotlin/String.length| } diff --git a/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt b/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt index 74283bc868c..1c1ae5491d7 100644 --- a/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt @@ -1,10 +1,10 @@ FILE: main.kt public final fun test_1(x: R|A|): R|kotlin/Unit| { - lval str1: R|ft!| = R|/x|.R|/A.vmParameters| + lval str1: R|ft| = R|/x|.R|/A.vmParameters| lval str2: R|ERROR CLASS: Unresolved name: vMParameters| = R|/x|.# } public final fun test_2(x: R|B|): R|kotlin/Unit| { - lval int: R|ft!| = R|/x|.R|/B.vmParameters| + lval int: R|ft| = R|/x|.R|/B.vmParameters| lval error: R|ERROR CLASS: Unresolved name: vMParameters| = R|/x|.# } public final fun test_3(x: R|C|): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt b/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt index e06e80d4aa7..7b301b8d687 100644 --- a/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt @@ -1,6 +1,6 @@ FILE: main.kt public final fun foo(): R|kotlin/Unit| { - Q|RawType|.R|/RawType.bar|( = bar@fun (it: R|ft!|): R|kotlin/Boolean| { + Q|RawType|.R|/RawType.bar|( = bar@fun (it: R|ft|): R|kotlin/Boolean| { ^ CMP(>, R|/it|.R|kotlin/CharSequence.length|.R|kotlin/Int.compareTo|(Int(0))) } ) diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt index 3b88a0aa9ec..b9f47d82d6d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt @@ -1,14 +1,14 @@ FILE: main.kt public final fun main(): R|kotlin/Unit| { - R|/MyFunction|!|, R|ft!|>( = MyFunction@fun (x: R|ft!|): R|ft!| { + R|/MyFunction||, R|ft|>( = MyFunction@fun (x: R|ft|): R|ft| { ^ R|/x|.R|kotlin/Int.toInt|().R|kotlin/Any.toString|() } ) - R|/MyFunction|!|, R|ft!|>( = MyFunction@fun (x: R|kotlin/Int|): R|ft!| { + R|/MyFunction||, R|ft|>( = MyFunction@fun (x: R|kotlin/Int|): R|ft| { ^ R|/x|.R|kotlin/Any.toString|() } ) - R|/MyFunction|( = MyFunction@fun (x: R|ft!|): R|kotlin/Any?| { + R|/MyFunction|( = MyFunction@fun (x: R|ft|): R|kotlin/Any?| { ^ String() } ) diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt index 3feb87eebc0..0ebe6b8ca81 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt @@ -6,23 +6,23 @@ FILE: main.kt public final fun foo3(f: R|MyFunction|, x: R|X|): R|kotlin/Unit| { } public final fun main(): R|kotlin/Unit| { - R|/foo1|(R|/MyFunction|( = MyFunction@fun (x: R|ft!|): R|ft!| { + R|/foo1|(R|/MyFunction|( = MyFunction@fun (x: R|ft|): R|ft| { ^ R|/x|.R|kotlin/Int.toInt|().R|kotlin/Any.toString|() } )) - R|/foo2|(R|/MyFunction|!|>( = MyFunction@fun (x: R|ft!|): R|ft!| { + R|/foo2|(R|/MyFunction||>( = MyFunction@fun (x: R|ft|): R|ft| { ^ R|/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|() } )) - #(R|/MyFunction|!|>( = MyFunction@fun (x: R|kotlin/Int|): R|ft!| { + #(R|/MyFunction||>( = MyFunction@fun (x: R|kotlin/Int|): R|ft| { ^ R|/x|.R|kotlin/Any.toString|() } )) - R|/foo3|!|>(R|/MyFunction|!|>( = MyFunction@fun (x: R|ft!|): R|ft!| { + R|/foo3||>(R|/MyFunction||>( = MyFunction@fun (x: R|ft|): R|ft| { ^ R|/x|.R|kotlin/Int.plus|(Int(1)).R|kotlin/Any.toString|() } ), Int(1)) - R|/foo3|!|>(R|/MyFunction|!|>( = MyFunction@fun (x: R|kotlin/Number|): R|ft!| { + R|/foo3||>(R|/MyFunction||>( = MyFunction@fun (x: R|kotlin/Number|): R|ft| { ^ R|/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|() } ), Int(2)) diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt index c7a7a81700f..fe29b0afae9 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt @@ -1,22 +1,22 @@ FILE: main.kt public final fun main(): R|kotlin/Unit| { - Q|JavaUsage|.R|/JavaUsage.foo1|( = foo1@fun (x: R|ft!|): R|ft!| { + Q|JavaUsage|.R|/JavaUsage.foo1|( = foo1@fun (x: R|ft|): R|ft| { ^ R|/x|.R|kotlin/Int.toInt|().R|kotlin/Any.toString|() } ) - Q|JavaUsage|.R|/JavaUsage.foo2|( = foo2@fun (x: R|ft!|): R|ft!| { + Q|JavaUsage|.R|/JavaUsage.foo2|( = foo2@fun (x: R|ft|): R|ft| { ^ R|/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|() } ) - Q|JavaUsage|.#( = foo2@fun (x: R|kotlin/Int|): R|ft!| { + Q|JavaUsage|.#( = foo2@fun (x: R|kotlin/Int|): R|ft| { ^ R|/x|.R|kotlin/Any.toString|() } ) - Q|JavaUsage|.R|/JavaUsage.foo3|!|, R|ft!|>(foo3@fun (x: R|ft!|): R|ft!| { + Q|JavaUsage|.R|/JavaUsage.foo3||, R|ft|>(foo3@fun (x: R|ft|): R|ft| { ^ R|/x|.R|kotlin/Int.plus|(Int(1)).R|kotlin/Any.toString|() } , Int(1)) - Q|JavaUsage|.R|/JavaUsage.foo3|!|, R|ft!|>(foo3@fun (x: R|kotlin/Number|): R|ft!| { + Q|JavaUsage|.R|/JavaUsage.foo3||, R|ft|>(foo3@fun (x: R|kotlin/Number|): R|ft| { ^ R|/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|() } , Int(2)) diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt index b3cda246e11..ff262254ccd 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt @@ -2,11 +2,11 @@ FILE: main.kt public final fun foo(m: R|MyRunnable|): R|kotlin/Unit| { } public final fun main(): R|kotlin/Unit| { - Q|JavaUsage|.R|/JavaUsage.foo|( = foo@fun (x: R|kotlin/Int|): R|ft!| { + Q|JavaUsage|.R|/JavaUsage.foo|( = foo@fun (x: R|kotlin/Int|): R|ft| { ^ CMP(>, R|/x|.R|kotlin/Int.compareTo|(Int(1))) } ) - Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun (it: R|kotlin/Int|): R|ft!| { + Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun (it: R|kotlin/Int|): R|ft| { ^ CMP(>, R|/it|.R|kotlin/Int.compareTo|(Int(1))) } ) diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt index a6d69638131..39eaf95d2a5 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt @@ -5,7 +5,7 @@ FILE: main.kt } public final fun main(): R|kotlin/Unit| { - Q|OverridingUtil|.R|/OverridingUtil.createWithEqualityAxioms|( = l1@fun (c1: R|ft!|, c2: R|ft!|): R|kotlin/Boolean| { + Q|OverridingUtil|.R|/OverridingUtil.createWithEqualityAxioms|( = l1@fun (c1: R|ft|, c2: R|ft|): R|kotlin/Boolean| { when () { ==(R|/c1|.R|/TypeConstructor.x|, R|/c2|.R|/TypeConstructor.x|) -> { ^@l1 Boolean(true) diff --git a/compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt b/compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt index 196fc39dbae..7a37c00bb72 100644 --- a/compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt @@ -16,7 +16,7 @@ FILE: Main.kt R|/takeStrings|(R|/list|) } public final fun testFromJava(): R|kotlin/Unit| { - lval values: R|ft!>, kotlin/Array!>?>!| = Q|Utils|.R|/Utils.getStrings|() - lval list: R|kotlin/collections/List!>| = R|/myListOf|!|>(vararg(*R|/values|)) + lval values: R|ft>, kotlin/Array>?>| = Q|Utils|.R|/Utils.getStrings|() + lval list: R|kotlin/collections/List>| = R|/myListOf||>(vararg(*R|/values|)) R|/takeStrings|(R|/list|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt index 605b27477c0..2d8a79801dc 100644 --- a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt @@ -1,5 +1,5 @@ FILE: main.kt public final fun main(): R|kotlin/Unit| { - Q|Keys|.R|/Keys.getData|!>, kotlin/Array!>?>!|>(Q|Keys|.R|/Keys.X|).R|SubstitutionOverride!|>|(Int(0)).R|kotlin/String.length| - Q|Keys|.R|/Keys.getData|!|>(Q|Keys|.R|/Keys.Y|).R|kotlin/String.length| + Q|Keys|.R|/Keys.getData|>, kotlin/Array>?>|>(Q|Keys|.R|/Keys.X|).R|SubstitutionOverride|>|(Int(0)).R|kotlin/String.length| + Q|Keys|.R|/Keys.getData||>(Q|Keys|.R|/Keys.Y|).R|kotlin/String.length| } diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt index 8a458e211f8..04e5bf76224 100644 --- a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt @@ -1,5 +1,5 @@ FILE: main.kt public final fun main(x: R|kotlin/collections/MutableCollection>|): R|kotlin/Unit| { - lval y: R|ft!>, kotlin/collections/List!>?>!| = Q|ContainerUtil|.R|/ContainerUtil.flatten|!|>(R|/x|) - R|/y|.R|SubstitutionOverride!|>|(Int(0)).R|kotlin/String.length| + lval y: R|ft>, kotlin/collections/List>?>| = Q|ContainerUtil|.R|/ContainerUtil.flatten||>(R|/x|) + R|/y|.R|SubstitutionOverride|>|(Int(0)).R|kotlin/String.length| } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/referenceToJavaStdlib.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/referenceToJavaStdlib.fir.txt index 3c86f71ddf9..2a18d2d4c33 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/referenceToJavaStdlib.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/referenceToJavaStdlib.fir.txt @@ -1,6 +1,6 @@ FILE: referenceToJavaStdlib.kt public final fun detectDirsWithTestsMapFileOnly(file: R|java/io/File|): R|kotlin/collections/List| { - Q|java/nio/file/Files|.R|java/nio/file/Files.walk|(R|/file|.R|java/io/File.toPath|()).R|SubstitutionOverride!>, java/util/stream/Stream!>?>!|>|(Q|java/nio/file/Files|::R|java/nio/file/Files.isRegularFile|) + Q|java/nio/file/Files|.R|java/nio/file/Files.walk|(R|/file|.R|java/io/File.toPath|()).R|SubstitutionOverride>, java/util/stream/Stream>?>|>|(Q|java/nio/file/Files|::R|java/nio/file/Files.isRegularFile|) } public abstract interface A : R|kotlin/Any| { } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.fir.txt index e26e679dc4a..a168fc30773 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.fir.txt @@ -5,8 +5,8 @@ FILE: concurrentMapOfAliases.kt super() } - private final val foo: R|java/util/concurrent/ConcurrentHashMap!, ft!>| = Q|java/util/concurrent|.R|java/util/concurrent/ConcurrentHashMap.ConcurrentHashMap|!|, R|ft!|>() - private get(): R|java/util/concurrent/ConcurrentHashMap!, ft!>| + private final val foo: R|java/util/concurrent/ConcurrentHashMap, ft>| = Q|java/util/concurrent|.R|java/util/concurrent/ConcurrentHashMap.ConcurrentHashMap||, R|ft|>() + private get(): R|java/util/concurrent/ConcurrentHashMap, ft>| private final fun bar(): R|kotlin/Unit| { this@R|/A|.R|/A.foo|.R|SubstitutionOverride|(String(dd))?.{ (this@R|/A|, $subj$).R|/A.baz|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.fir.txt index f8be70de077..db65b15553e 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.fir.txt @@ -16,10 +16,10 @@ FILE: simpleDelegatedToMap.kt } } - public final var bar: R|ft!|by R|kotlin/collections/hashMapOf|() - public get(): R|ft!| { - ^ D|/bar|.R|kotlin/collections/getValue|!|, R|ft!|>(Null(null), ::R|/bar|) + public final var bar: R|ft|by R|kotlin/collections/hashMapOf|() + public get(): R|ft| { + ^ D|/bar|.R|kotlin/collections/getValue||, R|ft|>(Null(null), ::R|/bar|) } - public set(: R|ft!|): R|kotlin/Unit| { - D|/bar|.R|kotlin/collections/setValue|!|>(Null(null), ::R|/bar|, R|/bar|) + public set(: R|ft|): R|kotlin/Unit| { + D|/bar|.R|kotlin/collections/setValue||>(Null(null), ::R|/bar|, R|/bar|) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashSet.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashSet.fir.txt index bd2a9176eb3..6533237f756 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashSet.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashSet.fir.txt @@ -1,10 +1,10 @@ FILE: hashSet.kt - public final val a: R|kotlin/collections/MutableSet?| = R|java/util/HashSet.HashSet|!|>() + public final val a: R|kotlin/collections/MutableSet?| = R|java/util/HashSet.HashSet||>() public get(): R|kotlin/collections/MutableSet?| public final var b: R|kotlin/collections/MutableSet?| = Null(null) public get(): R|kotlin/collections/MutableSet?| public set(_: R|kotlin/collections/MutableSet?|): R|kotlin/Unit| { - F|/b| = R|java/util/HashSet.HashSet|!|>() + F|/b| = R|java/util/HashSet.HashSet||>() } public final var R|kotlin/collections/MutableSet|.d: R|T?| public get(): R|T?| { @@ -17,6 +17,6 @@ FILE: hashSet.kt } public final fun foo(): R|kotlin/Unit| { lvar c: R|kotlin/collections/MutableSet?| = Null(null) - R|/c| = R|java/util/HashSet.HashSet|!|>() + R|/c| = R|java/util/HashSet.HashSet||>() R|/c|!!.R|/d| = R|/produce|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.fir.txt index c655e1d2a89..347fada7da3 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.fir.txt @@ -13,7 +13,7 @@ FILE: hashTableWithForEach.kt public get(): R|kotlin/collections/MutableSet>| { when () { R|/DEBUG| -> { - ^ Q|java/util/Collections|.R|java/util/Collections.unmodifiableSet|, kotlin/collections/MutableMap.MutableEntry?>!|>(R|kotlin/collections/mutableSetOf||>().R|kotlin/apply|>|>( = apply@fun R|kotlin/collections/MutableSet>|.(): R|kotlin/Unit| { + ^ Q|java/util/Collections|.R|java/util/Collections.unmodifiableSet|, kotlin/collections/MutableMap.MutableEntry?>|>(R|kotlin/collections/mutableSetOf||>().R|kotlin/apply|>|>( = apply@fun R|kotlin/collections/MutableSet>|.(): R|kotlin/Unit| { this@R|/SomeHashTable|.R|/SomeHashTable.forEach|( = forEach@fun (key: R|K|, value: R|V|): R|kotlin/Unit| { this@R|special/anonymous|.R|SubstitutionOverride|(R|SubstitutionOverride|(R|/key|, R|/value|)) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt index 3e15c6ad343..c2edebe437d 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt @@ -1,3 +1,3 @@ FILE: main.kt - public final val enumMap: R|java/util/EnumMap!, ft!>| = R|java/util/EnumMap.EnumMap|!|, R|ft!|>(R|kotlin/collections/mapOf|!|, R|kotlin/String|>(Q|JavaEnum|.R|/JavaEnum.A|.R|kotlin/to|(String(A)))) - public get(): R|java/util/EnumMap!, ft!>| + public final val enumMap: R|java/util/EnumMap, ft>| = R|java/util/EnumMap.EnumMap||, R|ft|>(R|kotlin/collections/mapOf||, R|kotlin/String|>(Q|JavaEnum|.R|/JavaEnum.A|.R|kotlin/to|(String(A)))) + public get(): R|java/util/EnumMap, ft>| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt index 400879460b9..e47322ac9ac 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt @@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt } public final fun test(): R|kotlin/Unit| { - this@R|/B|.R|SubstitutionOverride!|>|(R|/Some.Some|()) + this@R|/B|.R|SubstitutionOverride|>|(R|/Some.Some|()) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt index ed62ac94baf..a0f43dc1dbc 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt @@ -7,7 +7,7 @@ FILE: jvm.kt public final fun test(): R|kotlin/Unit| { lval res1: R|kotlin/Boolean| = this@R|/A|.R|/Some.foo|(Int(1)) lval res2: R|kotlin/Boolean| = this@R|/A|.R|/Some.foo|(Int(-1)) - lval res3: R|ft!>, kotlin/Array!>?>!| = this@R|/A|.R|/Some.bar|(R|kotlin/intArrayOf|(vararg(Int(0), Int(2), Int(-2)))) + lval res3: R|ft>, kotlin/Array>?>| = this@R|/A|.R|/Some.bar|(R|kotlin/intArrayOf|(vararg(Int(0), Int(2), Int(-2)))) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt index a9aed2b659c..1ca517a721d 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt @@ -1,14 +1,14 @@ FILE: main.kt public final fun main(): R|kotlin/Unit| { - Q|JavaClass|.R|/JavaClass.foo1|( = foo1@fun (): R|ft!| { + Q|JavaClass|.R|/JavaClass.foo1|( = foo1@fun (): R|ft| { ^ Int(123) } ) - Q|JavaClass|.R|/JavaClass.foo2|( = foo2@fun (it: R|ft!|): R|ft!| { + Q|JavaClass|.R|/JavaClass.foo2|( = foo2@fun (it: R|ft|): R|ft| { ^ R|/it|.R|kotlin/Int.plus|(Int(2)).R|kotlin/Any.toString|() } ) - Q|JavaClass|.R|/JavaClass.foo2|(foo2@fun (it: R|ft!|): R|ft!| { + Q|JavaClass|.R|/JavaClass.foo2|(foo2@fun (it: R|ft|): R|ft| { ^ R|/it|.R|kotlin/Int.plus|(Int(3)).R|kotlin/Any.toString|() } ) @@ -17,7 +17,7 @@ FILE: main.kt } Q|JavaClass|.R|/JavaClass.foo2|(R|/y|) - Q|JavaClass|.R|/JavaClass.foo3|!|>(foo3@fun (it: R|ft!|): R|ft!| { + Q|JavaClass|.R|/JavaClass.foo3||>(foo3@fun (it: R|ft|): R|ft| { ^ R|/it|.R|kotlin/Int.plus|(Int(4)).R|kotlin/Any.toString|() } , Int(5)) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt index a1795b34d90..3dabd7ee17c 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt @@ -3,5 +3,5 @@ FILE: test.kt ^select R|/x| } public final fun test(d1: R|DiagnosticWithParameters1<*, *>|, d2: R|DiagnosticWithParameters2<*, *, *>|): R|kotlin/Unit| { - lval res: R|ft!| = R|jvm/select|!|>(R|/d1|.R|/DiagnosticWithParameters1.a|, R|/d2|.R|/DiagnosticWithParameters2.b|) + lval res: R|ft| = R|jvm/select||>(R|/d1|.R|/DiagnosticWithParameters1.a|, R|/d2|.R|/DiagnosticWithParameters2.b|) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt index 3ed448a15ad..52a5460f59a 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt @@ -1,8 +1,8 @@ FILE: Test.kt public final fun test(): R|kotlin/Unit| { lval jc: R|JavaClass| = R|/JavaClass.JavaClass|() - lval result: R|ft!| = R|/jc|.R|/JavaClass.text| + lval result: R|ft| = R|/jc|.R|/JavaClass.text| } public final fun otherTest(jc: R|JavaClass|): R|kotlin/Unit| { - lval result: R|ft!| = R|/jc|.R|/JavaClass.text| + lval result: R|ft| = R|/jc|.R|/JavaClass.text| } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt index a751a98a432..ce01d359515 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt @@ -1,3 +1,3 @@ FILE: test.kt - public final val x: R|ft!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo| - public get(): R|ft!| + public final val x: R|ft| = R|/JavaClass.JavaClass|().R|/JavaClass.foo| + public get(): R|ft| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt index c73fe5ddeef..db1ea806092 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt @@ -16,7 +16,7 @@ FILE: K2.kt } public final fun bar(): R|kotlin/Unit| { - this@R|/K2|.R|SubstitutionOverride!|>|(Int(1)) + this@R|/K2|.R|SubstitutionOverride|>|(Int(1)) this@R|/K2|.R|/J1.baz|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt index f14d31a1cfa..467bb7328ef 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt @@ -7,7 +7,7 @@ FILE: K1.kt } FILE: K2.kt public final fun main(): R|kotlin/Unit| { - Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|!|>()) + Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass||>()) Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|()) Q|JavaClass|.#(R|/KotlinClass.KotlinClass|()) Q|JavaClass|.#(String()) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt index 5ee849464da..8bed91fdeef 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt @@ -1,6 +1,6 @@ FILE: test.kt public final fun test(): R|kotlin/Unit| { - lval logger: R|ft!| = Q|Logger|.R|/Logger.getInstance|(String(test)) + lval logger: R|ft| = Q|Logger|.R|/Logger.getInstance|(String(test)) } public final class MyTest : R|kotlin/Any| { public constructor(): R|MyTest| { @@ -10,7 +10,7 @@ FILE: test.kt private final val klass: R|java/lang/Class| = (this@R|/MyTest|).R|kotlin/jvm/java| private get(): R|java/lang/Class| - private final val logger: R|ft!| = Q|Logger|.R|/Logger.getInstance|(this@R|/MyTest|.R|/MyTest.klass|) - private get(): R|ft!| + private final val logger: R|ft| = Q|Logger|.R|/Logger.getInstance|(this@R|/MyTest|.R|/MyTest.klass|) + private get(): R|ft| } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.fir.txt index b54366370df..7047443a9f9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.fir.txt @@ -1,6 +1,6 @@ FILE: MapCompute.kt public final fun R|kotlin/collections/MutableMap>|.initAndAdd(key: R|kotlin/String|, value: R|D|): R|kotlin/Unit| { - this@R|/initAndAdd|.R|SubstitutionOverride?|>|(R|/key|, = compute@fun (_: R|ft!|, maybeValues: R|ft, kotlin/collections/MutableSet?>!|): R|ft, kotlin/collections/MutableSet?>!| { + this@R|/initAndAdd|.R|SubstitutionOverride?|>|(R|/key|, = compute@fun (_: R|ft|, maybeValues: R|ft, kotlin/collections/MutableSet?>|): R|ft, kotlin/collections/MutableSet?>| { lval setOfValues: R|kotlin/collections/MutableSet| = R|/maybeValues| ?: R|kotlin/collections/mutableSetOf|() R|/setOfValues|.R|SubstitutionOverride|(R|/value|) ^ R|/setOfValues| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt index 51d578095bb..e64c57a0215 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt @@ -7,7 +7,7 @@ FILE: main.kt } public final fun test(): R|kotlin/Unit| { lval b: R|MyMapEntry| = R|/MyMapEntry.MyMapEntry|() - lval key: R|ft!| = R|/b|.R|/Test.MapEntryImpl.key| - lval value: R|ft!| = R|/b|.R|/Test.MapEntryImpl.value| + lval key: R|ft| = R|/b|.R|/Test.MapEntryImpl.key| + lval value: R|ft| = R|/b|.R|/Test.MapEntryImpl.value| R|/b|.R|/Test.MapEntryImpl.setValue|(Null(null)) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt index 9851d0be53c..fbbffb1a4b4 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt @@ -8,15 +8,15 @@ FILE: test.kt public final fun test(e: R|MyException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| { R|/e|.R|java/lang/Throwable.printStackTrace|() R|/e|.R|java/lang/Throwable.printStackTrace|(R|/stream|) - lval result: R|ft!| = R|/e|.R|java/lang/Throwable.getLocalizedMessage|() + lval result: R|ft| = R|/e|.R|java/lang/Throwable.getLocalizedMessage|() } public final fun test(e: R|YourException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| { R|/e|.R|java/lang/Throwable.printStackTrace|() R|/e|.R|java/lang/Throwable.printStackTrace|(R|/stream|) - lval result: R|ft!| = R|/e|.R|java/lang/Throwable.getLocalizedMessage|() + lval result: R|ft| = R|/e|.R|java/lang/Throwable.getLocalizedMessage|() } public final fun test(e: R|kotlin/Exception|, stream: R|java/io/PrintStream|): R|kotlin/Unit| { R|/e|.R|java/lang/Throwable.printStackTrace|() R|/e|.R|java/lang/Throwable.printStackTrace|(R|/stream|) - lval result: R|ft!| = R|/e|.R|java/lang/Throwable.getLocalizedMessage|() + lval result: R|ft| = R|/e|.R|java/lang/Throwable.getLocalizedMessage|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt index 38b30aa4608..2f5e2333996 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt @@ -1,12 +1,12 @@ FILE: test.kt public abstract interface UseIterable : R|MyIterable| { public open fun test(): R|kotlin/Unit| { - lval it: R|kotlin/collections/MutableIterator!>| = this@R|/UseIterable|.R|SubstitutionOverride!>|>|() - lval split: R|java/util/Spliterator!>| = this@R|/UseIterable|.R|SubstitutionOverride!>|>|() + lval it: R|kotlin/collections/MutableIterator>| = this@R|/UseIterable|.R|SubstitutionOverride>|>|() + lval split: R|java/util/Spliterator>| = this@R|/UseIterable|.R|SubstitutionOverride>|>|() } } public final fun test(some: R|kotlin/collections/Iterable|): R|kotlin/Unit| { lval it: R|kotlin/collections/Iterator| = R|/some|.R|SubstitutionOverride|>|() - lval split: R|java/util/Spliterator!>| = R|/some|.R|SubstitutionOverride!>|>|() + lval split: R|java/util/Spliterator>| = R|/some|.R|SubstitutionOverride>|>|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt index 59a683fff4e..408b189c1f4 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt @@ -1,20 +1,20 @@ FILE: test.kt public final fun test(map: R|MyMap|): R|kotlin/Unit| { - lval result: R|ft!| = R|/map|.R|kotlin/collections/getOrPut|!|, R|ft!|>(String(key), = getOrPut@fun (): R|ft!| { + lval result: R|ft| = R|/map|.R|kotlin/collections/getOrPut||, R|ft|>(String(key), = getOrPut@fun (): R|ft| { ^ String(value) } ) - lval otherResult: R|ft!| = R|/map|.R|SubstitutionOverride!|>|(String(key), String(value)) + lval otherResult: R|ft| = R|/map|.R|SubstitutionOverride|>|(String(key), String(value)) lval anotherResult: R|kotlin/String?| = R|/map|.R|SubstitutionOverride|(String(key), String(value)) - R|/map|.R|SubstitutionOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { + R|/map|.R|SubstitutionOverride|( = forEach@fun (key: R|ft|, value: R|ft|): R|kotlin/Unit| { R|kotlin/io/println|((R|/key|.R|kotlin/Any.toString|(), String(: ), R|/value|.R|kotlin/Any.toString|())) R|/key|.R|kotlin/String.length| R|/value|.R|kotlin/String.length| } ) - R|/map|.R|kotlin/collections/forEach|!|, R|ft!|>( = forEach@fun (: R|kotlin/collections/Map.Entry!, ft!>|): R|kotlin/Unit| { - lval key: R|ft!| = R|/|.R|kotlin/collections/component1|!|, R|ft!|>() - lval value: R|ft!| = R|/|.R|kotlin/collections/component2|!|, R|ft!|>() + R|/map|.R|kotlin/collections/forEach||, R|ft|>( = forEach@fun (: R|kotlin/collections/Map.Entry, ft>|): R|kotlin/Unit| { + lval key: R|ft| = R|/|.R|kotlin/collections/component1||, R|ft|>() + lval value: R|ft| = R|/|.R|kotlin/collections/component2||, R|ft|>() R|kotlin/io/println|((R|/key|.R|kotlin/Any.toString|(), String(: ), R|/value|.R|kotlin/Any.toString|())) R|/key|.R|kotlin/String.length| R|/value|.R|kotlin/String.length| @@ -28,7 +28,7 @@ FILE: test.kt ) lval otherResult: R|kotlin/String| = R|/map|.R|SubstitutionOverride|(String(key), String(value)) lval anotherResult: R|kotlin/String?| = R|/map|.R|SubstitutionOverride|(String(key), String(value)) - R|/map|.R|SubstitutionOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { + R|/map|.R|SubstitutionOverride|( = forEach@fun (key: R|ft|, value: R|ft|): R|kotlin/Unit| { R|kotlin/io/println|((R|/key|.R|kotlin/Any.toString|(), String(: ), R|/value|.R|kotlin/Any.toString|())) R|/key|.R|kotlin/String.length| R|/value|.R|kotlin/String.length| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt index 4f5ef00241c..61465c0418c 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt @@ -1,5 +1,5 @@ FILE: main.kt public final fun test(): R|kotlin/Unit| { - lval project: R|ft!| = Q|PlatformDataKeys|.R|/CommonDataKeys.PROJECT| - lval member: R|ft!| = R|/PlatformDataKeys.PlatformDataKeys|().R|/CommonDataKeys.MEMBER| + lval project: R|ft| = Q|PlatformDataKeys|.R|/CommonDataKeys.PROJECT| + lval member: R|ft| = R|/PlatformDataKeys.PlatformDataKeys|().R|/CommonDataKeys.MEMBER| } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt index 61f0fa633ed..0098712eeb5 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt @@ -13,7 +13,7 @@ FILE: User.kt protected abstract fun createSettings(): R|T| public final fun foo(): R|kotlin/Unit| { - this@R|/User|.R|/User.settings| = Q|StaticOwner|.R|/StaticOwner.newInstance|!|>(this@R|/User|.R|/User.settings|.R|kotlin/jvm/javaClass|!|>) + this@R|/User|.R|/User.settings| = Q|StaticOwner|.R|/StaticOwner.newInstance||>(this@R|/User|.R|/User.settings|.R|kotlin/jvm/javaClass||>) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt index c456e26a268..0d6356b95e9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt @@ -1,13 +1,13 @@ FILE: test.kt public final fun R|Call|.testForEach(): R|kotlin/Unit| { - this@R|/testForEach|.R|/Call.arguments|.R|SubstitutionOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { + this@R|/testForEach|.R|/Call.arguments|.R|SubstitutionOverride|( = forEach@fun (key: R|ft|, value: R|ft|): R|kotlin/Unit| { R|/key|.R|kotlin/String.length| R|/value|.R|kotlin/String.length| } ) - this@R|/testForEach|.R|/Call.arguments|.R|kotlin/collections/forEach|!|, R|ft!|>( = forEach@fun (it: R|kotlin/collections/Map.Entry!, ft!>|): R|kotlin/Unit| { - R|/it|.R|SubstitutionOverride!|>|.R|kotlin/String.length| - R|/it|.R|SubstitutionOverride!|>|.R|kotlin/String.length| + this@R|/testForEach|.R|/Call.arguments|.R|kotlin/collections/forEach||, R|ft|>( = forEach@fun (it: R|kotlin/collections/Map.Entry, ft>|): R|kotlin/Unit| { + R|/it|.R|SubstitutionOverride|>|.R|kotlin/String.length| + R|/it|.R|SubstitutionOverride|>|.R|kotlin/String.length| } ) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt index a287c0292f3..ca4b6e46110 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt @@ -1,4 +1,4 @@ FILE: capturedFlexible.kt public final fun foo(z: R|java/util/zip/ZipFile|): R|kotlin/Unit| { - R|/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|!|>() + R|/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence||>() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt index 66ee2e62e45..7f2283eb79b 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt @@ -1,4 +1,4 @@ FILE: main.kt public final fun bar(bindingContext: R|BindingContext|): R|kotlin/Unit| { - R|/bindingContext|.R|/BindingContext.get|!|, R|ft!|>(Q|Slices|.R|/Slices.X|, R|/bindingContext|.R|/BindingContext.get|!|, R|ft!|>(Q|Slices|.R|/Slices.Y|, Int(1))) + R|/bindingContext|.R|/BindingContext.get||, R|ft|>(Q|Slices|.R|/Slices.X|, R|/bindingContext|.R|/BindingContext.get||, R|ft|>(Q|Slices|.R|/Slices.Y|, Int(1))) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.fir.txt index 12c0220f823..4f801c0eae0 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.fir.txt @@ -4,5 +4,5 @@ FILE: main.kt public final typealias ImmutableLinkedHashSet = R|imm/LinkedHashSet| private final typealias ImmutableMultimap = R|ImmutableMap>| private final fun R|ImmutableMultimap|.put(key: R|K|, value: R|V|): R|kotlin/Unit| { - this@R|/put|.R|SubstitutionOverride, ImmutableSet?>!>, imm/Option, ImmutableSet?>!>?>!|>|(R|/key|).R|SubstitutionOverride, ImmutableSet?>!|>|(Q|ImmutableLinkedHashSet|.R|imm/LinkedHashSet.empty|!|>()) + this@R|/put|.R|SubstitutionOverride, ImmutableSet?>>, imm/Option, ImmutableSet?>>?>|>|(R|/key|).R|SubstitutionOverride, ImmutableSet?>|>|(Q|ImmutableLinkedHashSet|.R|imm/LinkedHashSet.empty||>()) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.fir.txt index 781baa70375..dfb0c9a39dd 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.fir.txt @@ -1,6 +1,6 @@ FILE: mapMerge.kt public final fun foo(x: R|kotlin/collections/MutableMap>|): R|kotlin/Unit| { - R|/x|.R|SubstitutionOverride?|>|(String(), R|kotlin/collections/listOf|(String()), = merge@fun (a: R|ft, kotlin/collections/List?>!|, b: R|ft, kotlin/collections/List?>!|): R|ft, kotlin/collections/List?>!| { + R|/x|.R|SubstitutionOverride?|>|(String(), R|kotlin/collections/listOf|(String()), = merge@fun (a: R|ft, kotlin/collections/List?>|, b: R|ft, kotlin/collections/List?>|): R|ft, kotlin/collections/List?>| { ^ R|/a|.R|kotlin/collections/plus|(R|/b|) } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/typeParameterUse.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/typeParameterUse.fir.txt index ea985b1cc2e..95513e37c10 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/typeParameterUse.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/typeParameterUse.fir.txt @@ -1,4 +1,4 @@ FILE: useSite.kt public final fun foo(holder: R|U|, box: R|Box|): R|kotlin/Int| { - ^foo R|/holder|.R|/U.getValue|!|>(R|/box|) + ^foo R|/holder|.R|/U.getValue||>(R|/box|) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt index 4fb6ca78632..efc98cf7d84 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt @@ -1,6 +1,6 @@ FILE: javaLangComparator.kt public final fun test_2(list: R|kotlin/collections/List|): R|kotlin/Unit| { - lval comp: R|java/util/Comparator!>| = Q|java/util|.R|java/util/Comparator|!|>( = Comparator@fun (x: R|ft!|, y: R|ft!|): R|kotlin/Int| { + lval comp: R|java/util/Comparator>| = Q|java/util|.R|java/util/Comparator||>( = Comparator@fun (x: R|ft|, y: R|ft|): R|kotlin/Int| { ^ Int(1) } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt index 9e94c1f750f..66a62f3a648 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt @@ -1,6 +1,6 @@ FILE: kotlinComparatorAlias.kt public final fun test_1(): R|kotlin/Unit| { - lval comp: R|java/util/Comparator!>| = R|java/util/Comparator|!|>( = Comparator@fun (x: R|ft!|, y: R|ft!|): R|kotlin/Int| { + lval comp: R|java/util/Comparator>| = R|java/util/Comparator||>( = Comparator@fun (x: R|ft|, y: R|ft|): R|kotlin/Int| { ^ Int(1) } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.fir.txt index 4ca2a2eec04..a7102190e78 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.fir.txt @@ -1,6 +1,6 @@ FILE: weakHashMap.kt - public final val someMap: R|java/util/WeakHashMap!, ft!>| = R|java/util/WeakHashMap.WeakHashMap|!|, R|ft!|>() - public get(): R|java/util/WeakHashMap!, ft!>| + public final val someMap: R|java/util/WeakHashMap, ft>| = R|java/util/WeakHashMap.WeakHashMap||, R|ft|>() + public get(): R|java/util/WeakHashMap, ft>| public final fun foo(): R|kotlin/Unit| { R|/someMap|.R|SubstitutionOverride|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.fir.txt index 0b335d855d9..a1bb195b429 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.fir.txt @@ -1,6 +1,6 @@ FILE: removeIf.kt public final fun test(collection: R|kotlin/collections/MutableCollection|): R|kotlin/Unit| { - R|/collection|.R|SubstitutionOverride|( = removeIf@fun (it: R|ft!|): R|kotlin/Boolean| { + R|/collection|.R|SubstitutionOverride|( = removeIf@fun (it: R|ft|): R|kotlin/Boolean| { ^ R|/it| } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt index 716965de6a4..6757e145567 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt @@ -2,7 +2,7 @@ FILE: samForComparator.kt public final fun foo(x: R|kotlin/Comparator|): R|kotlin/Unit| { } public final fun main(): R|kotlin/Unit| { - R|/foo|( = foo@fun (x: R|ft!|, y: R|ft!|): R|kotlin/Int| { + R|/foo|( = foo@fun (x: R|ft|, y: R|ft|): R|kotlin/Int| { ^ R|/x|.R|kotlin/CharSequence.length|.R|kotlin/Int.minus|(R|/y|.R|kotlin/CharSequence.length|) } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.fir.txt index 3f8196eab3e..25724df4b12 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.fir.txt @@ -9,9 +9,9 @@ FILE: typeAliasWithForEach.kt } public final typealias Arguments = R|kotlin/collections/Map| public final fun R|Arguments|.deepCopy(): R|Arguments| { - lval result: R|java/util/HashMap!, ft!>| = R|java/util/HashMap.HashMap|!|, R|ft!|>() - this@R|/deepCopy|.R|SubstitutionOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { - R|/result|.R|kotlin/collections/set|!|, R|ft!|>(R|/key|, R|/ArgsInfoImpl.ArgsInfoImpl|(R|/value|)) + lval result: R|java/util/HashMap, ft>| = R|java/util/HashMap.HashMap||, R|ft|>() + this@R|/deepCopy|.R|SubstitutionOverride|( = forEach@fun (key: R|ft|, value: R|ft|): R|kotlin/Unit| { + R|/result|.R|kotlin/collections/set||, R|ft|>(R|/key|, R|/ArgsInfoImpl.ArgsInfoImpl|(R|/value|)) } ) ^deepCopy R|/result| diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt index 8967d795c53..69cf72353f6 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt @@ -10,7 +10,7 @@ import kotlin.contracts.ExperimentalContracts import kotlin.contracts.contract fun ConeKotlinType.render(): String { - val nullabilitySuffix = if (this !is ConeKotlinErrorType && this !is ConeClassErrorType) nullability.suffix else "" + val nullabilitySuffix = if (this !is ConeFlexibleType && this !is ConeClassErrorType) nullability.suffix else "" return when (this) { is ConeTypeVariableType -> "${renderAttributes()}TypeVariable(${this.lookupTag.name})" is ConeDefinitelyNotNullType -> "${original.render()}!!" diff --git a/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt index cd7c38e68a5..61123e1cb3e 100644 --- a/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt @@ -1,9 +1,9 @@ public open class ArrayInGenericArguments : R|kotlin/Any| { - public final static field X: R|ft!>, kotlin/Array!>?>!>, ArrayInGenericArguments.DataKey!>, kotlin/Array!>?>!>?>!| + public final static field X: R|ft>, kotlin/Array>?>>, ArrayInGenericArguments.DataKey>, kotlin/Array>?>>?>| - public final static field Y: R|ft!>, ArrayInGenericArguments.DataKey!>?>!| + public final static field Y: R|ft>, ArrayInGenericArguments.DataKey>?>| - public final static field Z: R|ft!>, kotlin/Array!>?>!>, ArrayInGenericArguments.DataKey!>, kotlin/Array!>?>!>?>!| + public final static field Z: R|ft>, kotlin/Array>?>>, ArrayInGenericArguments.DataKey>, kotlin/Array>?>>?>| public constructor(): R|ArrayInGenericArguments| diff --git a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt index 7aaf6f43345..334b2aaa870 100644 --- a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt @@ -1,5 +1,5 @@ public final class ArrayTypeVariance : R|kotlin/Any| { - public final fun toArray(p0: R|ft!>, kotlin/Array!>?>!|): R|ft!>, kotlin/Array!>?>!| + public final fun toArray(p0: R|ft>, kotlin/Array>?>|): R|ft>, kotlin/Array>?>| public constructor(): R|test/ArrayTypeVariance| diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt index 9dabecdf123..db082a2f7ab 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt @@ -1,4 +1,4 @@ -public final class ClassWithTypeP

!|> : R|kotlin/Any| { - public constructor

!|>(): R|test/ClassWithTypeP

| +public final class ClassWithTypeP

|> : R|kotlin/Any| { + public constructor

|>(): R|test/ClassWithTypeP

| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt index 8ae833f484d..4475ad9ffd7 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt @@ -1,4 +1,4 @@ -public abstract class ClassWithTypePExtendsIterableP

!|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable!>| { - public constructor

!|>(): R|test/ClassWithTypePExtendsIterableP

| +public abstract class ClassWithTypePExtendsIterableP

|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable>| { + public constructor

|>(): R|test/ClassWithTypePExtendsIterableP

| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt index a273382fd72..84992f9f2f3 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt @@ -1,4 +1,4 @@ -public final class ClassWithTypePP

!|, Q : R|ft!|> : R|kotlin/Any| { - public constructor

!|, Q : R|ft!|>(): R|test/ClassWithTypePP| +public final class ClassWithTypePP

|, Q : R|ft|> : R|kotlin/Any| { + public constructor

|, Q : R|ft|>(): R|test/ClassWithTypePP| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt index 305d940481d..2b417533b60 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt @@ -1,4 +1,4 @@ -public open class ClassWithTypePRefNext!>, kotlin/collections/Iterable!>?>!|, P : R|ft!|> : R|kotlin/Any| { - public constructor!>, kotlin/collections/Iterable!>?>!|, P : R|ft!|>(): R|test/ClassWithTypePRefNext| +public open class ClassWithTypePRefNext>, kotlin/collections/Iterable>?>|, P : R|ft|> : R|kotlin/Any| { + public constructor>, kotlin/collections/Iterable>?>|, P : R|ft|>(): R|test/ClassWithTypePRefNext| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt index a39791bd955..13aaa3ea193 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt @@ -1,4 +1,4 @@ -public final class ClassWithTypePRefSelf

!>, kotlin/Enum!>?>!|> : R|kotlin/Any| { - public constructor

!>, kotlin/Enum!>?>!|>(): R|test/ClassWithTypePRefSelf

| +public final class ClassWithTypePRefSelf

>, kotlin/Enum>?>|> : R|kotlin/Any| { + public constructor

>, kotlin/Enum>?>|>(): R|test/ClassWithTypePRefSelf

| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt index b0cbb2e56a2..b936b2e57f7 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt @@ -1,4 +1,4 @@ -public final class ClassWithTypePRefSelfAndClass

!>, test/ClassWithTypePRefSelfAndClass!>?>!|> : R|kotlin/Any| { - public constructor

!>, test/ClassWithTypePRefSelfAndClass!>?>!|>(): R|test/ClassWithTypePRefSelfAndClass

| +public final class ClassWithTypePRefSelfAndClass

>, test/ClassWithTypePRefSelfAndClass>?>|> : R|kotlin/Any| { + public constructor

>, test/ClassWithTypePRefSelfAndClass>?>|>(): R|test/ClassWithTypePRefSelfAndClass

| } diff --git a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt index 9099f9e09d0..19d51f1f016 100644 --- a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt @@ -1,5 +1,5 @@ public open class FieldOfArrayType : R|kotlin/Any| { - public open field files: R|ft!>, kotlin/Array!>?>!| + public open field files: R|ft>, kotlin/Array>?>| public constructor(): R|test/FieldOfArrayType| diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt index b11ab3f3c77..e7b109a376d 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt @@ -1,4 +1,4 @@ -public open class InnerClassReferencesOuterTP

!|> : R|kotlin/Any| { - public constructor

!|>(): R|test/InnerClassReferencesOuterTP

| +public open class InnerClassReferencesOuterTP

|> : R|kotlin/Any| { + public constructor

|>(): R|test/InnerClassReferencesOuterTP

| } diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt index b293bd0aaa1..f1cbf6ec365 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt @@ -1,5 +1,5 @@ public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| { - public open fun staticType(): R|ft!, ft!, ft!>, test/InnerClassTypeMultipleGeneric.Outer.Inner!, ft!, ft!>?>!| + public open fun staticType(): R|ft, ft, ft>, test/InnerClassTypeMultipleGeneric.Outer.Inner, ft, ft>?>| public constructor(): R|test/InnerClassTypeMultipleGeneric| diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt index 80e18dce961..9ed62127a52 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt @@ -1,4 +1,4 @@ -public open class InnerClassesInGeneric

!|, Q : R|ft!|> : R|kotlin/Any| { - public constructor

!|, Q : R|ft!|>(): R|test/InnerClassesInGeneric| +public open class InnerClassesInGeneric

|, Q : R|ft|> : R|kotlin/Any| { + public constructor

|, Q : R|ft|>(): R|test/InnerClassesInGeneric| } diff --git a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt index aa254173084..62691a7bc2b 100644 --- a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt +++ b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt @@ -1,12 +1,12 @@ public abstract interface IntrinsicCompanionObject : R|kotlin/Any| { - public abstract fun testInt(i: R|ft!|): R|kotlin/Unit| + public abstract fun testInt(i: R|ft|): R|kotlin/Unit| - public abstract fun testChar(c: R|ft!|): R|kotlin/Unit| + public abstract fun testChar(c: R|ft|): R|kotlin/Unit| - public abstract fun testString(s: R|ft!|): R|kotlin/Unit| + public abstract fun testString(s: R|ft|): R|kotlin/Unit| - public abstract fun testBoolean(b: R|ft!|): R|kotlin/Unit| + public abstract fun testBoolean(b: R|ft|): R|kotlin/Unit| - public abstract fun testEnum(e: R|ft!|): R|kotlin/Unit| + public abstract fun testEnum(e: R|ft|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt index 2076bfa9685..65f649b6944 100644 --- a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt @@ -1,4 +1,4 @@ -public final class MethodReferencesOuterClassTP

!|> : R|kotlin/Any| { - public constructor

!|>(): R|test/MethodReferencesOuterClassTP

| +public final class MethodReferencesOuterClassTP

|> : R|kotlin/Any| { + public constructor

|>(): R|test/MethodReferencesOuterClassTP

| } diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt index 7172f1d7804..200c4890900 100644 --- a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt @@ -1,5 +1,5 @@ public open class MethodTypePOneUpperBound : R|kotlin/Any| { - public open fun !|> bar(): R|kotlin/Unit| + public open fun |> bar(): R|kotlin/Unit| public constructor(): R|test/MethodTypePOneUpperBound| diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt index bc1714d64ba..d216b04338c 100644 --- a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt @@ -1,5 +1,5 @@ public open class MethodTypePTwoUpperBounds : R|kotlin/Any| { - public open fun !|, R|ft!|> foo(): R|kotlin/Unit| + public open fun |, R|ft|> foo(): R|kotlin/Unit| public constructor(): R|test/MethodTypePTwoUpperBounds| diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt index 5763e8d0aaf..c4760d869b9 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt @@ -1,5 +1,5 @@ public final class MethodWithTypeP : R|kotlin/Any| { - public final fun

!|> f(): R|kotlin/Unit| + public final fun

|> f(): R|kotlin/Unit| public constructor(): R|test/MethodWithTypeP| diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt index bf6866d07bc..3cc5c7fca2d 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt @@ -1,5 +1,5 @@ public final class MethodWithTypePP : R|kotlin/Any| { - public final fun

!|, Q : R|ft!|> f(): R|kotlin/Unit| + public final fun

|, Q : R|ft|> f(): R|kotlin/Unit| public constructor(): R|test/MethodWithTypePP| diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt index 2472e98c2d2..a540480fd47 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt @@ -1,6 +1,6 @@ -public open class MethodWithTypePRefClassP

!|> : R|kotlin/Any| { - public final fun !|> f(): R|kotlin/Unit| +public open class MethodWithTypePRefClassP

|> : R|kotlin/Any| { + public final fun |> f(): R|kotlin/Unit| - public constructor

!|>(): R|test/MethodWithTypePRefClassP

| + public constructor

|>(): R|test/MethodWithTypePRefClassP

| } diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt index 2ccb6cc4d3b..a9aa9266b12 100644 --- a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt @@ -1,5 +1,5 @@ public final class MethosWithPRefTP : R|kotlin/Any| { - public final fun

!|> f(p: R|ft!|): R|kotlin/Unit| + public final fun

|> f(p: R|ft|): R|kotlin/Unit| public constructor(): R|test/MethosWithPRefTP| diff --git a/compiler/testData/loadJava/compiledJava/MyException.fir.txt b/compiler/testData/loadJava/compiledJava/MyException.fir.txt index d0b5ce80202..5628c9d62e3 100644 --- a/compiler/testData/loadJava/compiledJava/MyException.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MyException.fir.txt @@ -1,4 +1,4 @@ public open class MyException : R|kotlin/Any| { - public constructor(message: R|ft!|, cause: R|ft!|): R|test/MyException| + public constructor(message: R|ft|, cause: R|ft|): R|test/MyException| } diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt index 54e2eb9adfe..380ae6a89c7 100644 --- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt +++ b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt @@ -1,11 +1,11 @@ public open class Frame : R|kotlin/Any| { - public/*package*/ open field accessibleContext: R|ft!| + public/*package*/ open field accessibleContext: R|ft| public constructor(): R|awt/Frame| } public open class JFrame : R|awt/Frame| { - protected/*protected and package*/ open field accessibleContext: R|ft!| + protected/*protected and package*/ open field accessibleContext: R|ft| public constructor(): R|test/JFrame| diff --git a/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt index ca9b92db9a7..d25b67ad76c 100644 --- a/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt @@ -1,2 +1,2 @@ -public abstract interface RawUpperBound, test/RawUpperBound<*>?>!|> : R|kotlin/Any| { +public abstract interface RawUpperBound, test/RawUpperBound<*>?>|> : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt index 19cdc5c183c..e7518677ff2 100644 --- a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt @@ -1,2 +1,2 @@ -public abstract interface RecursiveRawUpperBound, test/RecursiveRawUpperBound<*>?>!|> : R|kotlin/Any| { +public abstract interface RecursiveRawUpperBound, test/RecursiveRawUpperBound<*>?>|> : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt index f2593105273..297b9d99b7b 100644 --- a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt @@ -1,2 +1,2 @@ -public abstract interface RecursiveWildcardUpperBound, test/RecursiveWildcardUpperBound<*>?>!|> : R|kotlin/Any| { +public abstract interface RecursiveWildcardUpperBound, test/RecursiveWildcardUpperBound<*>?>|> : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt index 286e71ec700..9ca5f1ebaf2 100644 --- a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt @@ -1,6 +1,6 @@ public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| { - public abstract fun f(collection: R|ft!>, kotlin/collections/Collection!>?>!|): R|kotlin/Unit| + public abstract fun f(collection: R|ft>, kotlin/collections/Collection>?>|): R|kotlin/Unit| - public abstract fun f(comparator: R|ft!>, kotlin/Comparable!>?>!|): R|kotlin/Unit| + public abstract fun f(comparator: R|ft>, kotlin/Comparable>?>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt index a0bbe00d88e..e44311bff8c 100644 --- a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt +++ b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt @@ -1,5 +1,5 @@ public open class TopLevel$Class : R|kotlin/Any| { - public open fun foo(other: R|ft!|): R|kotlin/Unit| + public open fun foo(other: R|ft|): R|kotlin/Unit| public constructor(): R|test/TopLevel$Class| diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt index 2007a47d6de..cf5fe5352ec 100644 --- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt +++ b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt @@ -1,7 +1,7 @@ public final class UnboundWildcard : R|kotlin/Any| { - public final fun foo(): R|ft, test/UnboundWildcard.MyClass<*>?>!| + public final fun foo(): R|ft, test/UnboundWildcard.MyClass<*>?>| - public final fun collection(): R|ft, kotlin/collections/Collection<*>?>!| + public final fun collection(): R|ft, kotlin/collections/Collection<*>?>| public constructor(): R|test/UnboundWildcard| diff --git a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt index 2dd00af5101..562024250c9 100644 --- a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt @@ -1,5 +1,5 @@ public open class WildcardBounds : R|kotlin/Any| { - public/*package*/ open fun foo(x: R|ft!>, test/WildcardBounds.A!>?>!|, y: R|ft!>, test/WildcardBounds.A!>?>!|): R|kotlin/Unit| + public/*package*/ open fun foo(x: R|ft>, test/WildcardBounds.A>?>|, y: R|ft>, test/WildcardBounds.A>?>|): R|kotlin/Unit| public constructor(): R|test/WildcardBounds| diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt index 8030d3aff68..292f289bd88 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt @@ -1,4 +1,4 @@ -public final enum class AnnotatedEnumEntry : R|kotlin/Enum!>| { +public final enum class AnnotatedEnumEntry : R|kotlin/Enum>| { @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static enum entry E1: R|@EnhancedNullability test/AnnotatedEnumEntry| @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static enum entry E2: R|@EnhancedNullability test/AnnotatedEnumEntry| public final static enum entry E3: R|@EnhancedNullability test/AnnotatedEnumEntry| diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt index 7302d1a8925..a1728edc17b 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt @@ -1,5 +1,5 @@ public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| { - public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft!|, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft!|): R|kotlin/Unit| + public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft|, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft|): R|kotlin/Unit| public/*package*/ constructor(): R|test/AnnotatedTypeInFun| diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt index a5daeeac779..7f5f461bfa8 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt @@ -1,5 +1,5 @@ public open class AnnotatedValueParameter : R|kotlin/Any| { - public open fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| + public open fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft>, kotlin/collections/List>?>|): R|kotlin/Unit| public constructor(): R|test/AnnotatedValueParameter| diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt index 16dc0a79045..728fef6060d 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt @@ -1,6 +1,6 @@ -public final enum class EnumConstructorParameter : R|kotlin/Enum!>| { +public final enum class EnumConstructorParameter : R|kotlin/Enum>| { public final static enum entry INSTANCE: R|@EnhancedNullability test/EnumConstructorParameter| - private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft!|): R|test/EnumConstructorParameter| + private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft|): R|test/EnumConstructorParameter| private constructor(x: R|kotlin/Int|): R|test/EnumConstructorParameter| diff --git a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt index 9d77acf371f..76308cfe25c 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt @@ -1,5 +1,5 @@ public open class JavaDocDeprecated : R|kotlin/Any| { - public open fun getFoo(text: R|ft!|): R|ft!| + public open fun getFoo(text: R|ft|): R|ft| public constructor(): R|test/JavaDocDeprecated| diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt index 582e76ca52c..d1bce494437 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt @@ -1,4 +1,4 @@ public abstract interface StringConstantInParam : R|kotlin/Any| { - public final static field HEL: R|ft!| = String(hel) + public final static field HEL: R|ft| = String(hel) } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt index acc451ca9f7..6ad2e2c26f7 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt +++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorGenericDeep : R|kotlin/Any| { - public constructor

!|>(cl: R|ft!>, java/lang/Class!>?>!|): R|test/ConstructorGenericDeep| + public constructor

|>(cl: R|ft>, java/lang/Class>?>|): R|test/ConstructorGenericDeep| } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt index 1062303dde0..57b67146525 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt +++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorGenericSimple : R|kotlin/Any| { - public constructor

!|>(p: R|ft!|): R|test/ConstructorGenericSimple| + public constructor

|>(p: R|ft|): R|test/ConstructorGenericSimple| } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt index c1a21961491..3395cd7f6a1 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorGenericUpperBound : R|kotlin/Any| { - public constructor

!|>(p: R|ft!|): R|test/ConstructorGenericUpperBound| + public constructor

|>(p: R|ft|): R|test/ConstructorGenericUpperBound| } diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt index 9836c7d78cd..1fe72a49dd8 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt @@ -1,4 +1,4 @@ -public final enum class EnumMembers : R|kotlin/Enum!>| { +public final enum class EnumMembers : R|kotlin/Enum>| { public final static enum entry FIRST: R|@EnhancedNullability test/EnumMembers| public final static enum entry SECOND: R|@EnhancedNullability test/EnumMembers| public final field isFirst: R|kotlin/Boolean| diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt index fe66e3d77e0..5456bfa89a7 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt @@ -1,4 +1,4 @@ -public open enum class EnumWithSpecializedEntry : R|kotlin/Enum!>| { +public open enum class EnumWithSpecializedEntry : R|kotlin/Enum>| { public final static enum entry E1: R|@EnhancedNullability test/EnumWithSpecializedEntry| public final static enum entry E2: R|@EnhancedNullability test/EnumWithSpecializedEntry| public final static fun values(): R|kotlin/Array| { diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt index 16b54143c47..c3f15b08970 100644 --- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt @@ -1,4 +1,4 @@ -public final enum class JavaEnum : R|kotlin/Enum!>| { +public final enum class JavaEnum : R|kotlin/Enum>| { public final static enum entry ENTRY: R|@EnhancedNullability test/JavaEnum| public final static enum entry ANOTHER: R|@EnhancedNullability test/JavaEnum| public final static fun values(): R|kotlin/Array| { diff --git a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt index c8e0cf1a9db..00897bc6ecc 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt @@ -1,5 +1,5 @@ public open class DifferentGetterAndSetter : R|kotlin/Any| { - public open fun setSomething(color: R|ft!|): R|kotlin/Unit| + public open fun setSomething(color: R|ft|): R|kotlin/Unit| public open fun getSomething(): R|kotlin/Int| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt index 699f7f70a7e..f22758b1e75 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt @@ -1,5 +1,5 @@ public open class JavaBeanVal : R|kotlin/Any| { - public open fun getColor(): R|ft!| + public open fun getColor(): R|ft| public constructor(): R|test/JavaBeanVal| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt index 5ccda953b37..f59a1bc39b1 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt @@ -1,7 +1,7 @@ public open class JavaBeanVar : R|kotlin/Any| { - public open fun getColor(): R|ft!| + public open fun getColor(): R|ft| - public open fun setColor(string: R|ft!|): R|kotlin/Unit| + public open fun setColor(string: R|ft|): R|kotlin/Unit| public constructor(): R|test/JavaBeanVar| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt index 09ed70585c6..ced2c810bb1 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt @@ -1,8 +1,8 @@ -public open class JavaBeanVarOfGenericType

!|> : R|kotlin/Any| { - public open fun getCharacters(): R|ft!>, java/util/ArrayList!>?>!| +public open class JavaBeanVarOfGenericType

|> : R|kotlin/Any| { + public open fun getCharacters(): R|ft>, java/util/ArrayList>?>| - public open fun setCharacters(characters: R|ft!>, java/util/ArrayList!>?>!|): R|kotlin/Unit| + public open fun setCharacters(characters: R|ft>, java/util/ArrayList>?>|): R|kotlin/Unit| - public constructor

!|>(): R|test/JavaBeanVarOfGenericType

| + public constructor

|>(): R|test/JavaBeanVarOfGenericType

| } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt index 63b1f2b7d4d..06c046142fe 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt @@ -1,5 +1,5 @@ public open class TwoSetters : R|kotlin/Any| { - public open fun setSize(size: R|ft!|): R|kotlin/Unit| + public open fun setSize(size: R|ft|): R|kotlin/Unit| public open fun setSize(size: R|kotlin/Int|): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt index 631151624b6..ea72f561685 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt @@ -1,5 +1,5 @@ public open class AllBoundsInWhen : R|kotlin/Any| { - public open fun !|> foo(): R|kotlin/Unit| + public open fun |> foo(): R|kotlin/Unit| public constructor(): R|test/AllBoundsInWhen| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt index 11722833a1f..4b04666801b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt @@ -1,5 +1,5 @@ public open class ArrayType : R|kotlin/Any| { - public open fun foo(): R|ft!>, kotlin/Array!>?>!| + public open fun foo(): R|ft>, kotlin/Array>?>| public constructor(): R|test/ArrayType| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt index 0ef2f13d500..3c61f534e7d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt @@ -1,4 +1,4 @@ -public open class ConstructorWithNewTypeParams!|> : R|kotlin/Any| { - public constructor!|, U : R|ft!|>(first: R|ft!|): R|test/ConstructorWithNewTypeParams| +public open class ConstructorWithNewTypeParams|> : R|kotlin/Any| { + public constructor|, U : R|ft|>(first: R|ft|): R|test/ConstructorWithNewTypeParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt index d06169dbbb9..348ea27c971 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt @@ -1,4 +1,4 @@ -public open class ConstructorWithParentTypeParams!|> : R|kotlin/Any| { - public constructor!|>(first: R|ft!|): R|test/ConstructorWithParentTypeParams| +public open class ConstructorWithParentTypeParams|> : R|kotlin/Any| { + public constructor|>(first: R|ft|): R|test/ConstructorWithParentTypeParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt index db7f7621e44..80d174755f8 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorWithSeveralParams : R|kotlin/Any| { - public constructor(integer: R|ft!|, intBasic: R|kotlin/Int|, collection: R|ft!>, java/util/ArrayList!>?>!|): R|test/ConstructorWithSeveralParams| + public constructor(integer: R|ft|, intBasic: R|kotlin/Int|, collection: R|ft>, java/util/ArrayList>?>|): R|test/ConstructorWithSeveralParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt index 0111e55d7a1..9c5c1356836 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt @@ -1,5 +1,5 @@ public open class CustomProjectionKind : R|kotlin/Any| { - public open fun foo(): R|ft!>, kotlin/collections/List!>?>!| + public open fun foo(): R|ft>, kotlin/collections/List>?>| public constructor(): R|test/CustomProjectionKind| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt index 847b28570af..d94069012e3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithFunctionTypes : R|kotlin/Any| { - public open fun foo(f: R|ft!, ft!>, kotlin/Function1!, ft!>?>!|): R|ft!>, kotlin/Function0!>?>!| + public open fun foo(f: R|ft, ft>, kotlin/Function1, ft>?>|): R|ft>, kotlin/Function0>?>| public constructor(): R|test/MethodWithFunctionTypes| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt index 7aec26e74cd..9a5839ea948 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithGenerics : R|kotlin/Any| { - public open fun foo(a: R|ft!|, b: R|ft!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>, kotlin/collections/List!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>?>!|): R|ft!| + public open fun foo(a: R|ft|, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|): R|ft| public constructor(): R|test/MethodWithGenerics| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt index cd191791590..42f503e7b62 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt @@ -1,7 +1,7 @@ public open class MethodWithMappedClasses : R|kotlin/Any| { - public open fun !|> copy(dest: R|ft!>, kotlin/collections/List<*>?>!|, src: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| + public open fun |> copy(dest: R|ft>, kotlin/collections/List<*>?>|, src: R|ft>, kotlin/collections/List>?>|): R|kotlin/Unit| - public open fun !|> copyMap(dest: R|ft!, in ft!>, kotlin/collections/Map!, *>?>!|, src: R|ft!, ft!>, kotlin/collections/Map!, ft!>?>!|): R|kotlin/Unit| + public open fun |> copyMap(dest: R|ft, in ft>, kotlin/collections/Map, *>?>|, src: R|ft, ft>, kotlin/collections/Map, ft>?>|): R|kotlin/Unit| public constructor(): R|test/MethodWithMappedClasses| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt index bd4975c1c2f..247f95ae1c6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithTypeParameters : R|kotlin/Any| { - public open fun !|, B : R|ft!|, R|ft!>, kotlin/collections/List!>?>!|> foo(a: R|ft!|, b: R|ft!>, kotlin/collections/List!>?>!|, list: R|ft!>, kotlin/collections/List<*>?>!|): R|kotlin/Unit| + public open fun |, B : R|ft|, R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft>, kotlin/collections/List>?>|, list: R|ft>, kotlin/collections/List<*>?>|): R|kotlin/Unit| public constructor(): R|test/MethodWithTypeParameters| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt index 65663efc015..f7fdf36779d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithVararg : R|kotlin/Any| { - public open fun foo(vararg s: R|ft!>, kotlin/Array!>?>!|): R|kotlin/Unit| + public open fun foo(vararg s: R|ft>, kotlin/Array>?>|): R|kotlin/Unit| public constructor(): R|test/MethodWithVararg| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt index ef8d624fe81..694ab1827bc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt @@ -1,10 +1,10 @@ -public open class PropertyArrayTypes!|> : R|kotlin/Any| { - public open field arrayOfArrays: R|ft!>, kotlin/Array!>?>!>, kotlin/Array!>, kotlin/Array!>?>!>?>!| +public open class PropertyArrayTypes|> : R|kotlin/Any| { + public open field arrayOfArrays: R|ft>, kotlin/Array>?>>, kotlin/Array>, kotlin/Array>?>>?>| - public open field array: R|ft!>, kotlin/Array!>?>!| + public open field array: R|ft>, kotlin/Array>?>| - public open field genericArray: R|ft!>, kotlin/Array!>?>!| + public open field genericArray: R|ft>, kotlin/Array>?>| - public constructor!|>(): R|test/PropertyArrayTypes| + public constructor|>(): R|test/PropertyArrayTypes| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt index 2ed4dd1f94a..42a6b5d12e6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt @@ -1,12 +1,12 @@ -public open class PropertyComplexTypes!|> : R|kotlin/Any| { - public open field genericType: R|ft!| +public open class PropertyComplexTypes|> : R|kotlin/Any| { + public open field genericType: R|ft| - public open field listDefinedGeneric: R|ft!>, java/util/ArrayList!>?>!| + public open field listDefinedGeneric: R|ft>, java/util/ArrayList>?>| - public open field listGeneric: R|ft!>, java/util/ArrayList!>?>!| + public open field listGeneric: R|ft>, java/util/ArrayList>?>| - public open field listOfGenericList: R|ft!>, java/util/ArrayList!>?>!>, java/util/ArrayList!>, java/util/ArrayList!>?>!>?>!| + public open field listOfGenericList: R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>| - public constructor!|>(): R|test/PropertyComplexTypes| + public constructor|>(): R|test/PropertyComplexTypes| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt index db53eb1586a..627f61d302c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt @@ -1,7 +1,7 @@ public open class PropertySimpleType : R|kotlin/Any| { - public open field fieldOne: R|ft!| + public open field fieldOne: R|ft| - public open field fieldTwo: R|ft!| + public open field fieldTwo: R|ft| public constructor(): R|test/PropertySimpleType| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt index efb97842d04..89b0aa96d49 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt @@ -1,5 +1,5 @@ public final class StarProjection : R|kotlin/Any| { - public final fun foo(): R|ft, test/StarProjection.MyClass<*>?>!| + public final fun foo(): R|ft, test/StarProjection.MyClass<*>?>| public constructor(): R|test/StarProjection| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt index 66c8a8f42fc..d2a8cd3bf58 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt @@ -1,5 +1,5 @@ public open class WrongProjectionKind : R|kotlin/Any| { - public open fun copy(from: R|ft!>, kotlin/Array!>?>!|, to: R|ft!>, kotlin/Array!>?>!|): R|ft!>, kotlin/collections/List!>?>!| + public open fun copy(from: R|ft>, kotlin/Array>?>|, to: R|ft>, kotlin/Array>?>|): R|ft>, kotlin/collections/List>?>| public constructor(): R|test/WrongProjectionKind| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt index f1ffdab8340..55dc8781fa0 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt @@ -1,5 +1,5 @@ public open class WrongReturnTypeStructure : R|kotlin/Any| { - public open fun foo(a: R|ft!|, b: R|ft!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>, kotlin/collections/List!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>?>!|): R|ft!| + public open fun foo(a: R|ft|, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|): R|ft| public constructor(): R|test/WrongReturnTypeStructure| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt index 2f8e39f04a3..f9f80107f0d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt @@ -1,5 +1,5 @@ public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| { - public open fun !|, B : R|ft!|, R|ft!>, kotlin/collections/List!>?>!|> foo(a: R|ft!|, b: R|ft!>, kotlin/collections/List!>?>!|): R|kotlin/Unit| + public open fun |, B : R|ft|, R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft>, kotlin/collections/List>?>|): R|kotlin/Unit| public constructor(): R|test/WrongTypeParameterBoundStructure1| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt index 528219f1f73..715e20dd9bd 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt @@ -1,5 +1,5 @@ public open class WrongValueParameterStructure1 : R|kotlin/Any| { - public open fun foo(a: R|ft!|, b: R|ft!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>, kotlin/collections/List!, ft!>, kotlin/collections/Map.Entry!, ft!>?>!>?>!|): R|ft!| + public open fun foo(a: R|ft|, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|): R|ft| public constructor(): R|test/WrongValueParameterStructure1| 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 a6c778e2aaf..81d83705de0 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|kotlin/collections/MutableCollection!>| { - public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator!>| +public abstract interface SubclassOfCollection|> : R|kotlin/collections/MutableCollection>| { + public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator>| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt index 68511488c6f..b04e4d830ea 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt @@ -1,4 +1,4 @@ -public abstract interface SubclassOfMapEntry!|, V : R|ft!|> : R|kotlin/collections/MutableMap.MutableEntry!, ft!>| { - public abstract operator fun setValue(value: R|ft!|): R|ft!| +public abstract interface SubclassOfMapEntry|, V : R|ft|> : R|kotlin/collections/MutableMap.MutableEntry, ft>| { + public abstract operator fun setValue(value: R|ft|): R|ft| } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt index 9ddc69fb0f1..acd4e283abd 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|kotlin/Any| { - public abstract fun getIterable(): R|ft!>, kotlin/collections/Iterable!>?>!| +public abstract interface LoadIterable|> : R|kotlin/Any| { + public abstract fun getIterable(): R|ft>, kotlin/collections/Iterable>?>| - public abstract fun setIterable(Iterable: R|ft!>, kotlin/collections/Iterable!>?>!|): R|kotlin/Unit| + public abstract fun 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 ecfdd58c5f9..ce4877d3d34 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|kotlin/Any| { - public abstract fun getIterator(): R|ft!>, kotlin/collections/Iterator!>?>!| +public abstract interface LoadIterator|> : R|kotlin/Any| { + public abstract fun getIterator(): R|ft>, kotlin/collections/Iterator>?>| - public abstract fun setIterator(iterator: R|ft!>, kotlin/collections/Iterator!>?>!|): R|kotlin/Unit| + public abstract fun setIterator(iterator: R|ft>, kotlin/collections/Iterator>?>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt index 399c1d08a4f..918dfde3875 100644 --- a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt @@ -1,5 +1,5 @@ public open class Max : R|kotlin/Any| { - public open fun !|, R|ft!>, kotlin/Comparable!>?>!|> max(coll: R|ft!>, kotlin/collections/Collection!>?>!|): R|ft!| + public open fun |, R|ft>, kotlin/Comparable>?>|> max(coll: R|ft>, kotlin/collections/Collection>?>|): R|ft| public constructor(): R|test/Max| diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt index 56bd0067080..a5cf9efd5d1 100644 --- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt +++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt @@ -1,4 +1,4 @@ -public open class ModalityOfFakeOverrides : R|java/util/AbstractList!>| { +public open class ModalityOfFakeOverrides : R|java/util/AbstractList>| { @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator fun get(index: R|kotlin/Int|): R|@EnhancedNullability kotlin/String| public constructor(): R|test/ModalityOfFakeOverrides| diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt index 78a4930211e..7448edf8113 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|kotlin/Any| { - @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft!>, kotlin/collections/MutableIterable!>?>!| +public abstract interface LoadIterable|> : R|kotlin/Any| { + @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft>, kotlin/collections/MutableIterable>?>| - public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft!>, kotlin/collections/MutableIterable!>?>!|): R|kotlin/Unit| + public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/MutableIterable>?>|): R|kotlin/Unit| - @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft!>, kotlin/collections/Iterable!>?>!| + @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>?>| - public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft!>, kotlin/collections/Iterable!>?>!|): R|kotlin/Unit| + public abstract fun 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 aff107cedea..028499e2204 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|kotlin/Any| { - @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft!>, kotlin/collections/Iterable!>?>!| +public abstract interface LoadIterableWithConflict|> : R|kotlin/Any| { + @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft>, kotlin/collections/Iterable>?>| - public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft!>, kotlin/collections/Iterable!>?>!|): R|kotlin/Unit| + public abstract fun 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 3be53e234f6..393a64a0c79 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|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability @R|kotlin/annotations/jvm/Mutable|() kotlin/collections/MutableIterable!>| +public abstract interface LoadIterableWithNullability|> : R|kotlin/Any| { + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability @R|kotlin/annotations/jvm/Mutable|() kotlin/collections/MutableIterable>| - public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability @R|kotlin/annotations/jvm/Mutable|() kotlin/collections/MutableIterable!>|): R|kotlin/Unit| + public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability @R|kotlin/annotations/jvm/Mutable|() kotlin/collections/MutableIterable>|): R|kotlin/Unit| - @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability @R|kotlin/annotations/jvm/ReadOnly|() kotlin/collections/Iterable!>| + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability @R|kotlin/annotations/jvm/ReadOnly|() kotlin/collections/Iterable>| - public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability @R|kotlin/annotations/jvm/ReadOnly|() kotlin/collections/Iterable!>|): R|kotlin/Unit| + public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability @R|kotlin/annotations/jvm/ReadOnly|() 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 bb96f9b059e..4e279e6c864 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|kotlin/Any| { public abstract fun bar(): R|kotlin/Unit| - public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft!>, kotlin/collections/List!>?>!|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable!>|): R|kotlin/Unit| + public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft>, kotlin/collections/List>?>|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt index 36f4528180e..88fc7046ad3 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt @@ -1,5 +1,5 @@ public open class NotNullObjectArray : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|ft<@EnhancedNullability kotlin/Array!>, @EnhancedNullability kotlin/Array!>>| + @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|ft<@EnhancedNullability kotlin/Array>, @EnhancedNullability kotlin/Array>>| public constructor(): R|test/NotNullObjectArray| diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt index f80ce812a9b..f2496b98ad2 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt @@ -1,4 +1,4 @@ -public abstract interface Comparator!|> : R|kotlin/Any| { - public abstract fun compare(o1: R|ft!|, o2: R|ft!|): R|kotlin/Int| +public abstract interface Comparator|> : R|kotlin/Any| { + public abstract fun compare(o1: R|ft|, o2: R|ft|): R|kotlin/Int| } diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt index f5438fd128c..a01b29204b6 100644 --- a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt @@ -1,4 +1,4 @@ public abstract interface FilenameFilter : R|kotlin/Any| { - public abstract fun accept(dir: R|ft!|, name: R|ft!|): R|kotlin/Boolean| + public abstract fun accept(dir: R|ft|, name: R|ft|): R|kotlin/Boolean| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt index 16cbfb10b49..c489c6b22c4 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt @@ -1,4 +1,4 @@ -public abstract interface GenericInterfaceParameterWithSelfBound!>, test/GenericInterfaceParameterWithSelfBound!>?>!|> : R|kotlin/Any| { - public abstract fun method(t: R|ft!|): R|ft!| +public abstract interface GenericInterfaceParameterWithSelfBound>, test/GenericInterfaceParameterWithSelfBound>?>|> : R|kotlin/Any| { + public abstract fun method(t: R|ft|): R|ft| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt index 4671d98a5e1..7415b636681 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt @@ -1,4 +1,4 @@ -public abstract interface GenericInterfaceParametersWithBounds!>, kotlin/Comparable!>?>!|, R|ft!|, B : R|ft!>, kotlin/collections/List!>?>!|> : R|kotlin/Any| { - public abstract fun method(a: R|ft!>, kotlin/Array!>?>!|, b: R|ft!|): R|kotlin/Unit| +public abstract interface GenericInterfaceParametersWithBounds>, kotlin/Comparable>?>|, R|ft|, B : R|ft>, kotlin/collections/List>?>|> : R|kotlin/Any| { + public abstract fun method(a: R|ft>, kotlin/Array>?>|, b: R|ft|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt index 118e9a19adb..af95c4e45ad 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt @@ -1,4 +1,4 @@ public abstract interface GenericMethodParameters : R|kotlin/Any| { - public abstract fun !|, B : R|ft!>, kotlin/collections/List!>?>!|> method(a: R|ft!>, kotlin/Array!>?>!|, b: R|ft!|): R|kotlin/Unit| + public abstract fun |, B : R|ft>, kotlin/collections/List>?>|> method(a: R|ft>, kotlin/Array>?>|, b: R|ft|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt index 9ad3856f86f..4e66cb644a9 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubstitutedSamInterface : R|java/util/Comparator!>| { +public abstract interface SubstitutedSamInterface : R|java/util/Comparator>| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt index 8d760bb4261..f7c72e12e6f 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable!>| { +public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable>| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt index 798d49e7413..2bcfc72678f 100644 --- a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt @@ -1,4 +1,4 @@ public abstract interface VarargParameter : R|kotlin/Any| { - public abstract fun f(vararg strings: R|ft!>, kotlin/Array!>?>!|): R|kotlin/Unit| + public abstract fun f(vararg strings: R|ft>, kotlin/Array>?>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt index 4abcef59143..75ab3c101fe 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt @@ -1,7 +1,7 @@ public open class AmbiguousAdapters : R|kotlin/Any| { - public open fun foo(r: R|ft!|): R|kotlin/Unit| + public open fun foo(r: R|ft|): R|kotlin/Unit| - public open fun foo(c: R|ft!|): R|kotlin/Unit| + public open fun foo(c: R|ft|): R|kotlin/Unit| public constructor(): R|test/AmbiguousAdapters| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt index 853920ef860..76ae3ae1fdf 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt @@ -1,7 +1,7 @@ public open class Basic : R|kotlin/Any| { - public open fun foo(r: R|ft!|): R|kotlin/Unit| + public open fun foo(r: R|ft|): R|kotlin/Unit| - public open static fun bar(r: R|ft!|): R|kotlin/Unit| + public open static fun bar(r: R|ft|): R|kotlin/Unit| public constructor(): R|test/Basic| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt index 0f0c72f6b81..b2365169db2 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt @@ -1,4 +1,4 @@ public open class Constructor : R|kotlin/Any| { - public constructor(r: R|ft!|): R|test/Constructor| + public constructor(r: R|ft|): R|test/Constructor| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt index 04537918725..4b85d21a96c 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorWithAnnotations : R|kotlin/Any| { - public constructor(r: R|ft!|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations| + public constructor(r: R|ft|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt index 7fc2e592f23..7009256b916 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt @@ -1,11 +1,11 @@ public open class NonTrivialFunctionType : R|kotlin/Any| { - public open fun foo(filenameFilter: R|ft!|): R|kotlin/Unit| + public open fun foo(filenameFilter: R|ft|): R|kotlin/Unit| - public open fun foo(comparator: R|ft!>, java/util/Comparator!>?>!|): R|kotlin/Unit| + public open fun foo(comparator: R|ft>, java/util/Comparator>?>|): R|kotlin/Unit| - public open fun wildcardUnbound(comparator: R|ft, java/util/Comparator<*>?>!|): R|kotlin/Unit| + public open fun wildcardUnbound(comparator: R|ft, java/util/Comparator<*>?>|): R|kotlin/Unit| - public open fun wildcardBound(comparator: R|ft!>, java/util/Comparator!>?>!|): R|kotlin/Unit| + public open fun wildcardBound(comparator: R|ft>, java/util/Comparator>?>|): R|kotlin/Unit| public constructor(): R|test/NonTrivialFunctionType| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt index 3cbb73d130e..b2eb5d83a6f 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt @@ -1,5 +1,5 @@ public open class PrivateSamAdapter : R|kotlin/Any| { - private open fun samAdapter(r: R|ft!|): R|kotlin/Unit| + private open fun samAdapter(r: R|ft|): R|kotlin/Unit| public constructor(): R|test/PrivateSamAdapter| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt index 82a757164e4..e07d9e2d362 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt @@ -1,4 +1,4 @@ public abstract interface SelfAsParameter : R|kotlin/Any| { - public abstract fun foo(p: R|ft!|): R|kotlin/Unit| + public abstract fun foo(p: R|ft|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt index 23c87c839df..c7d70a4703e 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt @@ -1,5 +1,5 @@ public open class SeveralSamParameters : R|kotlin/Any| { - public open static fun findMaxAndInvokeCallback(comparator: R|ft!>, java/util/Comparator!>?>!|, a: R|ft!|, b: R|ft!|, afterRunnable: R|ft!|): R|ft!| + public open static fun findMaxAndInvokeCallback(comparator: R|ft>, java/util/Comparator>?>|, a: R|ft|, b: R|ft|, afterRunnable: R|ft|): R|ft| public constructor(): R|test/SeveralSamParameters| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt index d640c1cbe35..964ebcc98c8 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt @@ -1,6 +1,6 @@ -public open class TypeParameterOfClass!|> : R|kotlin/Any| { - public open fun foo(comparator: R|ft!>, java/util/Comparator!>?>!|): R|kotlin/Unit| +public open class TypeParameterOfClass|> : R|kotlin/Any| { + public open fun foo(comparator: R|ft>, java/util/Comparator>?>|): R|kotlin/Unit| - public constructor!|>(): R|test/TypeParameterOfClass| + public constructor|>(): R|test/TypeParameterOfClass| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt index 78e2598231a..3151a223b20 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt @@ -1,9 +1,9 @@ public open class TypeParameterOfMethod : R|kotlin/Any| { - public open static fun !|> max(comparator: R|ft!>, java/util/Comparator!>?>!|, value1: R|ft!|, value2: R|ft!|): R|ft!| + public open static fun |> max(comparator: R|ft>, java/util/Comparator>?>|, value1: R|ft|, value2: R|ft|): R|ft| - public open static fun !|> max2(comparator: R|ft!>, java/util/Comparator!>?>!|, value1: R|ft!|, value2: R|ft!|): R|ft!| + public open static fun |> max2(comparator: R|ft>, java/util/Comparator>?>|, value1: R|ft|, value2: R|ft|): R|ft| - public open static fun !|, B : R|ft!>, kotlin/collections/List!>?>!|> method(a: R|ft!>, java/util/Comparator!>?>!|, b: R|ft!|): R|kotlin/Unit| + public open static fun |, B : R|ft>, kotlin/collections/List>?>|> method(a: R|ft>, java/util/Comparator>?>|, b: R|ft|): R|kotlin/Unit| public constructor(): R|test/TypeParameterOfMethod| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt index 20bab8e6124..c7a1a7a9db6 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt @@ -1,4 +1,4 @@ -public open class TypeParameterOfOuterClass!|> : R|kotlin/Any| { - public constructor!|>(): R|test/TypeParameterOfOuterClass| +public open class TypeParameterOfOuterClass|> : R|kotlin/Any| { + public constructor|>(): R|test/TypeParameterOfOuterClass| } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt index e063f7e7921..5833bc15edf 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|kotlin/Any| { - public abstract fun foo(): R|ft!>, kotlin/collections/List!>?>!| + public abstract fun foo(): R|ft>, kotlin/collections/List>?>| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt index e1eb914a5df..6d3b89ec755 100644 --- a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt @@ -1,4 +1,4 @@ -public final enum class Enum : R|kotlin/Enum!>| { +public final enum class Enum : R|kotlin/Enum>| { public final static enum entry A: R|@EnhancedNullability test/Enum| public final static enum entry B: R|@EnhancedNullability test/Enum| public final static enum entry C: R|@EnhancedNullability test/Enum| diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt index 2f10d610e16..4dbd90f8727 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt @@ -1,15 +1,15 @@ public open class StaticFinal : R|kotlin/Any| { - public final static field publicNonNull: R|ft!| = String(aaa) + public final static field publicNonNull: R|ft| = String(aaa) - public final static field publicNull: R|ft!| + public final static field publicNull: R|ft| - public/*package*/ final static field packageNonNull: R|ft!| = String(bbb) + public/*package*/ final static field packageNonNull: R|ft| = String(bbb) - public/*package*/ final static field packageNull: R|ft!| + public/*package*/ final static field packageNull: R|ft| - private final static field privateNonNull: R|ft!| = String(bbb) + private final static field privateNonNull: R|ft| = String(bbb) - private final static field privateNull: R|ft!| + private final static field privateNull: R|ft| public constructor(): R|test/StaticFinal| diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt index e8cb9988fd1..5fd88af474e 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt @@ -1,8 +1,8 @@ -public final enum class StaticMembersInEnum : R|kotlin/Enum!>| { +public final enum class StaticMembersInEnum : R|kotlin/Enum>| { public final static enum entry ENTRY: R|@EnhancedNullability test/StaticMembersInEnum| public open static field STATIC_FIELD: R|kotlin/Int| - public final static field CONSTANT: R|ft!| + public final static field CONSTANT: R|ft| public open static fun foo(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt index 22229732a63..b9bbdb79ab8 100644 --- a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt +++ b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt @@ -1,5 +1,5 @@ public open class VarargInt : R|kotlin/Any| { - public open fun vararg(vararg p: R|ft!|): R|kotlin/Unit| + public open fun vararg(vararg p: R|ft|): R|kotlin/Unit| public constructor(): R|test/VarargInt| diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt index 02bd3f033d4..e9b8a2e76fd 100644 --- a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt +++ b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt @@ -1,5 +1,5 @@ public open class VarargString : R|kotlin/Any| { - public open fun vararg(vararg strings: R|ft!>, kotlin/Array!>?>!|): R|kotlin/Unit| + public open fun vararg(vararg strings: R|ft>, kotlin/Array>?>|): R|kotlin/Unit| public constructor(): R|test/VarargString|