Skip to content

Commit c2ae819

Browse files
cypressiousSpace Team
authored andcommitted
[FIR] Render trivial flexible types compactly
1 parent 6cbef32 commit c2ae819

File tree

75 files changed

+114
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+114
-180
lines changed

analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/recursiveTypeParameter.call.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ KtCallExpression(96,130): 'install(CoroutineModule.builder())'
55
CoroutineModule.builder() -> (KaVariableSignature:
66
name = builder
77
receiverType = null
8-
returnType = ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
9-
symbol = builder: ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
8+
returnType = AbstractModule.Builder<*>!
9+
symbol = builder: AbstractModule.Builder<*>!
1010
contextParameters = []
1111
callableId = null)
1212
}
@@ -20,13 +20,13 @@ KtCallExpression(96,130): 'install(CoroutineModule.builder())'
2020
signature = KaFunctionSignature:
2121
receiverType = null
2222
returnType = kotlin.Unit
23-
symbol = /AbstractModule.install(<dispatch receiver>: AbstractModule, builder: ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>): kotlin.Unit
23+
symbol = /AbstractModule.install(<dispatch receiver>: AbstractModule, builder: AbstractModule.Builder<*>!): kotlin.Unit
2424
valueParameters = [
2525
KaVariableSignature:
2626
name = builder
2727
receiverType = null
28-
returnType = ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
29-
symbol = builder: ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
28+
returnType = AbstractModule.Builder<*>!
29+
symbol = builder: AbstractModule.Builder<*>!
3030
contextParameters = []
3131
callableId = null
3232
]

analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/recursiveTypeParameter.candidates.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ KtCallExpression(96,130): 'install(CoroutineModule.builder())'
55
CoroutineModule.builder() -> (KaVariableSignature:
66
name = builder
77
receiverType = null
8-
returnType = ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
9-
symbol = builder: ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
8+
returnType = AbstractModule.Builder<*>!
9+
symbol = builder: AbstractModule.Builder<*>!
1010
contextParameters = []
1111
callableId = null)
1212
}
@@ -20,13 +20,13 @@ KtCallExpression(96,130): 'install(CoroutineModule.builder())'
2020
signature = KaFunctionSignature:
2121
receiverType = null
2222
returnType = kotlin.Unit
23-
symbol = /AbstractModule.install(<dispatch receiver>: AbstractModule, builder: ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>): kotlin.Unit
23+
symbol = /AbstractModule.install(<dispatch receiver>: AbstractModule, builder: AbstractModule.Builder<*>!): kotlin.Unit
2424
valueParameters = [
2525
KaVariableSignature:
2626
name = builder
2727
receiverType = null
28-
returnType = ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
29-
symbol = builder: ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
28+
returnType = AbstractModule.Builder<*>!
29+
symbol = builder: AbstractModule.Builder<*>!
3030
contextParameters = []
3131
callableId = null
3232
]

analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/recursiveTypeParameter.descriptors.call.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/recursiveTypeParameter.descriptors.candidates.txt

Lines changed: 0 additions & 36 deletions
This file was deleted.

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.standalone.fir.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ KaNamedFunctionSymbol:
548548
receiverParameter: null
549549
returnType: KaFlexibleType:
550550
annotations: []
551-
type: ft<java/lang/Class<test/E!>, java/lang/Class<test/E!>?>
551+
type: java/lang/Class<test/E!>!
552552
typeParameters: []
553553
valueParameters: []
554554
visibility: PUBLIC

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ KaNamedFunctionSymbol:
548548
receiverParameter: null
549549
returnType: KaFlexibleType:
550550
annotations: []
551-
type: ft<java/lang/Class<test/E!>, java/lang/Class<test/E!>?>
551+
type: java/lang/Class<test/E!>!
552552
typeParameters: []
553553
valueParameters: []
554554
visibility: PUBLIC

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.standalone.fir.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ KaNamedFunctionSymbol:
695695
receiverParameter: null
696696
returnType: KaFlexibleType:
697697
annotations: []
698-
type: ft<java/lang/Class<test/E!>, java/lang/Class<test/E!>?>
698+
type: java/lang/Class<test/E!>!
699699
typeParameters: []
700700
valueParameters: []
701701
visibility: PUBLIC

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ KaNamedFunctionSymbol:
695695
receiverParameter: null
696696
returnType: KaFlexibleType:
697697
annotations: []
698-
type: ft<java/lang/Class<test/E!>, java/lang/Class<test/E!>?>
698+
type: java/lang/Class<test/E!>!
699699
typeParameters: []
700700
valueParameters: []
701701
visibility: PUBLIC

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.standalone.fir.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ KaNamedFunctionSymbol:
695695
receiverParameter: null
696696
returnType: KaFlexibleType:
697697
annotations: []
698-
type: ft<java/lang/Class<test/E!>, java/lang/Class<test/E!>?>
698+
type: java/lang/Class<test/E!>!
699699
typeParameters: []
700700
valueParameters: []
701701
visibility: PUBLIC

analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ KaNamedFunctionSymbol:
695695
receiverParameter: null
696696
returnType: KaFlexibleType:
697697
annotations: []
698-
type: ft<java/lang/Class<test/E!>, java/lang/Class<test/E!>?>
698+
type: java/lang/Class<test/E!>!
699699
typeParameters: []
700700
valueParameters: []
701701
visibility: PUBLIC

0 commit comments

Comments
 (0)