[FIR IDE] Fixed test data for types

idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result

@@ -8,6 +8,7 @@ CALLABLE NAMES:
 
 CALLABLE SYMBOLS:
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: test
   isExtension: false
@@ -19,14 +20,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: test
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirKotlinPropertySymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: testVal
   getter: KtFirPropertyGetterSymbol(<getter>)
@@ -42,10 +43,9 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: testVal
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   visibility: PUBLIC
 
 CLASSIFIER NAMES:
@@ -62,7 +62,7 @@ KtFirClassOrObjectSymbol:
   name: C
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC
@@ -77,7 +77,7 @@ KtFirClassOrObjectSymbol:
   name: I
   origin: SOURCE
   primaryConstructor: null
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt

@@ -2,6 +2,7 @@ class: kotlin/Int
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.and
   isExtension: false
@@ -13,14 +14,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: and
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
@@ -32,14 +33,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
@@ -51,14 +52,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
@@ -70,14 +71,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
@@ -89,14 +90,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: compareTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
@@ -108,14 +109,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
@@ -127,14 +128,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.dec
   isExtension: false
@@ -146,14 +147,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: dec
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
@@ -165,14 +166,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Double
   annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
@@ -184,14 +185,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Float
   annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
@@ -203,14 +204,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
@@ -222,14 +223,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Long
   annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
@@ -241,14 +242,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
@@ -260,14 +261,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.inc
   isExtension: false
@@ -279,14 +280,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: inc
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.inv
   isExtension: false
@@ -298,14 +299,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: inv
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
@@ -317,14 +318,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Double
   annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
@@ -336,14 +337,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Float
   annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
@@ -355,14 +356,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
@@ -374,14 +375,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Long
   annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
@@ -393,14 +394,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
@@ -412,14 +413,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.or
   isExtension: false
@@ -431,14 +432,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: or
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
@@ -450,14 +451,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Double
   annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
@@ -469,14 +470,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Float
   annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
@@ -488,14 +489,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
@@ -507,14 +508,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Long
   annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
@@ -526,14 +527,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
@@ -545,14 +546,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/ranges/IntRange
   annotations: []
   callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
@@ -564,14 +565,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rangeTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/ranges/IntRange
   annotations: []
   callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
@@ -583,14 +584,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rangeTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/ranges/LongRange
   annotations: []
   callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
@@ -602,14 +603,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rangeTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/ranges/LongRange
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/ranges/IntRange
   annotations: []
   callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
@@ -621,14 +622,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rangeTo
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
@@ -640,14 +641,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Double
   annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
@@ -659,14 +660,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Float
   annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
@@ -678,14 +679,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
@@ -697,14 +698,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Long
   annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
@@ -716,14 +717,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: [kotlin/SinceKotlin(version = 1.1)]
   callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
@@ -735,14 +736,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.shl
   isExtension: false
@@ -754,14 +755,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: shl
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.shr
   isExtension: false
@@ -773,14 +774,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: shr
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
@@ -792,14 +793,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Double
   annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
@@ -811,14 +812,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Float
   annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
@@ -830,14 +831,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
@@ -849,14 +850,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Long
   annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
@@ -868,14 +869,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
@@ -887,14 +888,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Byte
   annotations: []
   callableIdIfNonLocal: kotlin.Int.toByte
   isExtension: false
@@ -906,14 +907,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toByte
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Byte
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Char
   annotations: []
   callableIdIfNonLocal: kotlin.Int.toChar
   isExtension: false
@@ -925,14 +926,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toChar
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Char
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Double
   annotations: []
   callableIdIfNonLocal: kotlin.Int.toDouble
   isExtension: false
@@ -944,14 +945,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toDouble
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Float
   annotations: []
   callableIdIfNonLocal: kotlin.Int.toFloat
   isExtension: false
@@ -963,14 +964,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toFloat
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.toInt
   isExtension: false
@@ -982,14 +983,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toInt
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Long
   annotations: []
   callableIdIfNonLocal: kotlin.Int.toLong
   isExtension: false
@@ -1001,14 +1002,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toLong
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Short
   annotations: []
   callableIdIfNonLocal: kotlin.Int.toShort
   isExtension: false
@@ -1020,14 +1021,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toShort
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Short
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.unaryMinus
   isExtension: false
@@ -1039,14 +1040,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: unaryMinus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.unaryPlus
   isExtension: false
@@ -1058,14 +1059,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: unaryPlus
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.ushr
   isExtension: false
@@ -1077,14 +1078,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: ushr
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.xor
   isExtension: false
@@ -1096,24 +1097,24 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: xor
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   containingClassIdIfNonLocal: kotlin/Int
   isPrimary: true
   origin: LIBRARY
   symbolKind: MEMBER
-  type: kotlin/Int
   valueParameters: []
   visibility: PRIVATE
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.Int.equals
   isExtension: false
@@ -1125,14 +1126,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: equals
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.Int.hashCode
   isExtension: false
@@ -1144,14 +1145,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: hashCode
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/String
   annotations: []
   callableIdIfNonLocal: kotlin.Int.toString
   isExtension: false
@@ -1163,9 +1164,8 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toString
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
@@ -1180,7 +1180,7 @@ KtFirClassOrObjectSymbol:
   name: Companion
   origin: LIBRARY
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: MEMBER
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt

@@ -2,6 +2,7 @@ class: kotlin/collections/MutableList
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.add
   isExtension: false
@@ -13,14 +14,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: add
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.add
   isExtension: false
@@ -32,14 +33,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: add
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.addAll
   isExtension: false
@@ -51,14 +52,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: addAll
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.addAll
   isExtension: false
@@ -70,14 +71,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: addAll
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.clear
   isExtension: false
@@ -89,14 +90,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: clear
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/collections/MutableListIterator<E>
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.listIterator
   isExtension: false
@@ -108,14 +109,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/collections/MutableListIterator<E>
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.listIterator
   isExtension: false
@@ -127,14 +128,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.remove
   isExtension: false
@@ -146,14 +147,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: remove
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.removeAll
   isExtension: false
@@ -165,14 +166,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: removeAll
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] E
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.removeAt
   isExtension: false
@@ -184,14 +185,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: removeAt
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: E
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.retainAll
   isExtension: false
@@ -203,14 +204,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: retainAll
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] E
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.set
   isExtension: false
@@ -222,14 +223,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: set
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: E
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/collections/MutableList<E>
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.subList
   isExtension: false
@@ -241,14 +242,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: subList
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/collections/MutableList<E>
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(fromIndex), KtFirFunctionValueParameterSymbol(toIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.contains
   isExtension: false
@@ -260,14 +261,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: contains
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.containsAll
   isExtension: false
@@ -279,14 +280,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: containsAll
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] E
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.get
   isExtension: false
@@ -298,14 +299,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: get
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: E
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.indexOf
   isExtension: false
@@ -317,14 +318,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: indexOf
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.isEmpty
   isExtension: false
@@ -336,14 +337,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: isEmpty
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/collections/MutableIterator<E>
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.iterator
   isExtension: false
@@ -355,14 +356,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: iterator
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/collections/MutableIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.lastIndexOf
   isExtension: false
@@ -374,14 +375,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: lastIndexOf
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirKotlinPropertySymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.collections.List.size
   getter: null
@@ -397,13 +398,13 @@ KtFirKotlinPropertySymbol:
   modality: ABSTRACT
   name: size
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   setter: null
   symbolKind: MEMBER
-  type: kotlin/Int
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Boolean
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.equals
   isExtension: false
@@ -415,14 +416,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: equals
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.hashCode
   isExtension: false
@@ -434,14 +435,14 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: hashCode
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/String
   annotations: []
   callableIdIfNonLocal: kotlin.collections.MutableList.toString
   isExtension: false
@@ -453,9 +454,8 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toString
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt

@@ -13,7 +13,7 @@ KtFirClassOrObjectSymbol:
   name: Lazy
   origin: LIBRARY
   primaryConstructor: null
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: [KtFirTypeParameterSymbol(T)]
   visibility: PUBLIC

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt

@@ -13,7 +13,7 @@ KtFirClassOrObjectSymbol:
   name: String
   origin: JAVA
   primaryConstructor: null
-  superTypes: [kotlin/Any, java/io/Serializable, kotlin/Comparable<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/CharSequence]
+  superTypes: [[] kotlin/Any, [] java/io/Serializable, [] kotlin/Comparable<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, [] kotlin/CharSequence]
   symbolKind: MEMBER
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/enumEntry.txt

@@ -4,8 +4,8 @@ callable: kotlin/LazyThreadSafetyMode.SYNCHRONIZED
 
 // SYMBOLS:
 KtFirEnumEntrySymbol:
+  annotatedType: [] kotlin/LazyThreadSafetyMode
   containingEnumClassIdIfNonLocal: kotlin/LazyThreadSafetyMode
   name: SYNCHRONIZED
   origin: LIBRARY
   symbolKind: MEMBER
-  type: kotlin/LazyThreadSafetyMode

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt

@@ -2,6 +2,7 @@ callable: kotlin/collections/List.get
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotatedType: [] E
   annotations: []
   callableIdIfNonLocal: kotlin.collections.List.get
   isExtension: false
@@ -13,9 +14,8 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: get
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: E
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
   visibility: PUBLIC

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt

@@ -2,6 +2,7 @@ callable: kotlin/collections/List.listIterator
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/collections/ListIterator<E>
   annotations: []
   callableIdIfNonLocal: kotlin.collections.List.listIterator
   isExtension: false
@@ -13,14 +14,14 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/collections/ListIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/collections/ListIterator<E>
   annotations: []
   callableIdIfNonLocal: kotlin.collections.List.listIterator
   isExtension: false
@@ -32,9 +33,8 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/collections/ListIterator<E>
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
   visibility: PUBLIC

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt

@@ -11,7 +11,7 @@ KtFirClassOrObjectSymbol:
   name: MutableEntry
   origin: LIBRARY
   primaryConstructor: null
-  superTypes: [kotlin/collections/Map.Entry<K, V>]
+  superTypes: [[] kotlin/collections/Map.Entry<K, V>]
   symbolKind: MEMBER
   typeParameters: [KtFirTypeParameterSymbol(K), KtFirTypeParameterSymbol(V)]
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolPointer/class.kt

@@ -12,7 +12,7 @@ KtFirClassOrObjectSymbol:
   name: A
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt

@@ -3,12 +3,12 @@ class A() {
 
 // SYMBOLS:
 KtFirConstructorSymbol:
+  annotatedType: [] A
   annotations: []
   containingClassIdIfNonLocal: A
   isPrimary: true
   origin: SOURCE
   symbolKind: MEMBER
-  type: A
   valueParameters: []
   visibility: PUBLIC
 
@@ -22,7 +22,7 @@ KtFirClassOrObjectSymbol:
   name: A
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt

@@ -5,59 +5,59 @@ class A() {
 
 // SYMBOLS:
 KtFirConstructorSymbol:
+  annotatedType: [] A
   annotations: []
   containingClassIdIfNonLocal: A
   isPrimary: true
   origin: SOURCE
   symbolKind: MEMBER
-  type: A
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionValueParameterSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   hasDefaultValue: false
   isVararg: false
   name: x
   origin: SOURCE
   symbolKind: NON_PROPERTY_PARAMETER
-  type: kotlin/Int
 
 KtFirConstructorSymbol:
+  annotatedType: [] A
   annotations: []
   containingClassIdIfNonLocal: A
   isPrimary: false
   origin: SOURCE
   symbolKind: MEMBER
-  type: A
   valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
   visibility: PUBLIC
 
 KtFirFunctionValueParameterSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   hasDefaultValue: false
   isVararg: false
   name: y
   origin: SOURCE
   symbolKind: NON_PROPERTY_PARAMETER
-  type: kotlin/Int
 
 KtFirFunctionValueParameterSymbol:
+  annotatedType: [] kotlin/String
   annotations: []
   hasDefaultValue: false
   isVararg: false
   name: z
   origin: SOURCE
   symbolKind: NON_PROPERTY_PARAMETER
-  type: kotlin/String
 
 KtFirConstructorSymbol:
+  annotatedType: [] A
   annotations: []
   containingClassIdIfNonLocal: A
   isPrimary: false
   origin: SOURCE
   symbolKind: MEMBER
-  type: A
   valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
   visibility: PUBLIC
 
@@ -71,7 +71,7 @@ KtFirClassOrObjectSymbol:
   name: A
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolPointer/enum.kt

@@ -4,18 +4,18 @@ enum class X {
 
 // SYMBOLS:
 KtFirEnumEntrySymbol:
+  annotatedType: [] X
   containingEnumClassIdIfNonLocal: X
   name: Y
   origin: SOURCE
   symbolKind: MEMBER
-  type: X
 
 KtFirEnumEntrySymbol:
+  annotatedType: [] X
   containingEnumClassIdIfNonLocal: X
   name: Z
   origin: SOURCE
   symbolKind: MEMBER
-  type: X
 
 KtFirClassOrObjectSymbol:
   annotations: []
@@ -27,7 +27,7 @@ KtFirClassOrObjectSymbol:
   name: X
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Enum<X>]
+  superTypes: [[] kotlin/Enum<X>]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt

@@ -5,6 +5,7 @@ class A {
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: A.x
   isExtension: false
@@ -16,14 +17,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: []
   callableIdIfNonLocal: A.y
   isExtension: false
@@ -35,9 +36,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
@@ -52,7 +52,7 @@ KtFirClassOrObjectSymbol:
   name: A
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt

@@ -5,6 +5,7 @@ class A {
 
 // SYMBOLS:
 KtFirKotlinPropertySymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: A.x
   getter: KtFirPropertyGetterSymbol(<getter>)
@@ -20,13 +21,13 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   setter: null
   symbolKind: MEMBER
-  type: kotlin/Int
   visibility: PUBLIC
 
 KtFirPropertyGetterSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   hasBody: true
   isDefault: false
@@ -35,10 +36,10 @@ KtFirPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   visibility: PUBLIC
 
 KtFirKotlinPropertySymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: A.y
   getter: KtFirPropertyGetterSymbol(<getter>)
@@ -54,10 +55,9 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverTypeAndAnnotations: [] kotlin/Int
+  receiverType: [] kotlin/Int
   setter: null
   symbolKind: MEMBER
-  type: kotlin/Int
   visibility: PUBLIC
 
 KtFirClassOrObjectSymbol:
@@ -70,7 +70,7 @@ KtFirClassOrObjectSymbol:
   name: A
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt

@@ -3,6 +3,7 @@ fun y() {}
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: x
   isExtension: false
@@ -14,14 +15,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: []
   callableIdIfNonLocal: y
   isExtension: false
@@ -33,9 +34,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt

@@ -3,6 +3,7 @@ val Int.y get() = this
 
 // SYMBOLS:
 KtFirKotlinPropertySymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: x
   getter: KtFirPropertyGetterSymbol(<getter>)
@@ -18,13 +19,13 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   visibility: PUBLIC
 
 KtFirPropertyGetterSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   hasBody: true
   isDefault: false
@@ -33,10 +34,10 @@ KtFirPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   visibility: PUBLIC
 
 KtFirKotlinPropertySymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: y
   getter: KtFirPropertyGetterSymbol(<getter>)
@@ -52,8 +53,7 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverTypeAndAnnotations: [] kotlin/Int
+  receiverType: [] kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt

@@ -2,6 +2,7 @@ callable: kotlin/collections/listOf
 
 // SYMBOLS:
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/collections/List<T>
   annotations: []
   callableIdIfNonLocal: kotlin.collections.listOf
   isExtension: false
@@ -13,14 +14,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: listOf
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/collections/List<T>
   typeParameters: [KtFirTypeParameterSymbol(T)]
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/collections/List<T>
   annotations: []
   callableIdIfNonLocal: kotlin.collections.listOf
   isExtension: false
@@ -32,14 +33,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: listOf
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/collections/List<T>
   typeParameters: [KtFirTypeParameterSymbol(T)]
   valueParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/collections/List<T>
   annotations: []
   callableIdIfNonLocal: kotlin.collections.listOf
   isExtension: false
@@ -51,9 +52,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: listOf
   origin: LIBRARY
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/collections/List<T>
   typeParameters: [KtFirTypeParameterSymbol(T)]
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt

@@ -11,7 +11,7 @@ KtFirClassOrObjectSymbol:
   name: Iterator
   origin: LIBRARY
   primaryConstructor: null
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: [KtFirTypeParameterSymbol(T)]
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt

@@ -11,7 +11,7 @@ KtFirClassOrObjectSymbol:
   name: FileWalkDirection
   origin: LIBRARY
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Enum<kotlin/io/FileWalkDirection>]
+  superTypes: [[] kotlin/Enum<kotlin/io/FileWalkDirection>]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt

@@ -12,30 +12,30 @@ class X {
 // SYMBOLS:
 /*
 KtFirFunctionValueParameterSymbol:
+  annotatedType: [] kotlin/String
   annotations: []
   hasDefaultValue: false
   isVararg: false
   name: param1
   origin: SOURCE
   symbolKind: NON_PROPERTY_PARAMETER
-  type: kotlin/String
 
 KtFirFunctionValueParameterSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   hasDefaultValue: false
   isVararg: false
   name: param2
   origin: SOURCE
   symbolKind: NON_PROPERTY_PARAMETER
-  type: kotlin/Int
 
 KtFirConstructorSymbol:
+  annotatedType: [] Anno
   annotations: []
   containingClassIdIfNonLocal: Anno
   isPrimary: true
   origin: SOURCE
   symbolKind: MEMBER
-  type: Anno
   valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
   visibility: PUBLIC
 
@@ -49,12 +49,13 @@ KtFirClassOrObjectSymbol:
   name: Anno
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Annotation]
+  superTypes: [[] kotlin/Annotation]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: [Anno(param1 = funparam, param2 = 3)]
   callableIdIfNonLocal: X.x
   isExtension: false
@@ -66,9 +67,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
@@ -83,7 +83,7 @@ KtFirClassOrObjectSymbol:
   name: X
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/anonymousObject.kt

@@ -10,6 +10,7 @@ class AnonymousContainer {
 // SYMBOLS:
 /*
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: []
   callableIdIfNonLocal: <anonymous>.run
   isExtension: false
@@ -21,14 +22,14 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: run
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
 
 KtFirKotlinPropertySymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: <anonymous>.data
   getter: KtFirPropertyGetterSymbol(<getter>)
@@ -44,19 +45,19 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: data
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   setter: null
   symbolKind: MEMBER
-  type: kotlin/Int
   visibility: PUBLIC
 
 KtFirAnonymousObjectSymbol:
   annotations: []
   origin: SOURCE
-  superTypes: [java/lang/Runnable]
+  superTypes: [[] java/lang/Runnable]
   symbolKind: LOCAL
 
 KtFirKotlinPropertySymbol:
+  annotatedType: [] java/lang/Runnable
   annotations: []
   callableIdIfNonLocal: AnonymousContainer.anonymousObject
   getter: KtFirPropertyGetterSymbol(<getter>)
@@ -72,10 +73,9 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: anonymousObject
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   setter: null
   symbolKind: MEMBER
-  type: java/lang/Runnable
   visibility: PUBLIC
 
 KtFirClassOrObjectSymbol:
@@ -88,7 +88,7 @@ KtFirClassOrObjectSymbol:
   name: AnonymousContainer
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/class.kt

@@ -13,7 +13,7 @@ KtFirClassOrObjectSymbol:
   name: A
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt

@@ -6,6 +6,7 @@ class A {
 // SYMBOLS:
 /*
 KtFirKotlinPropertySymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: A.a
   getter: KtFirPropertyGetterSymbol(<getter>)
@@ -21,13 +22,13 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: a
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   setter: null
   symbolKind: MEMBER
-  type: kotlin/Int
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: A.x
   isExtension: false
@@ -39,9 +40,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC
@@ -56,7 +56,7 @@ KtFirClassOrObjectSymbol:
   name: A
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt

@@ -23,7 +23,7 @@ KtFirClassOrObjectSymbol:
   name: A
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: TOP_LEVEL
   typeParameters: [KtFirTypeParameterSymbol(T), KtFirTypeParameterSymbol(R)]
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt

@@ -3,6 +3,7 @@ fun String.foo(): Int = 10
 // SYMBOLS:
 /*
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: foo
   isExtension: true
@@ -14,9 +15,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverTypeAndAnnotations: [] kotlin/String
+  receiverType: [] kotlin/String
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/function.kt

@@ -3,15 +3,16 @@ fun foo(x: Int) {}
 // SYMBOLS:
 /*
 KtFirFunctionValueParameterSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   hasDefaultValue: false
   isVararg: false
   name: x
   origin: SOURCE
   symbolKind: NON_PROPERTY_PARAMETER
-  type: kotlin/Int
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: []
   callableIdIfNonLocal: foo
   isExtension: false
@@ -23,9 +24,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [KtFirFunctionValueParameterSymbol(x)]
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt

@@ -8,15 +8,16 @@ KtFirTypeParameterSymbol:
   upperBounds: [kotlin/Any?]
 
 KtFirFunctionValueParameterSymbol:
+  annotatedType: [] X
   annotations: []
   hasDefaultValue: false
   isVararg: false
   name: x
   origin: SOURCE
   symbolKind: NON_PROPERTY_PARAMETER
-  type: X
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: []
   callableIdIfNonLocal: foo
   isExtension: false
@@ -28,9 +29,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: [KtFirTypeParameterSymbol(X)]
   valueParameters: [KtFirFunctionValueParameterSymbol(x)]
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt

@@ -3,6 +3,7 @@ fun foo(): Int = 10
 // SYMBOLS:
 /*
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Int
   annotations: []
   callableIdIfNonLocal: foo
   isExtension: false
@@ -14,9 +15,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/testData/symbolsByPsi/localDeclarations.kt

@@ -8,13 +8,14 @@ fun yyy() {
 // SYMBOLS:
 /*
 KtFirLocalVariableSymbol:
+  annotatedType: [] kotlin/Int
   isVal: true
   name: q
   origin: SOURCE
   symbolKind: LOCAL
-  type: kotlin/Int
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: []
   callableIdIfNonLocal: null
   isExtension: false
@@ -26,9 +27,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: aaa
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: LOCAL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: LOCAL
@@ -43,12 +43,13 @@ KtFirClassOrObjectSymbol:
   name: F
   origin: SOURCE
   primaryConstructor: KtFirConstructorSymbol(<constructor>)
-  superTypes: [kotlin/Any]
+  superTypes: [[] kotlin/Any]
   symbolKind: LOCAL
   typeParameters: []
   visibility: LOCAL
 
 KtFirFunctionSymbol:
+  annotatedType: [] kotlin/Unit
   annotations: []
   callableIdIfNonLocal: yyy
   isExtension: false
@@ -60,9 +61,8 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: yyy
   origin: SOURCE
-  receiverTypeAndAnnotations: null
+  receiverType: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: PUBLIC

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt

@@ -100,12 +100,12 @@ private fun KtCall.stringRepresentation(): String {
                 if (valueParameters.isNotEmpty()) append(", ")
             }
             valueParameters.joinTo(this) { parameter ->
-                "${parameter.name}: ${parameter.typeAndAnnotations.type.render()}"
+                "${parameter.name}: ${parameter.annotatedType.type.render()}"
             }
             append(")")
-            append(": ${typeAndAnnotations.type.render()}")
+            append(": ${annotatedType.type.render()}")
         }
-        is KtParameterSymbol -> "$name: ${typeAndAnnotations.type.render()}"
+        is KtParameterSymbol -> "$name: ${annotatedType.type.render()}"
         is KtSuccessCallTarget -> symbol.stringValue()
         is KtErrorCallTarget -> "ERR<${this.diagnostic.message}, [${candidates.joinToString { it.stringValue() }}]>"
         is Boolean -> toString()