azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR: introduce flexible types pretty rendering for no arguments case

Browse Source 
#KT-52020 Fixed
This commit is contained in:
Mikhail Glukhikh
2022-06-24 10:52:58 +02:00
committed by Space
parent 31ec10142b
commit 38f4a35be2
265 changed files with 654 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt
Vendored
+2 -2
View File
@@ -9,8 +9,8 @@ KtSuccessCallInfo:
signature = KtVariableLikeSignature:
name = sub
receiverType = null
returnType = ft<JavaSubClass, JavaSubClass?>
symbol = val sub: ft<JavaSubClass, JavaSubClass?>
returnType = JavaSubClass!
symbol = val sub: JavaSubClass!
callableIdIfNonLocal = /JavaClass.sub
simpleAccess = Read:
analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt
Vendored
+4 -4
View File
@@ -6,25 +6,25 @@ KtSuccessCallInfo:
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
returnType = java.util.Comparator<kotlin.Int!>
symbol = java/util/Comparator(function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>): java.util.Comparator<T>
valueParameters = [
KtVariableLikeSignature:
name = function
receiverType = null
returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
callableIdIfNonLocal = null
]
callableIdIfNonLocal = java/util/Comparator
typeArgumentsMapping = {
T -> (ft<kotlin.Int, kotlin.Int?>)
T -> (kotlin.Int!)
}
argumentMapping = {
{x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
name = function
receiverType = null
returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
callableIdIfNonLocal = null)
}
analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt
Vendored
+4 -4
View File
@@ -6,25 +6,25 @@ KtApplicableCallCandidateInfo:
extensionReceiver = null
signature = KtFunctionLikeSignature:
receiverType = null
returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
returnType = java.util.Comparator<kotlin.Int!>
symbol = java/util/Comparator(function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>): java.util.Comparator<T>
valueParameters = [
KtVariableLikeSignature:
name = function
receiverType = null
returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
callableIdIfNonLocal = null
]
callableIdIfNonLocal = java/util/Comparator
typeArgumentsMapping = {
T -> (ft<kotlin.Int, kotlin.Int?>)
T -> (kotlin.Int!)
}
argumentMapping = {
{x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
name = function
receiverType = null
returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
callableIdIfNonLocal = null)
}
analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsConstructorArgument.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
expression: { println("hello1") }
expected type: ft<java/lang/Runnable, java/lang/Runnable?>
expected type: java/lang/Runnable!
analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt
Vendored
+1 -1
View File
@@ -251,7 +251,7 @@ KtFunctionSymbol:
name: getDeclaringClass
origin: SUBSTITUTION_OVERRIDE
receiverType: null
returnType: ft<java/lang/Class<ft<test/E, test/E?>>, java/lang/Class<ft<test/E, test/E?>>?>
returnType: ft<java/lang/Class<test/E!>, java/lang/Class<test/E!>?>
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
Vendored
+21 -21
View File
@@ -8,7 +8,7 @@ KtJavaFieldSymbol:
name: value
origin: JAVA
receiverType: null
returnType: ft<kotlin/CharArray, kotlin/CharArray?>
returnType: kotlin/CharArray!
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: Private
@@ -362,7 +362,7 @@ KtFunctionSymbol:
name: getBytes
origin: JAVA
receiverType: null
returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
returnType: kotlin/ByteArray!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -390,7 +390,7 @@ KtFunctionSymbol:
name: getBytes
origin: JAVA
receiverType: null
returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
returnType: kotlin/ByteArray!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -418,7 +418,7 @@ KtFunctionSymbol:
name: getBytes
origin: JAVA
receiverType: null
returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
returnType: kotlin/ByteArray!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1072,7 +1072,7 @@ KtFunctionSymbol:
name: substring
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1100,7 +1100,7 @@ KtFunctionSymbol:
name: substring
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1158,7 +1158,7 @@ KtFunctionSymbol:
name: concat
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1186,7 +1186,7 @@ KtFunctionSymbol:
name: replace
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1215,7 +1215,7 @@ KtFunctionSymbol:
name: replace
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1300,7 +1300,7 @@ KtFunctionSymbol:
name: replaceFirst
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1329,7 +1329,7 @@ KtFunctionSymbol:
name: replaceAll
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1358,7 +1358,7 @@ KtFunctionSymbol:
name: split
origin: JAVA
receiverType: null
returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
returnType: ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1387,7 +1387,7 @@ KtFunctionSymbol:
name: split
origin: JAVA
receiverType: null
returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
returnType: ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1415,7 +1415,7 @@ KtFunctionSymbol:
name: toLowerCase
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1443,7 +1443,7 @@ KtFunctionSymbol:
name: toLowerCase
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1469,7 +1469,7 @@ KtFunctionSymbol:
name: toUpperCase
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: [
@@ -1497,7 +1497,7 @@ KtFunctionSymbol:
name: toUpperCase
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1523,7 +1523,7 @@ KtFunctionSymbol:
name: trim
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1575,7 +1575,7 @@ KtFunctionSymbol:
name: toCharArray
origin: JAVA
receiverType: null
returnType: ft<kotlin/CharArray, kotlin/CharArray?>
returnType: kotlin/CharArray!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1601,7 +1601,7 @@ KtFunctionSymbol:
name: intern
origin: JAVA
receiverType: null
returnType: ft<kotlin/String, kotlin/String?>
returnType: kotlin/String!
symbolKind: CLASS_MEMBER
typeParameters: []
valueParameters: []
@@ -1653,7 +1653,7 @@ KtNamedClassOrObjectSymbol:
origin: JAVA
superTypes: [
kotlin/Any
java/util/Comparator<ft<kotlin/String, kotlin/String?>>
java/util/Comparator<kotlin/String!>
java/io/Serializable
]
symbolKind: CLASS_MEMBER
analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ KtNamedClassOrObjectSymbol:
superTypes: [
kotlin/Any
java/io/Serializable
kotlin/Comparable<ft<kotlin/String, kotlin/String?>>
kotlin/Comparable<kotlin/String!>
kotlin/CharSequence
]
symbolKind: TOP_LEVEL
compiler/fir/analysis-tests/testData/enhancement/jsr305/NonNullNever.fir.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@
public open class NonNullNever : R|kotlin/Any| {
@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.NEVER|()) public open field field: R|kotlin/String?|
@R|MyNullable|() public open fun foo(@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String?|, @R|MyNullable|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
@R|MyNullable|() public open fun foo(@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String?|, @R|MyNullable|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
public constructor(): R|NonNullNever|
compiler/fir/analysis-tests/testData/enhancement/jsr305/Strange.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class Strange : R|kotlin/Any| {
@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft<kotlin/String, kotlin/String?>|
@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|kotlin/String!|
@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.MAYBE|()) public open fun foo(@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.ALWAYS|()) x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence?|): R|kotlin/String?|
compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
@R|FieldsAreNullable|() public open class A : R|kotlin/Any| {
public open field field: R|ft<kotlin/String, kotlin/String?>|
public open field field: R|kotlin/String!|
@R|javax/annotation/Nonnull|() public open field nonNullField: R|@EnhancedNullability kotlin/String|
public open fun foo(q: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(q: R|kotlin/String!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
@R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
@R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|spr/Nullable|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(x: R|kotlin/String!|, @R|spr/Nullable|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
@R|spr/ForceFlexibility|() public open fun bar(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|
@R|spr/ForceFlexibility|() public open fun bar(x: R|kotlin/String!|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|kotlin/String!|
public constructor(): R|A|
compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
Vendored
+1 -1
View File
@@ -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|(when = R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
public open fun foobar(@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.UNKNOWN|()) x: R|kotlin/String!|): R|kotlin/Unit|
public constructor(): R|A|
compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
Vendored
+13 -13
View File
@@ -1,55 +1,55 @@
@R|NonNullApi|() public open class A : R|kotlin/Any| {
public open fun foo1(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo1(x: R|kotlin/String!|): R|kotlin/String!|
public open fun foo2(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo2(x: R|kotlin/String!|): R|kotlin/String!|
public open fun foo3(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo3(x: R|kotlin/String!|): R|kotlin/String!|
@R|javax/annotation/Nullable|() public open fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
@R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
public open fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/String, kotlin/String?>|
public open fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/String!|
public constructor(): R|A|
}
@R|NonNullApi|() public abstract interface AInt : R|kotlin/Any| {
public abstract fun foo1(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
public abstract fun foo1(x: R|kotlin/String!|): R|kotlin/CharSequence!|
public abstract fun foo2(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
public abstract fun foo2(x: R|kotlin/String!|): R|kotlin/CharSequence!|
public abstract fun foo3(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
public abstract fun foo3(x: R|kotlin/String!|): R|kotlin/CharSequence!|
@R|javax/annotation/Nullable|() public abstract fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
@R|javax/annotation/Nullable|() public abstract fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/CharSequence!|
}
@R|NullableApi|() public open class B : R|A|, R|AInt| {
public open fun foo1(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo1(x: R|kotlin/String!|): R|kotlin/String!|
@R|javax/annotation/Nonnull|() public open fun foo2(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|@EnhancedNullability kotlin/String|
public open fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
public open fun baz(x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/String, kotlin/String?>|
public open fun baz(x: R|@EnhancedNullability kotlin/String|): R|kotlin/String!|
public constructor(): R|B|
}
@R|NonNullApi|() public open class C : R|A|, R|AInt| {
public open fun foo1(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo1(x: R|kotlin/String!|): R|kotlin/String!|
public open fun foo2(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo2(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/String!|
public open fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
@R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
public open fun baz(x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/String, kotlin/String?>|
public open fun baz(x: R|@EnhancedNullability kotlin/String|): R|kotlin/String!|
public constructor(): R|C|
compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
Vendored
+15 -15
View File
@@ -1,40 +1,40 @@
@R|NonNullApi|() public open class A : R|kotlin/Any| {
public open field field: R|ft<kotlin/String, kotlin/String?>|
public open field field: R|kotlin/String!|
public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(x: R|kotlin/String!|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
@R|NullableApi|() public open fun foobar(x: R|ft<kotlin/String, kotlin/String?>|, @R|NonNullApi|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
@R|NullableApi|() public open fun foobar(x: R|kotlin/String!|, @R|NonNullApi|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
public open fun bar(): R|kotlin/String!|
@R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
@R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>?, kotlin/collections/List<kotlin/String!>?>|
public constructor(): R|A|
@R|NullableApi|() public open inner class B : R|kotlin/Any| {
public open field field: R|ft<kotlin/String, kotlin/String?>|
public open field field: R|kotlin/String!|
public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(x: R|kotlin/String!|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|kotlin/String!|
@R|NonNullApi|() public open fun foobar(x: R|ft<kotlin/String, kotlin/String?>|, @R|NullableApi|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
@R|NonNullApi|() public open fun foobar(x: R|kotlin/String!|, @R|NullableApi|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
public open fun bar(): R|kotlin/String!|
@R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
@R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>?, kotlin/collections/List<kotlin/String!>?>|
public A.constructor(): R|A.B|
}
@R|FieldsAreNullable|() public open inner class C : R|kotlin/Any| {
public open field field: R|ft<kotlin/String, kotlin/String?>|
public open field field: R|kotlin/String!|
public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(x: R|kotlin/String!|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
@R|NullableApi|() public open fun foobar(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
@R|NullableApi|() public open fun foobar(x: R|kotlin/String!|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
public open fun bar(): R|kotlin/String!|
@R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
@R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>?, kotlin/collections/List<kotlin/String!>?>|
public A.constructor(): R|A.C|
compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
@R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|kotlin/Any| {
@R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
public open fun foo(q: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(q: R|kotlin/String!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
@R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
public open class A : R|kotlin/Any| {
@R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
public open fun foo(q: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(q: R|kotlin/String!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
@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|kotlin/String?|
public open fun foo(q: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(q: R|kotlin/String!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
@R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
@R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
public open field field: R|ft<kotlin/String, kotlin/String?>|
public open field field: R|kotlin/String!|
public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|spr/Nullable|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(x: R|kotlin/String!|, @R|spr/Nullable|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
public open fun bar(): R|kotlin/String!|
@R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
@R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
public constructor(): R|A|
compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
public open class A : R|kotlin/Any| {
public open field field: R|ft<kotlin/String, kotlin/String?>|
public open field field: R|kotlin/String!|
public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|spr/Nullable|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
public open fun foo(x: R|kotlin/String!|, @R|spr/Nullable|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
public open fun bar(): R|kotlin/String!|
@R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
@R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
public constructor(): R|test/A|
compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>| {
public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap<kotlin/String!, kotlin/String!>| {
public constructor(): R|AbstractMap|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt
Vendored
+4 -3
View File
@@ -1,5 +1,6 @@
public final fun array(a: R|kotlin/Array<kotlin/Int>|): R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|
public final fun array(a: R|kotlin/Array<kotlin/Int>|): R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|
public final fun list(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
public final fun list(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
public final fun printStream(): R|java/io/PrintStream!|
public final fun printStream(): R|ft<java/io/PrintStream, java/io/PrintStream?>|
compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: main.kt
public final fun test(list: R|kotlin/collections/List<kotlin/String>|, string: R|kotlin/String|): R|kotlin/Unit| {
R|/Matchers.assertThat|<R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>|>(R|<local>/list|, R|/Matchers.hasItem|<R|ft<kotlin/String, kotlin/String?>|>(R|<local>/string|))
R|/Matchers.assertThat|<R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>|>(R|<local>/list|, R|/Matchers.hasItem|<R|kotlin/String!|>(R|<local>/string|))
}
compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt
Vendored
+1 -1
View File
@@ -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<PsiMethod, PsiClass>| = R|/AdapterProcessor.AdapterProcessor|<R|PsiMethod|, R|PsiClass|>(R|/Function|<R|ft<PsiMethod, PsiMethod?>|, R|ft<PsiClass, PsiClass?>|>(<L> = Function@fun <anonymous>(method: R|PsiMethod?|): R|ft<PsiClass, PsiClass?>| <inline=NoInline> {
lval processor: R|AdapterProcessor<PsiMethod, PsiClass>| = R|/AdapterProcessor.AdapterProcessor|<R|PsiMethod|, R|PsiClass|>(R|/Function|<R|PsiMethod!|, R|PsiClass!|>(<L> = Function@fun <anonymous>(method: R|PsiMethod?|): R|PsiClass!| <inline=NoInline> {
^ R|<local>/method|?.{ $subj$.R|/PsiMethod.containingClass| }
}
))
compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndFlexibleType.fir.txt
Vendored
+2 -2
View File
@@ -15,7 +15,7 @@ FILE: main.kt
}
public final fun test_1(): R|kotlin/Unit| {
lval e: R|ft<E, E?>| = Q|Utils|.R|/Utils.getEnum|()
lval e: R|E!| = Q|Utils|.R|/Utils.getEnum|()
lval s: R|kotlin/String| = when (R|<local>/e|) {
==($subj$, Null(null)) -> {
^test_1 Unit
@@ -34,7 +34,7 @@ FILE: main.kt
R|<local>/s|.R|kotlin/String.length|
}
public final fun test_2(): R|kotlin/Unit| {
lval e: R|ft<E, E?>| = Q|Utils|.R|/Utils.getEnum|()
lval e: R|E!| = Q|Utils|.R|/Utils.getEnum|()
lval s: R|kotlin/String| = when (R|<local>/e|) {
==($subj$, Q|E|.R|/E.A|) -> {
String()
compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ FILE: test.kt
private final val DERIVED_FACTORY: R|DiagnosticFactory0<DerivedElement>| = R|/DiagnosticFactory0.DiagnosticFactory0|<R|DerivedElement|>()
private get(): R|DiagnosticFactory0<DerivedElement>|
public final fun createViaFactory(d: R|EmptyDiagnostic|): R|kotlin/Unit| {
lval casted: R|Diagnostic<ft<DerivedElement, DerivedElement?>>| = R|/DERIVED_FACTORY|.R|SubstitutionOverride</DiagnosticFactory0.cast: R|@EnhancedNullability Diagnostic<ft<DerivedElement, DerivedElement?>>|>|(R|<local>/d|)
lval casted: R|Diagnostic<DerivedElement!>| = R|/DERIVED_FACTORY|.R|SubstitutionOverride</DiagnosticFactory0.cast: R|@EnhancedNullability Diagnostic<DerivedElement!>|>|(R|<local>/d|)
lval element: R|DerivedElement| = R|<local>/casted|.R|/Diagnostic.element|
R|/Fix.Fix|(R|<local>/element|)
}
compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: test.kt
public final fun test(): R|kotlin/Unit| {
lval staticReference: R|kotlin/reflect/KMutableProperty0<ft<kotlin/String, kotlin/String?>>| = Q|JavaClass|::R|/JavaClass.staticField|
lval nonStaticReference: R|kotlin/reflect/KMutableProperty1<JavaClass, ft<kotlin/String, kotlin/String?>>| = Q|JavaClass|::R|/JavaClass.nonStaticField|
lval staticReference: R|kotlin/reflect/KMutableProperty0<kotlin/String!>| = Q|JavaClass|::R|/JavaClass.staticField|
lval nonStaticReference: R|kotlin/reflect/KMutableProperty1<JavaClass, kotlin/String!>| = Q|JavaClass|::R|/JavaClass.nonStaticField|
}
compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt
Vendored
+2 -2
View File
@@ -37,7 +37,7 @@ FILE: O.kt
}
public final fun local(): R|kotlin/Unit| {
lval y: R|ft<kotlin/String, kotlin/String?>| = this@R|/O.Derived|.R|/Base.foo|()
lval y: R|kotlin/String!| = this@R|/O.Derived|.R|/Base.foo|()
}
public final val oo: R|<anonymous>| = object : R|kotlin/Any| {
@@ -66,7 +66,7 @@ FILE: O.kt
}
public final fun local(): R|kotlin/Unit| {
lval y: R|ft<kotlin/String, kotlin/String?>| = this@R|/O.Derived|.R|/Base.foo|()
lval y: R|kotlin/String!| = this@R|/O.Derived|.R|/Base.foo|()
}
}
compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
FILE: flexibleTypeBug.kt
public final fun foo(): R|kotlin/Unit| {
lvar list1: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>| = Q|java/util/Collections|.R|java/util/Collections.emptyList|<R|kotlin/String|>()
lvar list1: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>| = Q|java/util/Collections|.R|java/util/Collections.emptyList|<R|kotlin/String|>()
lval list2: R|kotlin/collections/List<kotlin/String>| = R|kotlin/collections/listOf|<R|kotlin/String|>(String(b))
R|<local>/list1| = R|<local>/list1|.R|kotlin/collections/plus|<R|ft<kotlin/String, kotlin/String?>|>(R|<local>/list2|)
R|<local>/list1| = R|<local>/list1|.R|kotlin/collections/plus|<R|kotlin/String!|>(R|<local>/list2|)
}
compiler/fir/analysis-tests/testData/resolve/inference/dnnThrowJavaCall.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: main.kt
public final fun getExcludedDirs(project: R|Project|, excludedProjects: R|kotlin/collections/List<Project>|): R|kotlin/collections/List<java/io/File>| {
^getExcludedDirs R|<local>/project|.R|/Project.plugins|.R|/PluginContainer.findPlugin|<R|ft<IdeaPlugin, IdeaPlugin?>|>(<getClass>(Q|IdeaPlugin|).R|kotlin/jvm/java|<R|IdeaPlugin|>)?.{ $subj$.R|/IdeaPlugin.excludeDirs| }?.{ $subj$.R|kotlin/collections/toList|<R|ft<java/io/File, java/io/File?>|>() } ?: R|kotlin/collections/emptyList|<R|java/io/File|>()
^getExcludedDirs R|<local>/project|.R|/Project.plugins|.R|/PluginContainer.findPlugin|<R|IdeaPlugin!|>(<getClass>(Q|IdeaPlugin|).R|kotlin/jvm/java|<R|IdeaPlugin|>)?.{ $subj$.R|/IdeaPlugin.excludeDirs| }?.{ $subj$.R|kotlin/collections/toList|<R|java/io/File!|>() } ?: R|kotlin/collections/emptyList|<R|java/io/File|>()
}
compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt
Vendored
+1 -1
View File
@@ -7,5 +7,5 @@ FILE: main.kt
}
public final fun main(): R|kotlin/Unit| {
R|/K.K|<R|kotlin/Int|>(Int(0))
R|/JavaClass.JavaClass|<R|ft<kotlin/Int, kotlin/Int?>|>(Int(0))
R|/JavaClass.JavaClass|<R|kotlin/Int!|>(Int(0))
}
compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: main.kt
public final fun test(a: R|A|): R|kotlin/Unit| {
lval int: R|kotlin/Int| = R|<local>/a|.R|/A.x|
lval string: R|ft<kotlin/String, kotlin/String?>| = R|<local>/a|.R|/A.getX|()
lval string: R|kotlin/String!| = R|<local>/a|.R|/A.getX|()
}
compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: main.kt
public final fun main(): R|kotlin/Unit| {
lval b: R|ft<B, B?>| = Q|B|.R|/B.VALUE|
lval b: R|B!| = Q|B|.R|/B.VALUE|
}
compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt
Vendored
+1 -1
View File
@@ -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|<local>/derived|.R|/Test.Derived.foo|<R|ft<Test.I123, Test.I123?>|>(R|<local>/v|)
R|<local>/derived|.R|/Test.Derived.foo|<R|Test.I123!|>(R|<local>/v|)
R|<local>/derivedRaw|.R|/Test.DerivedRaw.foo|(R|<local>/v|)
}
public final fun callKotlin(derived: R|KDerived|): R|kotlin/Unit| {
compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: main.kt
public final fun main(): R|kotlin/Unit| {
R|/JavaClass.JavaClass|<R|kotlin/String|>(Null(null)).R|SubstitutionOverride</JavaClass.foo: R|ft<kotlin/String, kotlin/String?>|>|().R|kotlin/String.length|
R|/JavaClass.JavaClass|<R|kotlin/String|>(Null(null)).R|SubstitutionOverride</JavaClass.foo: R|kotlin/String!|>|().R|kotlin/String.length|
}
compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
FILE: main.kt
public final fun test_1(x: R|A|): R|kotlin/Unit| {
lval str1: R|ft<kotlin/String, kotlin/String?>| = R|<local>/x|.R|/A.vmParameters|
lval str1: R|kotlin/String!| = R|<local>/x|.R|/A.vmParameters|
lval str2: <ERROR TYPE REF: Unresolved name: vMParameters> = R|<local>/x|.<Unresolved name: vMParameters>#
}
public final fun test_2(x: R|B|): R|kotlin/Unit| {
lval int: R|ft<kotlin/Int, kotlin/Int?>| = R|<local>/x|.R|/B.vmParameters|
lval int: R|kotlin/Int!| = R|<local>/x|.R|/B.vmParameters|
lval error: <ERROR TYPE REF: Unresolved name: vMParameters> = R|<local>/x|.<Unresolved name: vMParameters>#
}
public final fun test_3(x: R|C|): R|kotlin/Unit| {
compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
FILE: main.kt
public final fun foo(): R|kotlin/Unit| {
Q|RawType|.R|/RawType.bar|(<L> = bar@fun <anonymous>(it: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|kotlin/Boolean| <inline=NoInline> {
Q|RawType|.R|/RawType.bar|(<L> = bar@fun <anonymous>(it: R|kotlin/CharSequence!|): R|kotlin/Boolean| <inline=NoInline> {
^ CMP(>, R|<local>/it|.R|kotlin/CharSequence.length|.R|kotlin/Int.compareTo|(Int(0)))
}
)
compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
FILE: main.kt
public final fun main(): R|kotlin/Unit| {
R|/MyFunction|<R|kotlin/Int|, R|kotlin/String|>(<L> = MyFunction@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
R|/MyFunction|<R|kotlin/Int|, R|kotlin/String|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Int.toString|()
}
)
R|/MyFunction|<R|ft<kotlin/Int, kotlin/Int?>|, R|ft<kotlin/String, kotlin/String?>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
R|/MyFunction|<R|kotlin/Int!|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Int.toString|()
}
)
compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt
Vendored
+5 -5
View File
@@ -6,23 +6,23 @@ FILE: main.kt
public final fun <X, Y> foo3(f: R|MyFunction<X, Y>|, x: R|X|): R|kotlin/Unit| {
}
public final fun main(): R|kotlin/Unit| {
R|/foo1|(R|/MyFunction|<R|kotlin/Int|, R|kotlin/String|>(<L> = MyFunction@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
R|/foo1|(R|/MyFunction|<R|kotlin/Int|, R|kotlin/String|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Int.toString|()
}
))
R|/foo2|(R|/MyFunction|<R|kotlin/Number|, R|ft<kotlin/String, kotlin/String?>|>(<L> = MyFunction@fun <anonymous>(x: R|ft<kotlin/Number, kotlin/Number?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
R|/foo2|(R|/MyFunction|<R|kotlin/Number|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Number!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Int.toString|()
}
))
<Inapplicable(INAPPLICABLE): /foo2>#(R|/MyFunction|<R|ft<kotlin/Int, kotlin/Int?>|, R|ft<kotlin/String, kotlin/String?>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
<Inapplicable(INAPPLICABLE): /foo2>#(R|/MyFunction|<R|kotlin/Int!|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Int.toString|()
}
))
R|/foo3|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String?>|>(R|/MyFunction|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String?>|>(<L> = MyFunction@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
R|/foo3|<R|kotlin/Int|, R|kotlin/String!|>(R|/MyFunction|<R|kotlin/Int|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.toString|()
}
), Int(1))
R|/foo3|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String?>|>(R|/MyFunction|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String?>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Number|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
R|/foo3|<R|kotlin/Int|, R|kotlin/String!|>(R|/MyFunction|<R|kotlin/Int|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Number|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Int.toString|()
}
), Int(2))
compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt
Vendored
+5 -5
View File
@@ -1,22 +1,22 @@
FILE: main.kt
public final fun main(): R|kotlin/Unit| {
Q|JavaUsage|.R|/JavaUsage.foo1|(<L> = foo1@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
Q|JavaUsage|.R|/JavaUsage.foo1|(<L> = foo1@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Int.toString|()
}
)
Q|JavaUsage|.R|/JavaUsage.foo2|(<L> = foo2@fun <anonymous>(x: R|ft<kotlin/Number, kotlin/Number?>|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>| <inline=NoInline> {
Q|JavaUsage|.R|/JavaUsage.foo2|(<L> = foo2@fun <anonymous>(x: R|kotlin/Number!|): R|kotlin/CharSequence!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Int.toString|()
}
)
Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo2>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>| <inline=Unknown> {
Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo2>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/CharSequence!| <inline=Unknown> {
^ R|<local>/x|.R|kotlin/Int.toString|()
}
)
Q|JavaUsage|.R|/JavaUsage.foo3|<R|ft<kotlin/Int, kotlin/Int?>|, R|ft<kotlin/String, kotlin/String?>|>(foo3@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
Q|JavaUsage|.R|/JavaUsage.foo3|<R|kotlin/Int!|, R|kotlin/String!|>(foo3@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.toString|()
}
, Int(1))
Q|JavaUsage|.R|/JavaUsage.foo3|<R|ft<kotlin/Int, kotlin/Int?>|, R|ft<kotlin/String, kotlin/String?>|>(foo3@fun <anonymous>(x: R|kotlin/Number|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
Q|JavaUsage|.R|/JavaUsage.foo3|<R|kotlin/Int!|, R|kotlin/String!|>(foo3@fun <anonymous>(x: R|kotlin/Number|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Int.toString|()
}
, Int(2))
compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt
Vendored
+2 -2
View File
@@ -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|(<L> = foo@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/Boolean, kotlin/Boolean?>| <inline=NoInline> {
Q|JavaUsage|.R|/JavaUsage.foo|(<L> = foo@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean!| <inline=NoInline> {
^ CMP(>, R|<local>/x|.R|kotlin/Int.compareTo|(Int(1)))
}
)
Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun <anonymous>(it: R|kotlin/Int|): R|ft<kotlin/Boolean, kotlin/Boolean?>| <inline=NoInline> {
Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun <anonymous>(it: R|kotlin/Int|): R|kotlin/Boolean!| <inline=NoInline> {
^ CMP(>, R|<local>/it|.R|kotlin/Int.compareTo|(Int(1)))
}
)
compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ FILE: main.kt
}
public final fun main(): R|kotlin/Unit| {
Q|OverridingUtil|.R|/OverridingUtil.createWithEqualityAxioms|(<L> = l1@fun <anonymous>(c1: R|ft<TypeConstructor, TypeConstructor?>|, c2: R|ft<TypeConstructor, TypeConstructor?>|): R|kotlin/Boolean| <inline=NoInline> {
Q|OverridingUtil|.R|/OverridingUtil.createWithEqualityAxioms|(<L> = l1@fun <anonymous>(c1: R|TypeConstructor!|, c2: R|TypeConstructor!|): R|kotlin/Boolean| <inline=NoInline> {
when () {
==(R|<local>/c1|.R|/TypeConstructor.x|, R|<local>/c2|.R|/TypeConstructor.x|) -> {
^@l1 Boolean(true)
compiler/fir/analysis-tests/testData/resolve/scopes/explicitOverrideOfTwoMembers_java.overrides.txt
Vendored
+2 -2
View File
@@ -11,11 +11,11 @@ D:
[Synthetic]: public abstract val y: R|kotlin/Int| from Java enhancement scope for /D [id: 0]
[Source]: public abstract val y: R|kotlin/Int| from Use site scope of /A [id: 1]
[Source]: public abstract val y: R|kotlin/Int| from Use site scope of /B [id: 2]
[Enhancement]: public abstract fun getX(): R|ft<kotlin/Any, kotlin/Any?>| from Java enhancement scope for /D [id: 0]
[Enhancement]: public abstract fun getX(): R|kotlin/Any!| from Java enhancement scope for /D [id: 0]
E:
[IntersectionOverride]: public abstract val x: R|kotlin/Int| from Java enhancement scope for /E [id: 0]
[Source]: public abstract val x: R|kotlin/Int| from Use site scope of /A [id: 1]
[Source]: public abstract val x: R|kotlin/String| from Use site scope of /B [id: 2]
[Enhancement]: public abstract fun getX(): R|ft<kotlin/Any, kotlin/Any?>| from Java enhancement scope for /E [id: 0]
[Enhancement]: public abstract fun getX(): R|kotlin/Any!| from Java enhancement scope for /E [id: 0]
compiler/fir/analysis-tests/testData/resolve/scopes/getterOverrideAndKotlinProperty.overrides.txt
Vendored
+4 -4
View File
@@ -1,15 +1,15 @@
A:
[Enhancement]: public abstract fun getFoo(): R|ft<kotlin/String, kotlin/String?>| from Java enhancement scope for /A [id: 0]
[Enhancement]: public abstract fun getFoo(): R|kotlin/String!| from Java enhancement scope for /A [id: 0]
B:
[Source]: public open override fun getFoo(): R|kotlin/String| from Use site scope of /B [id: 0]
[Enhancement]: public abstract fun getFoo(): R|ft<kotlin/String, kotlin/String?>| from Java enhancement scope for /A [id: 1]
[Enhancement]: public abstract fun getFoo(): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
C:
[Source]: public open override fun getFoo(): R|kotlin/String| from Java enhancement scope for /C [id: 0]
[Enhancement]: public abstract fun getFoo(): R|ft<kotlin/String, kotlin/String?>| from Java enhancement scope for /A [id: 1]
[Enhancement]: public abstract fun getFoo(): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
D:
[Source]: public open override fun getFoo(): R|kotlin/String| from Use site scope of /D [id: 0]
[Enhancement]: public abstract fun getFoo(): R|ft<kotlin/String, kotlin/String?>| from Java enhancement scope for /A [id: 1]
[Enhancement]: public abstract fun getFoo(): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
compiler/fir/analysis-tests/testData/resolve/scopes/publicJavaAndPrivateKotlinVar.overrides.txt
Vendored
+4 -4
View File
@@ -1,14 +1,14 @@
C:
[Source]: public open override fun getName(): R|kotlin/String| from Use site scope of /C [id: 0]
[Enhancement]: public abstract fun getName(): R|ft<kotlin/String, kotlin/String?>| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
[Enhancement]: public abstract fun getName(): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
[Source]: public open override fun setName(newName: R|kotlin/String|): R|kotlin/Any?| from Use site scope of /C [id: 0]
[SubstitutionOverride]: public abstract fun setName(newName: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/Any, kotlin/Any?>| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
[Enhancement]: public abstract fun setName(newName: R|ft<kotlin/String, kotlin/String?>|): R|ft<T & Any, T?>| from Java enhancement scope for /B [id: 2]
[SubstitutionOverride]: public abstract fun setName(newName: R|kotlin/String!|): R|kotlin/Any!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
[Enhancement]: public abstract fun setName(newName: R|kotlin/String!|): R|ft<T & Any, T?>| from Java enhancement scope for /B [id: 2]
[Source]: private final var name: R|kotlin/String| = R|<local>/name| from Use site scope of /C [id: 0]
D:
[Source]: public open override fun getName(): R|kotlin/String| from Java enhancement scope for /D [id: 0]
[Enhancement]: public abstract fun getName(): R|ft<kotlin/String, kotlin/String?>| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
[Enhancement]: public abstract fun getName(): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
[Source]: private final var name: R|kotlin/String| = R|<local>/name| from Java enhancement scope for /D [id: 0]
[Source]: private final var name: R|kotlin/String| = R|<local>/name| from Use site scope of /C [id: 0]
compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.overrides.txt
Vendored
+12 -12
View File
@@ -4,19 +4,19 @@ SomeMap:
[SubstitutionOverride]: public abstract fun containsKey(key: R|K|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 2]
[Library]: public abstract fun containsKey(key: R|K|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
[Library]: public abstract fun containsKey(key: R|K|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
[SubstitutionOverride]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
[Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
[SubstitutionOverride]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
[Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 7]
[SubstitutionOverride]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
[Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 7]
[SubstitutionOverride]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
[Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
[SubstitutionOverride]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
[Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 7]
[SubstitutionOverride]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
[Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 7]
[IntersectionOverride]: public abstract fun containsValue(value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Java enhancement scope for /SomeMap [id: 0]
[SubstitutionOverride]: public abstract fun containsValue(value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
[SubstitutionOverride]: public abstract fun containsValue(value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 2]
[Library]: public abstract fun containsValue(value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
[Library]: public abstract fun containsValue(value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
[SubstitutionOverride]: public abstract fun containsValue(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
[Enhancement]: public abstract fun containsValue(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
[SubstitutionOverride]: public abstract fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
[Enhancement]: public abstract fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
[IntersectionOverride]: public abstract operator fun get(key: R|ft<K3 & Any, K3?>|): R|V3?| from Java enhancement scope for /SomeMap [id: 0]
[SubstitutionOverride]: public abstract operator fun get(key: R|ft<K3 & Any, K3?>|): R|V3?| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
[SubstitutionOverride]: public abstract operator fun get(key: R|K|): R|V?| from Use site scope of kotlin/collections/MutableMap [id: 2]
@@ -31,9 +31,9 @@ SomeMap:
[Library]: public open fun remove(key: R|K|, value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 1]
MyMap:
[Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
[SubstitutionOverride]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 1]
[Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 2]
[Enhancement]: public abstract fun containsValue(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
[Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
[SubstitutionOverride]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 1]
[Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 2]
[Enhancement]: public abstract fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
[Enhancement]: public abstract operator fun get(key: R|ft<K2 & Any, K2?>|): R|ft<V2 & Any, V2?>| from Java enhancement scope for /MyMap [id: 0]
compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt
Vendored
+2 -2
View File
@@ -16,7 +16,7 @@ FILE: Main.kt
R|/takeStrings|(R|<local>/list|)
}
public final fun testFromJava(): R|kotlin/Unit| {
lval values: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>| = Q|Utils|.R|/Utils.getStrings|()
lval list: R|kotlin/collections/List<ft<kotlin/String, kotlin/String?>>| = R|/myListOf|<R|ft<kotlin/String, kotlin/String?>|>(vararg(*R|<local>/values|))
lval values: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>| = Q|Utils|.R|/Utils.getStrings|()
lval list: R|kotlin/collections/List<kotlin/String!>| = R|/myListOf|<R|kotlin/String!|>(vararg(*R|<local>/values|))
R|/takeStrings|(R|<local>/list|)
}
compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: main.kt
public final fun main(): R|kotlin/Unit| {
Q|Keys|.R|/Keys.getData|<R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|>(Q|Keys|.R|/Keys.X|).R|SubstitutionOverride<kotlin/Array.get: R|ft<kotlin/String, kotlin/String?>|>|(Int(0)).R|kotlin/String.length|
Q|Keys|.R|/Keys.getData|<R|ft<kotlin/String, kotlin/String?>|>(Q|Keys|.R|/Keys.Y|).R|kotlin/String.length|
Q|Keys|.R|/Keys.getData|<R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|>(Q|Keys|.R|/Keys.X|).R|SubstitutionOverride<kotlin/Array.get: R|kotlin/String!|>|(Int(0)).R|kotlin/String.length|
Q|Keys|.R|/Keys.getData|<R|kotlin/String!|>(Q|Keys|.R|/Keys.Y|).R|kotlin/String.length|
}
compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: main.kt
public final fun main(x: R|kotlin/collections/MutableCollection<kotlin/collections/Set<kotlin/String>>|): R|kotlin/Unit| {
lval y: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>| = Q|ContainerUtil|.R|/ContainerUtil.flatten|<R|ft<kotlin/String, kotlin/String?>|>(R|<local>/x|)
R|<local>/y|.R|SubstitutionOverride<kotlin/collections/MutableList.get: R|ft<kotlin/String, kotlin/String?>|>|(Int(0)).R|kotlin/String.length|
lval y: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>| = Q|ContainerUtil|.R|/ContainerUtil.flatten|<R|kotlin/String!|>(R|<local>/x|)
R|<local>/y|.R|SubstitutionOverride<kotlin/collections/MutableList.get: R|kotlin/String!|>|(Int(0)).R|kotlin/String.length|
}
compiler/fir/analysis-tests/testData/resolve/treeSet.fir.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
FILE: treeSet.kt
public final val x: R|java/util/SortedSet<kotlin/Int>| = R|java/util/TreeSet.TreeSet|<R|ft<kotlin/Int, kotlin/Int?>|>()
public final val x: R|java/util/SortedSet<kotlin/Int>| = R|java/util/TreeSet.TreeSet|<R|kotlin/Int!|>()
public get(): R|java/util/SortedSet<kotlin/Int>|
compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/referenceToJavaStdlib.fir.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
FILE: referenceToJavaStdlib.kt
public final fun detectDirsWithTestsMapFileOnly(file: R|java/io/File|): R|kotlin/collections/List<kotlin/String>| {
Q|java/nio/file/Files|.R|java/nio/file/Files.walk|(R|<local>/file|.R|java/io/File.toPath|()).R|SubstitutionOverride<java/util/stream/Stream.filter: R|ft<java/util/stream/Stream<ft<java/nio/file/Path, java/nio/file/Path?>>, java/util/stream/Stream<ft<java/nio/file/Path, java/nio/file/Path?>>?>|>|(Q|java/nio/file/Files|::R|java/nio/file/Files.isRegularFile|)
Q|java/nio/file/Files|.R|java/nio/file/Files.walk|(R|<local>/file|.R|java/io/File.toPath|()).R|SubstitutionOverride<java/util/stream/Stream.filter: R|ft<java/util/stream/Stream<java/nio/file/Path!>, java/util/stream/Stream<java/nio/file/Path!>?>|>|(Q|java/nio/file/Files|::R|java/nio/file/Files.isRegularFile|)
}
public abstract interface A : R|kotlin/Any| {
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
FILE: main.kt
public final val enumMap: R|java/util/EnumMap<ft<JavaEnum, JavaEnum?>, ft<kotlin/String, kotlin/String?>>| = R|java/util/EnumMap.EnumMap|<R|ft<JavaEnum, JavaEnum?>|, R|ft<kotlin/String, kotlin/String?>|>(R|kotlin/collections/mapOf|<R|ft<JavaEnum, JavaEnum?>|, R|kotlin/String|>(Q|JavaEnum|.R|/JavaEnum.A|.R|kotlin/to|<R|@EnhancedNullability JavaEnum|, R|kotlin/String|>(String(A))))
public get(): R|java/util/EnumMap<ft<JavaEnum, JavaEnum?>, ft<kotlin/String, kotlin/String?>>|
public final val enumMap: R|java/util/EnumMap<JavaEnum!, kotlin/String!>| = R|java/util/EnumMap.EnumMap|<R|JavaEnum!|, R|kotlin/String!|>(R|kotlin/collections/mapOf|<R|JavaEnum!|, R|kotlin/String|>(Q|JavaEnum|.R|/JavaEnum.A|.R|kotlin/to|<R|@EnhancedNullability JavaEnum|, R|kotlin/String|>(String(A))))
public get(): R|java/util/EnumMap<JavaEnum!, kotlin/String!>|
compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/FieldVsSyntheticAccessor.fir.txt
Vendored
+3 -3
View File
@@ -7,15 +7,15 @@ FILE: User.kt
}
public final fun foo(tree: R|BaseClass|): R|kotlin/Unit| {
lval ui: R|ft<kotlin/String, kotlin/String?>| = R|<local>/tree|.<HIDDEN: /BaseClass.ui is invisible>#
lval ui: R|kotlin/String!| = R|<local>/tree|.<HIDDEN: /BaseClass.ui is invisible>#
}
public final fun bar(): R|kotlin/Unit| {
lval ui: R|ft<kotlin/String, kotlin/String?>| = this@R|test/User|.R|/BaseClass.ui|
lval ui: R|kotlin/String!| = this@R|test/User|.R|/BaseClass.ui|
}
public final fun baz(): R|kotlin/Unit| {
lval ui: R|ft<kotlin/String, kotlin/String?>| = this@R|test/User|.R|/BaseClass.ui|
lval ui: R|kotlin/String!| = this@R|test/User|.R|/BaseClass.ui|
}
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/IntersectionWithJavaString.fir.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
FILE: IntersectionWithJavaString.kt
public final fun collapse(path: R|kotlin/String|): R|kotlin/Unit| {
lval result: R|ft<kotlin/String, kotlin/String?>| = (R|<local>/path| as R|java/lang/String|).R|java/lang/String.replace|(String(123), String(456))
lval result: R|kotlin/String!| = (R|<local>/path| as R|java/lang/String|).R|java/lang/String.replace|(String(123), String(456))
when () {
!==(R|<local>/result|, R|<local>/path|) -> {
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt
}
public final fun test(): R|kotlin/Unit| {
this@R|/B|.R|SubstitutionOverride</B.foo: R|ft<Some, Some?>|>|(R|/Some.Some|())
this@R|/B|.R|SubstitutionOverride</B.foo: R|Some!|>|(R|/Some.Some|())
}
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt
Vendored
+1 -1
View File
@@ -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<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>| = this@R|/A|.R|/Some.bar|(R|kotlin/intArrayOf|(vararg(Int(0), Int(2), Int(-2))))
lval res3: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>| = this@R|/A|.R|/Some.bar|(R|kotlin/intArrayOf|(vararg(Int(0), Int(2), Int(-2))))
}
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt
Vendored
+4 -4
View File
@@ -1,14 +1,14 @@
FILE: main.kt
public final fun main(): R|kotlin/Unit| {
Q|JavaClass|.R|/JavaClass.foo1|(<L> = foo1@fun <anonymous>(): R|ft<kotlin/Int, kotlin/Int?>| <inline=NoInline> {
Q|JavaClass|.R|/JavaClass.foo1|(<L> = foo1@fun <anonymous>(): R|kotlin/Int!| <inline=NoInline> {
^ Int(123)
}
)
Q|JavaClass|.R|/JavaClass.foo2|(<L> = foo2@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
Q|JavaClass|.R|/JavaClass.foo2|(<L> = foo2@fun <anonymous>(it: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/it|.R|kotlin/Int.plus|(Int(2)).R|kotlin/Int.toString|()
}
)
Q|JavaClass|.R|/JavaClass.foo2|(foo2@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
Q|JavaClass|.R|/JavaClass.foo2|(foo2@fun <anonymous>(it: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/it|.R|kotlin/Int.plus|(Int(3)).R|kotlin/Int.toString|()
}
)
@@ -17,7 +17,7 @@ FILE: main.kt
}
Q|JavaClass|.R|/JavaClass.foo2|(R|<local>/y|)
Q|JavaClass|.R|/JavaClass.foo3|<R|ft<kotlin/Int, kotlin/Int?>|>(foo3@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline> {
Q|JavaClass|.R|/JavaClass.foo3|<R|kotlin/Int!|>(foo3@fun <anonymous>(it: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/it|.R|kotlin/Int.plus|(Int(4)).R|kotlin/Int.toString|()
}
, Int(5))
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt
Vendored
+1 -1
View File
@@ -5,5 +5,5 @@ FILE: test.kt
^select R|<local>/x|
}
public final fun test(d1: R|jvm/DiagnosticWithParameters1<*, *>|, d2: R|jvm/DiagnosticWithParameters2<*, *, *>|): R|kotlin/Unit| {
lval res: R|ft<kotlin/Any, kotlin/Any?>| = R|jvm/select|<R|ft<kotlin/Any, kotlin/Any?>|>(R|<local>/d1|.R|jvm/DiagnosticWithParameters1.a|, R|<local>/d2|.R|jvm/DiagnosticWithParameters2.b|)
lval res: R|kotlin/Any!| = R|jvm/select|<R|kotlin/Any!|>(R|<local>/d1|.R|jvm/DiagnosticWithParameters1.a|, R|<local>/d2|.R|jvm/DiagnosticWithParameters2.b|)
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt
Vendored
+2 -2
View File
@@ -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<kotlin/String, kotlin/String?>| = R|<local>/jc|.R|/JavaClass.text|
lval result: R|kotlin/String!| = R|<local>/jc|.R|/JavaClass.text|
}
public final fun otherTest(jc: R|JavaClass|): R|kotlin/Unit| {
lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/jc|.R|/JavaClass.text|
lval result: R|kotlin/String!| = R|<local>/jc|.R|/JavaClass.text|
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
FILE: test.kt
public final val x: R|ft<kotlin/String, kotlin/String?>| = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
public get(): R|ft<kotlin/String, kotlin/String?>|
public final val x: R|kotlin/String!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
public get(): R|kotlin/String!|
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ FILE: K2.kt
}
public final fun bar(): R|kotlin/Unit| {
this@R|/K2|.R|SubstitutionOverride</J1.foo: R|ft<kotlin/Int, kotlin/Int?>|>|(Int(1))
this@R|/K2|.R|SubstitutionOverride</J1.foo: R|kotlin/Int!|>|(Int(1))
this@R|/K2|.R|/J1.baz|()
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt
Vendored
+1 -1
View File
@@ -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|<R|ft<kotlin/Int, kotlin/Int?>|>())
Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|<R|kotlin/Int!|>())
Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|<R|kotlin/Int|>())
Q|JavaClass|.<Inapplicable(INAPPLICABLE): /JavaClass.baz>#(R|/KotlinClass.KotlinClass|<R|kotlin/String|>())
Q|JavaClass|.<Inapplicable(INAPPLICABLE): /JavaClass.baz>#(String())
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
FILE: test.kt
public final fun test(): R|kotlin/Unit| {
lval logger: R|ft<Logger, Logger?>| = Q|Logger|.R|/Logger.getInstance|(String(test))
lval logger: R|Logger!| = 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<out MyTest>| = <getClass>(this@R|/MyTest|).R|kotlin/jvm/java|<R|CapturedType(out MyTest)|>
private get(): R|java/lang/Class<out MyTest>|
private final val logger: R|ft<Logger, Logger?>| = Q|Logger|.R|/Logger.getInstance|(this@R|/MyTest|.R|/MyTest.klass|)
private get(): R|ft<Logger, Logger?>|
private final val logger: R|Logger!| = Q|Logger|.R|/Logger.getInstance|(this@R|/MyTest|.R|/MyTest.klass|)
private get(): R|Logger!|
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt
Vendored
+2 -2
View File
@@ -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<kotlin/String, kotlin/String?>| = R|<local>/b|.R|/Test.MapEntryImpl.key|
lval value: R|ft<kotlin/String, kotlin/String?>| = R|<local>/b|.R|/Test.MapEntryImpl.value|
lval key: R|kotlin/String!| = R|<local>/b|.R|/Test.MapEntryImpl.key|
lval value: R|kotlin/String!| = R|<local>/b|.R|/Test.MapEntryImpl.value|
R|<local>/b|.R|/Test.MapEntryImpl.setValue|(Null(null))
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt
Vendored
+3 -3
View File
@@ -8,15 +8,15 @@ FILE: test.kt
public final fun test(e: R|MyException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
R|<local>/e|.R|kotlin/Throwable.printStackTrace|()
R|<local>/e|.R|kotlin/Throwable.printStackTrace|(R|<local>/stream|)
lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
lval result: R|kotlin/String!| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
}
public final fun test(e: R|YourException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
R|<local>/e|.R|kotlin/Throwable.printStackTrace|()
R|<local>/e|.R|kotlin/Throwable.printStackTrace|(R|<local>/stream|)
lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
lval result: R|kotlin/String!| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
}
public final fun test(e: R|kotlin/Exception|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
R|<local>/e|.R|kotlin/Throwable.printStackTrace|()
R|<local>/e|.R|kotlin/Throwable.printStackTrace|(R|<local>/stream|)
lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
lval result: R|kotlin/String!| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
FILE: test.kt
public abstract interface UseIterable : R|MyIterable<kotlin/String>| {
public open fun test(): R|kotlin/Unit| {
lval it: R|kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.iterator: R|kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>>|>|()
lval split: R|java/util/Spliterator<ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.spliterator: R|@EnhancedNullability java/util/Spliterator<ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>>|>|()
lval it: R|kotlin/collections/MutableIterator<kotlin/String!>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.iterator: R|kotlin/collections/MutableIterator<kotlin/String!>|>|()
lval split: R|java/util/Spliterator<@EnhancedNullability kotlin/String!>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.spliterator: R|@EnhancedNullability java/util/Spliterator<@EnhancedNullability kotlin/String!>|>|()
}
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt
Vendored
+6 -6
View File
@@ -1,20 +1,20 @@
FILE: test.kt
public final fun test(map: R|MyMap|): R|kotlin/Unit| {
lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/map|.R|kotlin/collections/getOrPut|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>(String(key), <L> = getOrPut@fun <anonymous>(): R|ft<kotlin/String, kotlin/String?>| <inline=Inline, kind=UNKNOWN> {
lval result: R|kotlin/String!| = R|<local>/map|.R|kotlin/collections/getOrPut|<R|kotlin/String!|, R|kotlin/String!|>(String(key), <L> = getOrPut@fun <anonymous>(): R|kotlin/String!| <inline=Inline, kind=UNKNOWN> {
^ String(value)
}
)
lval otherResult: R|ft<kotlin/String, kotlin/String?>| = R|<local>/map|.R|SubstitutionOverride</MyMap.getOrDefault: R|ft<kotlin/String, kotlin/String?>|>|(String(key), String(value))
lval otherResult: R|kotlin/String!| = R|<local>/map|.R|SubstitutionOverride</MyMap.getOrDefault: R|kotlin/String!|>|(String(key), String(value))
lval anotherResult: R|kotlin/String?| = R|<local>/map|.R|SubstitutionOverride</MyMap.replace: R|kotlin/String?|>|(String(key), String(value))
R|<local>/map|.R|SubstitutionOverride</MyMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>|, value: R|ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>|): R|kotlin/Unit| <inline=NoInline> {
R|<local>/map|.R|SubstitutionOverride</MyMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|@EnhancedNullability kotlin/String!|, value: R|@EnhancedNullability kotlin/String!|): R|kotlin/Unit| <inline=NoInline> {
R|kotlin/io/println|(<strcat>(R|<local>/key|, String(: ), R|<local>/value|))
R|<local>/key|.R|kotlin/String.length|
R|<local>/value|.R|kotlin/String.length|
}
)
R|<local>/map|.R|kotlin/collections/forEach|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>(<L> = forEach@fun <anonymous>(<destruct>: R|kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN> {
lval key: R|ft<kotlin/String, kotlin/String?>| = R|<local>/<destruct>|.R|kotlin/collections/component1|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>()
lval value: R|ft<kotlin/String, kotlin/String?>| = R|<local>/<destruct>|.R|kotlin/collections/component2|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>()
R|<local>/map|.R|kotlin/collections/forEach|<R|kotlin/String!|, R|kotlin/String!|>(<L> = forEach@fun <anonymous>(<destruct>: R|kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>|): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN> {
lval key: R|kotlin/String!| = R|<local>/<destruct>|.R|kotlin/collections/component1|<R|kotlin/String!|, R|kotlin/String!|>()
lval value: R|kotlin/String!| = R|<local>/<destruct>|.R|kotlin/collections/component2|<R|kotlin/String!|, R|kotlin/String!|>()
R|kotlin/io/println|(<strcat>(R|<local>/key|, String(: ), R|<local>/value|))
R|<local>/key|.R|kotlin/String.length|
R|<local>/value|.R|kotlin/String.length|
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: main.kt
public final fun test(): R|kotlin/Unit| {
lval project: R|kotlin/String| = Q|PlatformDataKeys|.R|/CommonDataKeys.PROJECT|
lval member: R|ft<kotlin/String, kotlin/String?>| = R|/PlatformDataKeys.PlatformDataKeys|().R|/CommonDataKeys.MEMBER|
lval member: R|kotlin/String!| = R|/PlatformDataKeys.PlatformDataKeys|().R|/CommonDataKeys.MEMBER|
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt
Vendored
+1 -1
View File
@@ -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|<R|ft<T, T?>|>(this@R|/User|.R|/User.settings|.R|kotlin/jvm/javaClass|<R|ft<T, T?>|>)
this@R|/User|.R|/User.settings| = Q|StaticOwner|.R|/StaticOwner.newInstance|<R|T!|>(this@R|/User|.R|/User.settings|.R|kotlin/jvm/javaClass|<R|T!|>)
}
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt
Vendored
+4 -4
View File
@@ -1,13 +1,13 @@
FILE: test.kt
public final fun <D : R|kotlin/Any|> R|Call<D>|.testForEach(): R|kotlin/Unit| {
this@R|/testForEach|.R|/Call.arguments|.R|SubstitutionOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>|, value: R|ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>|): R|kotlin/Unit| <inline=NoInline> {
this@R|/testForEach|.R|/Call.arguments|.R|SubstitutionOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|@EnhancedNullability kotlin/String!|, value: R|@EnhancedNullability kotlin/String!|): R|kotlin/Unit| <inline=NoInline> {
R|<local>/key|.R|kotlin/String.length|
R|<local>/value|.R|kotlin/String.length|
}
)
this@R|/testForEach|.R|/Call.arguments|.R|kotlin/collections/forEach|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>(<L> = forEach@fun <anonymous>(it: R|kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN> {
R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.key: R|ft<kotlin/String, kotlin/String?>|>|.R|kotlin/String.length|
R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.value: R|ft<kotlin/String, kotlin/String?>|>|.R|kotlin/String.length|
this@R|/testForEach|.R|/Call.arguments|.R|kotlin/collections/forEach|<R|kotlin/String!|, R|kotlin/String!|>(<L> = forEach@fun <anonymous>(it: R|kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>|): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN> {
R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.key: R|kotlin/String!|>|.R|kotlin/String.length|
R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.value: R|kotlin/String!|>|.R|kotlin/String.length|
}
)
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: capturedFlexible.kt
public final fun foo(z: R|java/util/zip/ZipFile|): R|kotlin/Unit| {
R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|CapturedType(out ft<java/util/zip/ZipEntry, java/util/zip/ZipEntry?>)|>()
R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|CapturedType(out java/util/zip/ZipEntry!)|>()
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: main.kt
public final fun bar(bindingContext: R|BindingContext|): R|kotlin/Unit| {
R|<local>/bindingContext|.R|/BindingContext.get|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/Double, kotlin/Double?>|>(Q|Slices|.R|/Slices.X|, R|<local>/bindingContext|.R|/BindingContext.get|<R|ft<kotlin/Int, kotlin/Int?>|, R|ft<kotlin/String, kotlin/String?>|>(Q|Slices|.R|/Slices.Y|, Int(1)))
R|<local>/bindingContext|.R|/BindingContext.get|<R|kotlin/String!|, R|kotlin/Double!|>(Q|Slices|.R|/Slices.X|, R|<local>/bindingContext|.R|/BindingContext.get|<R|kotlin/Int!|, R|kotlin/String!|>(Q|Slices|.R|/Slices.Y|, Int(1)))
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
FILE: javaLangComparator.kt
public final fun test_2(list: R|kotlin/collections/List<kotlin/Int>|): R|kotlin/Unit| {
lval comp: R|java/util/Comparator<kotlin/Int>| = Q|java/util|.R|java/util/Comparator|<R|kotlin/Int|>(<L> = Comparator@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|, y: R|ft<kotlin/Int, kotlin/Int?>|): R|kotlin/Int| <inline=NoInline> {
lval comp: R|java/util/Comparator<kotlin/Int>| = Q|java/util|.R|java/util/Comparator|<R|kotlin/Int|>(<L> = Comparator@fun <anonymous>(x: R|kotlin/Int!|, y: R|kotlin/Int!|): R|kotlin/Int| <inline=NoInline> {
^ Int(1)
}
)
compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
FILE: kotlinComparatorAlias.kt
public final fun test_1(): R|kotlin/Unit| {
lval comp: R|java/util/Comparator<kotlin/Int>| = R|java/util/Comparator|<R|kotlin/Int|>(<L> = Comparator@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|, y: R|ft<kotlin/Int, kotlin/Int?>|): R|kotlin/Int| <inline=NoInline> {
lval comp: R|java/util/Comparator<kotlin/Int>| = R|java/util/Comparator|<R|kotlin/Int|>(<L> = Comparator@fun <anonymous>(x: R|kotlin/Int!|, y: R|kotlin/Int!|): R|kotlin/Int| <inline=NoInline> {
^ Int(1)
}
)
compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/definitelyNotNullCast.fir.txt
Vendored
+1 -1
View File
@@ -10,5 +10,5 @@ FILE: test.kt
}
public final val generator: R|Generator| = R|/Generator.Generator|()
public get(): R|Generator|
public final val y: R|Value| = (R|/generator|.R|/Generator.createValue|<R|ft<Value, Value?>|>(String(Omega)) as R|Value|)
public final val y: R|Value| = (R|/generator|.R|/Generator.createValue|<R|Value!|>(String(Omega)) as R|Value|)
public get(): R|Value|
compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/immutableName.overrides.txt
Vendored
+7 -6
View File
@@ -1,13 +1,14 @@
ImplDerived:
[Source]: public abstract override fun foo(name: R|kotlin/String?|): R|Derived| from Use site scope of /ImplDerived [id: 0]
[Source]: public open override fun foo(name: R|kotlin/String|): R|Base| from Use site scope of /Impl [id: 1]
[Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|ft<Base, Base?>| from Java enhancement scope for /Base [id: 2]
[Enhancement]: public abstract fun foo(name: R|ft<kotlin/String, kotlin/String?>|): R|@EnhancedNullability Derived| from Java enhancement scope for /Derived [id: 3]
[Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|ft<Base, Base?>| from Java enhancement scope for /Base [id: 2]
[Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|Base!| from Java enhancement scope for /Base [id: 2]
[Enhancement]: public abstract fun foo(name: R|kotlin/String!|): R|@EnhancedNullability Derived| from Java enhancement scope for /Derived [id: 3]
[Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|Base!| from Java enhancement scope for /Base [id: 2]
DerivedImpl:
[Source]: public abstract override fun foo(name: R|kotlin/String?|): R|Derived| from Use site scope of /DerivedImpl [id: 0]
[Enhancement]: public abstract fun foo(name: R|ft<kotlin/String, kotlin/String?>|): R|@EnhancedNullability Derived| from Java enhancement scope for /Derived [id: 1]
[Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|ft<Base, Base?>| from Java enhancement scope for /Base [id: 2]
[Enhancement]: public abstract fun foo(name: R|kotlin/String!|): R|@EnhancedNullability Derived| from Java enhancement scope for /Derived [id: 1]
[Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|Base!| from Java enhancement scope for /Base [id: 2]
[Source]: public open override fun foo(name: R|kotlin/String|): R|Base| from Use site scope of /Impl [id: 3]
[Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|ft<Base, Base?>| from Java enhancement scope for /Base [id: 2]
[Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|Base!| from Java enhancement scope for /Base [id: 2]
compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ FILE: samForComparator.kt
public final fun foo(x: R|kotlin/Comparator<in kotlin/CharSequence>|): R|kotlin/Unit| {
}
public final fun main(): R|kotlin/Unit| {
R|/foo|(<L> = foo@fun <anonymous>(x: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|kotlin/Int| <inline=NoInline> {
R|/foo|(<L> = foo@fun <anonymous>(x: R|kotlin/CharSequence!|, y: R|kotlin/CharSequence!|): R|kotlin/Int| <inline=NoInline> {
^ R|<local>/x|.R|kotlin/CharSequence.length|.R|kotlin/Int.minus|(R|<local>/y|.R|kotlin/CharSequence.length|)
}
)
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt
+16 -2
View File
@@ -53,14 +53,28 @@ fun ConeKotlinType.render(renderFqNames: Boolean = true): String {
} + nullabilitySuffix
}
private fun ConeFlexibleType.render(renderFqNames: Boolean): String =
buildString {
private fun ConeFlexibleType.render(renderFqNames: Boolean): String {
if (lowerBound is ConeLookupTagBasedType && upperBound is ConeLookupTagBasedType &&
lowerBound.lookupTag == upperBound.lookupTag &&
lowerBound.nullability == ConeNullability.NOT_NULL && upperBound.nullability == ConeNullability.NULLABLE
) {
if (lowerBound !is ConeClassLikeType || lowerBound.typeArguments.isEmpty()) {
if (upperBound !is ConeClassLikeType || upperBound.typeArguments.isEmpty()) {
return buildString {
append(lowerBound.render(renderFqNames))
append("!")
}
}
}
}
return buildString {
append("ft<")
append(lowerBound.render(renderFqNames))
append(", ")
append(upperBound.render(renderFqNames))
append(">")
}
}
private fun ConeKotlinType.renderAttributes(): String {
if (!attributes.any()) return ""
compiler/testData/cli/jvm/firDeprecationJava.out
Vendored
+2 -2
View File
@@ -5,11 +5,11 @@ compiler/testData/cli/jvm/firDeprecationJava.kt:3:12: warning: '@Deprecated(...)
' is deprecated. Deprecated in Java
thread.stop()
^
compiler/testData/cli/jvm/firDeprecationJava.kt:4:17: warning: '@Deprecated(...) fun bar(a: ft<String, String?>, b: Int, c: Double): ft<String, String?>
compiler/testData/cli/jvm/firDeprecationJava.kt:4:17: warning: '@Deprecated(...) fun bar(a: String!, b: Int, c: Double): String!
' is deprecated. Deprecated in Java
JavaClass().bar("", 1, 2.0)
^
compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: '@Deprecated(...) field baz: ft<List, List?>
compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: '@Deprecated(...) field baz: List!
' is deprecated. Deprecated in Java
val baz = JavaClass().baz
^
compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
Vendored
+5 -5
View File
@@ -1,14 +1,14 @@
public open class ArrayInGenericArguments : R|kotlin/Any| {
public final static field X: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|
public final static field X: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, ArrayInGenericArguments.DataKey<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|
public final static field Y: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>>, ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>>?>|
public final static field Y: R|ft<ArrayInGenericArguments.DataKey<kotlin/IntArray!>, ArrayInGenericArguments.DataKey<kotlin/IntArray!>?>|
public final static field Z: R|ft<ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>, ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>?>|
public final static field Z: R|ft<ArrayInGenericArguments.DataKey<out ft<kotlin/Array<kotlin/CharSequence!>, kotlin/Array<out kotlin/CharSequence!>?>>, ArrayInGenericArguments.DataKey<out ft<kotlin/Array<kotlin/CharSequence!>, kotlin/Array<out kotlin/CharSequence!>?>>?>|
public constructor(): R|ArrayInGenericArguments|
public open class DataKey<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|ArrayInGenericArguments.DataKey<T>|
public open class DataKey<T : R|kotlin/Any!|> : R|kotlin/Any| {
public constructor<T : R|kotlin/Any!|>(): R|ArrayInGenericArguments.DataKey<T>|
}
}
compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public final class ArrayTypeVariance : R|kotlin/Any| {
public final fun toArray(p0: R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>>?>|): R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>>?>|
public final fun toArray(p0: R|ft<kotlin/Array<kotlin/Any!>, kotlin/Array<out kotlin/Any!>?>|): R|ft<kotlin/Array<kotlin/Any!>, kotlin/Array<out kotlin/Any!>?>|
public constructor(): R|test/ArrayTypeVariance|
compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
public final class ClassWithTypeP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ClassWithTypeP<P>|
public final class ClassWithTypeP<P : R|kotlin/Any!|> : R|kotlin/Any| {
public constructor<P : R|kotlin/Any!|>(): R|test/ClassWithTypeP<P>|
}
compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
public abstract class ClassWithTypePExtendsIterableP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<ft<P & Any, P?>>| {
public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ClassWithTypePExtendsIterableP<P>|
public abstract class ClassWithTypePExtendsIterableP<P : R|kotlin/Any!|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<ft<P & Any, P?>>| {
public constructor<P : R|kotlin/Any!|>(): R|test/ClassWithTypePExtendsIterableP<P>|
}
compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
public final class ClassWithTypePP<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<P & Any, P?>|> : R|kotlin/Any| {
public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<P & Any, P?>|>(): R|test/ClassWithTypePP<P, Q>|
public final class ClassWithTypePP<P : R|kotlin/Any!|, Q : R|ft<P & Any, P?>|> : R|kotlin/Any| {
public constructor<P : R|kotlin/Any!|, Q : R|ft<P & Any, P?>|>(): R|test/ClassWithTypePP<P, Q>|
}
compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
public open class ClassWithTypePRefNext<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public constructor<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ClassWithTypePRefNext<R, P>|
public open class ClassWithTypePRefNext<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|kotlin/Any!|> : R|kotlin/Any| {
public constructor<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|kotlin/Any!|>(): R|test/ClassWithTypePRefNext<R, P>|
}
compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class FieldOfArrayType : R|kotlin/Any| {
public open field files: R|ft<kotlin/Array<ft<java/io/File, java/io/File?>>, kotlin/Array<out ft<java/io/File, java/io/File?>>?>|
public open field files: R|ft<kotlin/Array<java/io/File!>, kotlin/Array<out java/io/File!>?>|
public constructor(): R|test/FieldOfArrayType|
compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
Vendored
+4 -4
View File
@@ -4,15 +4,15 @@ public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypes.Super1|, R|test/InheritMethodsDifferentReturnTypes.Super2| {
}
public abstract interface Super1 : R|kotlin/Any| {
public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
public abstract fun foo(): R|kotlin/CharSequence!|
public abstract fun bar(): R|ft<kotlin/String, kotlin/String?>|
public abstract fun bar(): R|kotlin/String!|
}
public abstract interface Super2 : R|kotlin/Any| {
public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
public abstract fun foo(): R|kotlin/String!|
public abstract fun bar(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
public abstract fun bar(): R|kotlin/CharSequence!|
}
}
compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
Vendored
+3 -3
View File
@@ -1,15 +1,15 @@
public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<ft<kotlin/String, kotlin/String?>, ft<kotlin/CharSequence, kotlin/CharSequence?>>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/String, kotlin/String?>>| {
public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin/String!, kotlin/CharSequence!>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin/CharSequence!, kotlin/String!>| {
}
public abstract interface Super1<F : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Super1<F : R|kotlin/Any!|, B : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(): R|ft<F & Any, F?>|
public abstract fun bar(): R|ft<B & Any, B?>|
}
public abstract interface Super2<FF : R|ft<kotlin/Any, kotlin/Any?>|, BB : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Super2<FF : R|kotlin/Any!|, BB : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(): R|ft<FF & Any, FF?>|
public abstract fun bar(): R|ft<BB & Any, BB?>|
compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
public open class InnerClassReferencesOuterTP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassReferencesOuterTP<P>|
public open class InnerClassReferencesOuterTP<P : R|kotlin/Any!|> : R|kotlin/Any| {
public constructor<P : R|kotlin/Any!|>(): R|test/InnerClassReferencesOuterTP<P>|
public open inner class Inner<Q : R|ft<P & Any, P?>|, P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public open inner class Inner<Q : R|ft<P & Any, P?>|, P : R|kotlin/Any!|> : R|kotlin/Any| {
public test/InnerClassReferencesOuterTP<P>.constructor<Q : R|ft<P & Any, P?>|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
}
compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
Vendored
+10 -10
View File
@@ -1,23 +1,23 @@
public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
public open fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>?>|
public open fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<kotlin/Byte!, kotlin/Char!, kotlin/Boolean!>, test/InnerClassTypeMultipleGeneric.Outer.Inner<kotlin/Byte!, kotlin/Char!, kotlin/Boolean!>?>|
public constructor(): R|test/InnerClassTypeMultipleGeneric|
public open inner class BaseOuter<H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public test/InnerClassTypeMultipleGeneric.constructor<H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>|
public open inner class BaseOuter<H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|> : R|kotlin/Any| {
public test/InnerClassTypeMultipleGeneric.constructor<H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>|
public abstract inner class BaseInner<H3 : R|ft<kotlin/Any, kotlin/Any?>|, H4 : R|ft<kotlin/Any, kotlin/Any?>|, H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>.constructor<H3 : R|ft<kotlin/Any, kotlin/Any?>|, H4 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<H3, H4, H1, H2>|
public abstract inner class BaseInner<H3 : R|kotlin/Any!|, H4 : R|kotlin/Any!|, H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|> : R|kotlin/Any| {
public test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>.constructor<H3 : R|kotlin/Any!|, H4 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<H3, H4, H1, H2>|
}
}
public open inner class Outer<E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter<ft<kotlin/Int, kotlin/Int?>, ft<E1 & Any, E1?>>| {
public open fun bar(): R|ft<test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/Int, kotlin/Int?>, ft<E1 & Any, E1?>>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/Int, kotlin/Int?>, ft<E1 & Any, E1?>>?>|
public open inner class Outer<E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter<kotlin/Int!, ft<E1 & Any, E1?>>| {
public open fun bar(): R|ft<test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, kotlin/CharSequence!, kotlin/Int!, ft<E1 & Any, E1?>>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, kotlin/CharSequence!, kotlin/Int!, ft<E1 & Any, E1?>>?>|
public test/InnerClassTypeMultipleGeneric.constructor<E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.Outer<E1, E2>|
public test/InnerClassTypeMultipleGeneric.constructor<E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.Outer<E1, E2>|
public open inner class Inner<E3 : R|ft<kotlin/Any, kotlin/Any?>|, E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<kotlin/Double, kotlin/Double?>, ft<kotlin/String, kotlin/String?>, ft<E2 & Any, E2?>, ft<E3 & Any, E3?>>| {
public test/InnerClassTypeMultipleGeneric.Outer<E1, E2>.constructor<E3 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.Outer.Inner<E3, E1, E2>|
public open inner class Inner<E3 : R|kotlin/Any!|, E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<kotlin/Double!, kotlin/String!, ft<E2 & Any, E2?>, ft<E3 & Any, E3?>>| {
public test/InnerClassTypeMultipleGeneric.Outer<E1, E2>.constructor<E3 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.Outer.Inner<E3, E1, E2>|
}
}
compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
public open class InnerClassesInGeneric<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassesInGeneric<P, Q>|
public open class InnerClassesInGeneric<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|kotlin/Any| {
public constructor<P : R|kotlin/Any!|, Q : R|kotlin/Any!|>(): R|test/InnerClassesInGeneric<P, Q>|
public open inner class Inner<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public open inner class Inner<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|kotlin/Any| {
public test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner<P, Q>|
}
public open inner class Inner2<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassesInGeneric.Inner<ft<P & Any, P?>, ft<Q & Any, Q?>>| {
public open inner class Inner2<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|test/InnerClassesInGeneric.Inner<ft<P & Any, P?>, ft<Q & Any, Q?>>| {
public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<P & Any, P?>>, kotlin/collections/Iterator<ft<P & Any, P?>>?>|
public test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner2<P, Q>|
compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
Vendored
+8 -8
View File
@@ -1,28 +1,28 @@
public open class InnerOfGeneric : R|kotlin/Any| {
public constructor(): R|test/InnerOfGeneric|
public abstract inner class A<K : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public test/InnerOfGeneric.constructor<K : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.A<K>|
public abstract inner class A<K : R|kotlin/Any!|> : R|kotlin/Any| {
public test/InnerOfGeneric.constructor<K : R|kotlin/Any!|>(): R|test/InnerOfGeneric.A<K>|
public abstract inner class Inner<K : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.S<ft<K & Any, K?>>| {
public abstract inner class Inner<K : R|kotlin/Any!|> : R|test/InnerOfGeneric.S<ft<K & Any, K?>>| {
public test/InnerOfGeneric.A<K>.constructor(): R|test/InnerOfGeneric.A.Inner<K>|
}
}
public open inner class B<L : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.A<ft<L & Any, L?>>| {
public test/InnerOfGeneric.constructor<L : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.B<L>|
public open inner class B<L : R|kotlin/Any!|> : R|test/InnerOfGeneric.A<ft<L & Any, L?>>| {
public test/InnerOfGeneric.constructor<L : R|kotlin/Any!|>(): R|test/InnerOfGeneric.B<L>|
public open inner class SubInner<L : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.A.Inner<ft<L & Any, L?>>| {
public open inner class SubInner<L : R|kotlin/Any!|> : R|test/InnerOfGeneric.A.Inner<ft<L & Any, L?>>| {
@R|java/lang/Override|() public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<L & Any, L?>>, kotlin/collections/Iterator<ft<L & Any, L?>>?>|
public test/InnerOfGeneric.B<L>.constructor(): R|test/InnerOfGeneric.B.SubInner<L>|
}
}
public open inner class S<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public open inner class S<E : R|kotlin/Any!|> : R|kotlin/Any| {
public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<E & Any, E?>>, kotlin/collections/Iterator<ft<E & Any, E?>>?>|
public test/InnerOfGeneric.constructor<E : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.S<E>|
public test/InnerOfGeneric.constructor<E : R|kotlin/Any!|>(): R|test/InnerOfGeneric.S<E>|
}
}
compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt
Vendored
+5 -5
View File
@@ -1,12 +1,12 @@
public abstract interface IntrinsicCompanionObject : R|kotlin/Any| {
public abstract fun testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>|): R|kotlin/Unit|
public abstract fun testInt(i: R|kotlin/Int.Companion!|): R|kotlin/Unit|
public abstract fun testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>|): R|kotlin/Unit|
public abstract fun testChar(c: R|kotlin/Char.Companion!|): R|kotlin/Unit|
public abstract fun testString(s: R|ft<kotlin/String.Companion, kotlin/String.Companion?>|): R|kotlin/Unit|
public abstract fun testString(s: R|kotlin/String.Companion!|): R|kotlin/Unit|
public abstract fun testBoolean(b: R|ft<kotlin/Boolean.Companion, kotlin/Boolean.Companion?>|): R|kotlin/Unit|
public abstract fun testBoolean(b: R|kotlin/Boolean.Companion!|): R|kotlin/Unit|
public abstract fun testEnum(e: R|ft<kotlin/Enum.Companion, kotlin/Enum.Companion?>|): R|kotlin/Unit|
public abstract fun testEnum(e: R|kotlin/Enum.Companion!|): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
public final class MethodReferencesOuterClassTP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/MethodReferencesOuterClassTP<P>|
public final class MethodReferencesOuterClassTP<P : R|kotlin/Any!|> : R|kotlin/Any| {
public constructor<P : R|kotlin/Any!|>(): R|test/MethodReferencesOuterClassTP<P>|
public final inner class Inner<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public final inner class Inner<P : R|kotlin/Any!|> : R|kotlin/Any| {
public final fun <Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
public test/MethodReferencesOuterClassTP<P>.constructor(): R|test/MethodReferencesOuterClassTP.Inner<P>|
compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class MethodTypePOneUpperBound : R|kotlin/Any| {
public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> bar(): R|kotlin/Unit|
public open fun <T : R|kotlin/Cloneable!|> bar(): R|kotlin/Unit|
public constructor(): R|test/MethodTypePOneUpperBound|
compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|, R|ft<java/lang/Runnable, java/lang/Runnable?>|> foo(): R|kotlin/Unit|
public open fun <T : R|kotlin/Cloneable!|, R|java/lang/Runnable!|> foo(): R|kotlin/Unit|
public constructor(): R|test/MethodTypePTwoUpperBounds|
compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public final class MethodWithTypeP : R|kotlin/Any| {
public final fun <P : R|ft<kotlin/Any, kotlin/Any?>|> f(): R|kotlin/Unit|
public final fun <P : R|kotlin/Any!|> f(): R|kotlin/Unit|
public constructor(): R|test/MethodWithTypeP|
compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public final class MethodWithTypePP : R|kotlin/Any| {
public final fun <P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
public final fun <P : R|kotlin/Any!|, Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
public constructor(): R|test/MethodWithTypePP|
compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
public open class MethodWithTypePRefClassP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public open class MethodWithTypePRefClassP<P : R|kotlin/Any!|> : R|kotlin/Any| {
public final fun <Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/MethodWithTypePRefClassP<P>|
public constructor<P : R|kotlin/Any!|>(): R|test/MethodWithTypePRefClassP<P>|
}
compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public final class MethosWithPRefTP : R|kotlin/Any| {
public final fun <P : R|ft<kotlin/Any, kotlin/Any?>|> f(p: R|ft<P & Any, P?>|): R|kotlin/Unit|
public final fun <P : R|kotlin/Any!|> f(p: R|ft<P & Any, P?>|): R|kotlin/Unit|
public constructor(): R|test/MethosWithPRefTP|
compiler/testData/loadJava/compiledJava/MyException.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class MyException : R|kotlin/Any| {
public constructor(message: R|ft<kotlin/String, kotlin/String?>|, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>|): R|test/MyException|
public constructor(message: R|kotlin/String!|, cause: R|kotlin/Throwable!|): R|test/MyException|
}
compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@ public open class OverrideMethod : R|kotlin/Any| {
public constructor(): R|test/OverrideMethod|
public/*package*/ open inner class Base : R|test/OverrideMethod.SuperBase| {
public/*package*/ open fun foo(s: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
public/*package*/ open fun foo(s: R|kotlin/String!|): R|kotlin/String!|
public/*package*/ open fun bar(): R|kotlin/Unit|
@@ -10,7 +10,7 @@ public open class OverrideMethod : R|kotlin/Any| {
}
public/*package*/ open inner class Derived : R|test/OverrideMethod.Base| {
@R|java/lang/Override|() public/*package*/ open fun foo(s: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
@R|java/lang/Override|() public/*package*/ open fun foo(s: R|kotlin/String!|): R|kotlin/String!|
public/*package*/ open fun baz(): R|kotlin/Unit|

Some files were not shown because too many files have changed in this diff Show More