Analysis API: update testdata after removing KtTypeAndAnnotations

analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /I.foo
   hasStableParameterNames: true
   isExtension: false
@@ -17,8 +15,9 @@ KtFunctionSymbol:
   origin: DELEGATED
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): A
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /I2.bar
   hasStableParameterNames: true
   isExtension: false
@@ -17,8 +15,9 @@ KtFunctionSymbol:
   origin: DELEGATED
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): B
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt

@@ -1,7 +1,6 @@
 FILE SYMBOL:
 KtFileSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   origin: SOURCE
   deprecationStatus: null
 
@@ -10,9 +9,7 @@ CALLABLE NAMES:
 
 CALLABLE SYMBOLS:
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /test
   hasStableParameterNames: true
   isExtension: false
@@ -28,15 +25,14 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /testVal
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -57,6 +53,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -70,8 +67,7 @@ CLASSIFIER NAMES:
 
 CLASSIFIER SYMBOLS:
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: C
   classKind: CLASS
   companionObject: null
@@ -84,7 +80,7 @@ KtNamedClassOrObjectSymbol:
   name: C
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -92,8 +88,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: I
   classKind: INTERFACE
   companionObject: null
@@ -106,9 +101,9 @@ KtNamedClassOrObjectSymbol:
   name: I
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.add
   hasStableParameterNames: true
   isExtension: false
@@ -17,6 +15,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -26,9 +25,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.add
   hasStableParameterNames: true
   isExtension: false
@@ -44,6 +41,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -54,9 +52,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.addAll
   hasStableParameterNames: true
   isExtension: false
@@ -72,6 +68,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -82,9 +79,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.addAll
   hasStableParameterNames: true
   isExtension: false
@@ -100,6 +95,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -109,9 +105,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.clear
   hasStableParameterNames: true
   isExtension: false
@@ -127,6 +121,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -134,9 +129,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/collections/MutableListIterator<E>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.listIterator
   hasStableParameterNames: true
   isExtension: false
@@ -152,6 +145,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -159,9 +153,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/collections/MutableListIterator<E>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.listIterator
   hasStableParameterNames: true
   isExtension: false
@@ -177,6 +169,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -186,9 +179,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.remove
   hasStableParameterNames: true
   isExtension: false
@@ -204,6 +195,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -213,9 +205,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.removeAll
   hasStableParameterNames: true
   isExtension: false
@@ -231,6 +221,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -240,9 +231,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] E
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.removeAt
   hasStableParameterNames: true
   isExtension: false
@@ -258,6 +247,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -267,9 +257,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.retainAll
   hasStableParameterNames: true
   isExtension: false
@@ -285,6 +273,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -294,9 +283,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] E
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.set
   hasStableParameterNames: true
   isExtension: false
@@ -312,6 +299,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -322,9 +310,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/collections/MutableList<E>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.subList
   hasStableParameterNames: true
   isExtension: false
@@ -340,6 +326,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/collections/MutableList<E>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(fromIndex)
@@ -350,9 +337,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.contains
   hasStableParameterNames: true
   isExtension: false
@@ -368,6 +353,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -377,9 +363,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.containsAll
   hasStableParameterNames: true
   isExtension: false
@@ -395,6 +379,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -404,9 +389,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] E
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.get
   hasStableParameterNames: true
   isExtension: false
@@ -422,6 +405,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -431,9 +415,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.indexOf
   hasStableParameterNames: true
   isExtension: false
@@ -449,6 +431,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -458,9 +441,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.isEmpty
   hasStableParameterNames: true
   isExtension: false
@@ -476,6 +457,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -483,9 +465,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/collections/MutableIterator<E>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.iterator
   hasStableParameterNames: true
   isExtension: false
@@ -501,6 +481,7 @@ KtFunctionSymbol:
   origin: INTERSECTION_OVERRIDE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/collections/MutableIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -508,9 +489,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.lastIndexOf
   hasStableParameterNames: true
   isExtension: false
@@ -526,6 +505,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -535,9 +515,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/MutableList.size
   getter: null
   hasBackingField: false
@@ -558,6 +536,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): kotlin/collections/MutableList<E>
@@ -568,9 +547,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Any.equals
   hasStableParameterNames: true
   isExtension: false
@@ -586,6 +563,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -595,9 +573,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Any.hashCode
   hasStableParameterNames: true
   isExtension: false
@@ -613,6 +589,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -620,9 +597,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Any.toString
   hasStableParameterNames: true
   isExtension: false
@@ -638,8 +613,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): kotlin/Any
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] R
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Function2.invoke
   hasStableParameterNames: false
   isExtension: false
@@ -17,6 +15,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: R
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p1)
@@ -27,9 +26,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Any.equals
   hasStableParameterNames: true
   isExtension: false
@@ -45,6 +42,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -54,9 +52,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Any.hashCode
   hasStableParameterNames: true
   isExtension: false
@@ -72,6 +68,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -79,9 +76,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Any.toString
   hasStableParameterNames: true
   isExtension: false
@@ -97,8 +92,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): kotlin/Any
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: test/MyClass.funWithOuterAndOwnGenericsAndBounds
   hasStableParameterNames: true
   isExtension: false
@@ -17,6 +15,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: [
     KtTypeParameterSymbol(TT1)
     KtTypeParameterSymbol(TT2)
@@ -30,9 +29,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] test/Foo?
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: test/MyClass.propWithOuterAndOwnGenericsAndBounds
   getter: null
   hasBackingField: false
@@ -50,9 +47,10 @@ KtKotlinPropertySymbol:
   modality: OPEN
   name: propWithOuterAndOwnGenericsAndBounds
   origin: SOURCE
-  receiverType: [] test/TwoParams<TT1, TT2>
+  receiverType: test/TwoParams<TT1, TT2>
   setter: null
   symbolKind: CLASS_MEMBER
+  type: test/Foo?
   typeParameters: [
     KtTypeParameterSymbol(TT1)
     KtTypeParameterSymbol(TT2)
@@ -66,9 +64,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Boolean
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Any.equals
   hasStableParameterNames: true
   isExtension: false
@@ -84,6 +80,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -93,9 +90,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Any.hashCode
   hasStableParameterNames: true
   isExtension: false
@@ -111,6 +106,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -118,9 +114,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/Any.toString
   hasStableParameterNames: true
   isExtension: false
@@ -136,6 +130,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -143,9 +138,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtConstructorSymbol:
-  annotatedType: [] test/MyClass
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: test/MyClass
   hasStableParameterNames: true
@@ -154,7 +147,8 @@ KtConstructorSymbol:
   origin: SOURCE_MEMBER_GENERATED
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: test/MyClass
   typeParameters: []
   valueParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/class.txt

@@ -1,6 +1,5 @@
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: kotlin/Lazy
   classKind: INTERFACE
   companionObject: null
@@ -13,11 +12,11 @@ KtNamedClassOrObjectSymbol:
   name: Lazy
   origin: LIBRARY
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt

@@ -1,6 +1,5 @@
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: java/lang/String
   classKind: CLASS
   companionObject: null
@@ -13,12 +12,12 @@ KtNamedClassOrObjectSymbol:
   name: String
   origin: JAVA
   superTypes: [
-    [] kotlin/Any
-    [] java/io/Serializable
-    [] kotlin/Comparable<ft<kotlin/String, kotlin/String?>>
-    [] kotlin/CharSequence
+    kotlin/Any
+    java/io/Serializable
+    kotlin/Comparable<ft<kotlin/String, kotlin/String?>>
+    kotlin/CharSequence
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt

@@ -1,5 +1,4 @@
 KtEnumEntrySymbol:
-  annotatedType: [] kotlin/LazyThreadSafetyMode
   callableIdIfNonLocal: kotlin/LazyThreadSafetyMode.SYNCHRONIZED
   containingEnumClassIdIfNonLocal: kotlin/LazyThreadSafetyMode
   isExtension: false
@@ -7,4 +6,5 @@ KtEnumEntrySymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
-  deprecationStatus: null
+  type: kotlin/LazyThreadSafetyMode
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/collections/List<T>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/listOf
   hasStableParameterNames: true
   isExtension: false
@@ -17,6 +15,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/collections/List<T>
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]
@@ -27,11 +26,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/collections/List<T>
-  annotationClassIds: [
-    kotlin/internal/InlineOnly
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/internal/InlineOnly()
       psi: null
   ]
@@ -50,6 +45,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/collections/List<T>
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]
@@ -58,9 +54,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/collections/List<T>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/listOf
   hasStableParameterNames: true
   isExtension: false
@@ -76,6 +70,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/collections/List<T>
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]

analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt

@@ -1,6 +1,5 @@
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: kotlin/collections/Iterator
   classKind: INTERFACE
   companionObject: null
@@ -13,11 +12,11 @@ KtNamedClassOrObjectSymbol:
   name: Iterator
   origin: LIBRARY
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt

@@ -1,6 +1,5 @@
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: kotlin/io/FileWalkDirection
   classKind: ENUM_CLASS
   companionObject: null
@@ -13,9 +12,9 @@ KtNamedClassOrObjectSymbol:
   name: FileWalkDirection
   origin: LIBRARY
   superTypes: [
-    [] kotlin/Enum<kotlin/io/FileWalkDirection>
+    kotlin/Enum<kotlin/io/FileWalkDirection>
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] E
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/List.get
   hasStableParameterNames: true
   isExtension: false
@@ -17,6 +15,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)

analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/collections/ListIterator<E>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/List.listIterator
   hasStableParameterNames: true
   isExtension: false
@@ -17,6 +15,7 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/collections/ListIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -24,9 +23,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/collections/ListIterator<E>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: kotlin/collections/List.listIterator
   hasStableParameterNames: true
   isExtension: false
@@ -42,10 +39,11 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/collections/ListIterator<E>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
   ]
   visibility: Public
   getDispatchReceiver(): kotlin/collections/List<E>
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt

@@ -1,6 +1,5 @@
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: kotlin/collections/MutableMap.MutableEntry
   classKind: INTERFACE
   companionObject: null
@@ -13,7 +12,7 @@ KtNamedClassOrObjectSymbol:
   name: MutableEntry
   origin: LIBRARY
   superTypes: [
-    [] kotlin/collections/Map.Entry<K, V>
+    kotlin/collections/Map.Entry<K, V>
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
@@ -21,4 +20,4 @@ KtNamedClassOrObjectSymbol:
     KtTypeParameterSymbol(V)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt

@@ -1,7 +1,5 @@
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -10,12 +8,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/String
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -24,12 +21,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtConstructorSymbol:
-  annotatedType: [] Anno
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: Anno
   hasStableParameterNames: true
@@ -38,6 +34,7 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: Anno
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(param1)
@@ -47,8 +44,7 @@ KtConstructorSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: Anno
   classKind: ANNOTATION_CLASS
   companionObject: null
@@ -61,7 +57,7 @@ KtNamedClassOrObjectSymbol:
   name: Anno
   origin: SOURCE
   superTypes: [
-    [] kotlin/Annotation
+    kotlin/Annotation
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -69,11 +65,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: [
-    Anno
-  ]
-  annotations: [
+  annotationsList: [
     Anno(param1 = funparam, param2 = 3)
       psi: KtAnnotationEntry
   ]
@@ -92,6 +84,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -99,10 +92,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    Anno
-  ]
-  annotations: [
+  annotationsList: [
     Anno(param1 = param, param2 = 2)
       psi: KtAnnotationEntry
   ]
@@ -118,9 +108,9 @@ KtNamedClassOrObjectSymbol:
   name: X
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
@@ -17,6 +15,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -24,9 +23,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -47,6 +44,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): <no name provided>
@@ -57,22 +55,19 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtAnonymousObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: null
   classKind: ANONYMOUS_OBJECT
   name: null
   origin: SOURCE
   superTypes: [
-    [] java/lang/Runnable
+    java/lang/Runnable
   ]
   symbolKind: LOCAL
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] java/lang/Runnable
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /AnonymousContainer.anonymousObject
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -93,6 +88,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: java/lang/Runnable
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): AnonymousContainer
@@ -103,8 +99,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: AnonymousContainer
   classKind: CLASS
   companionObject: null
@@ -117,9 +112,9 @@ KtNamedClassOrObjectSymbol:
   name: AnonymousContainer
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
@@ -17,6 +15,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -24,9 +23,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -47,6 +44,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): <anonymous>
@@ -57,22 +55,19 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtAnonymousObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: null
   classKind: ANONYMOUS_OBJECT
   name: null
   origin: SOURCE
   superTypes: [
-    [] java/lang/Runnable
+    java/lang/Runnable
   ]
   symbolKind: LOCAL
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] java/lang/Runnable
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /AnonymousContainer.anonymousObject
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -93,6 +88,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: java/lang/Runnable
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): AnonymousContainer
@@ -103,8 +99,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: AnonymousContainer
   classKind: CLASS
   companionObject: null
@@ -117,9 +112,9 @@ KtNamedClassOrObjectSymbol:
   name: AnonymousContainer
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt

@@ -1,7 +1,5 @@
 KtPropertyGetterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasBody: true
   hasStableParameterNames: true
@@ -13,14 +11,13 @@ KtPropertyGetterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -29,12 +26,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtPropertySetterSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasBody: true
   hasStableParameterNames: true
@@ -47,6 +43,7 @@ KtPropertySetterSymbol:
   parameter: KtValueParameterSymbol(value)
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/Unit
   valueParameters: [
     KtValueParameterSymbol(value)
   ]
@@ -54,9 +51,7 @@ KtPropertySetterSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /p
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -77,10 +72,11 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getP
   javaSetterName: setP
-  setterDeprecationStatus: null
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/class.txt

@@ -1,6 +1,5 @@
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -13,9 +12,9 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt

@@ -1,7 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /A.i
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -22,6 +20,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -37,8 +36,7 @@ KtClassInitializerSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -51,9 +49,9 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt

@@ -1,7 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /A.a
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -22,6 +20,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -32,9 +31,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /A.x
   hasStableParameterNames: true
   isExtension: false
@@ -50,6 +47,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -57,8 +55,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -71,9 +68,9 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt

@@ -1,7 +1,5 @@
 KtConstructorSymbol:
-  annotatedType: [] A
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
   hasStableParameterNames: true
@@ -10,14 +8,14 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: A
   typeParameters: []
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -30,9 +28,9 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt

@@ -1,7 +1,5 @@
 KtConstructorSymbol:
-  annotatedType: [] A
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
   hasStableParameterNames: true
@@ -10,15 +8,14 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: A
   typeParameters: []
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -27,12 +24,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtConstructorSymbol:
-  annotatedType: [] A
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
   hasStableParameterNames: true
@@ -41,6 +37,7 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: A
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(x)
@@ -49,9 +46,7 @@ KtConstructorSymbol:
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -60,12 +55,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -74,12 +68,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/String
   deprecationStatus: null
 
 KtConstructorSymbol:
-  annotatedType: [] A
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
   hasStableParameterNames: true
@@ -88,6 +81,7 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: A
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(y)
@@ -97,8 +91,7 @@ KtConstructorSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -111,9 +104,9 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt

@@ -19,8 +19,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -33,7 +32,7 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
@@ -41,4 +40,4 @@ KtNamedClassOrObjectSymbol:
     KtTypeParameterSymbol(R)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt

@@ -1,7 +1,5 @@
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -10,12 +8,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -24,12 +21,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -38,12 +34,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtConstructorSymbol:
-  annotatedType: [] MyColor
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: MyColor
   hasStableParameterNames: true
@@ -52,6 +47,7 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: MyColor
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(x)
@@ -62,8 +58,7 @@ KtConstructorSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: MyColor
   classKind: CLASS
   companionObject: null
@@ -76,7 +71,7 @@ KtNamedClassOrObjectSymbol:
   name: MyColor
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -84,20 +79,18 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtAnonymousFunctionSymbol:
-  annotatedType: [] MyColor
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: MyColor
   valueParameters: []
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] MyColor
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Some.delegate
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -118,6 +111,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: MyColor
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Some
@@ -128,20 +122,18 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtAnonymousFunctionSymbol:
-  annotatedType: [] MyColor
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: MyColor
   valueParameters: []
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Lazy<MyColor>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Some.lambda
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -162,6 +154,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Lazy<MyColor>
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Some
@@ -172,9 +165,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] MyColor
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Some.nonLazy
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -195,6 +186,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: MyColor
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Some
@@ -205,8 +197,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: Some
   classKind: CLASS
   companionObject: null
@@ -219,9 +210,9 @@ KtNamedClassOrObjectSymbol:
   name: Some
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt

@@ -1,7 +1,5 @@
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -10,12 +8,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -24,12 +21,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -38,12 +34,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtConstructorSymbol:
-  annotatedType: [] MyColor
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: MyColor
   hasStableParameterNames: true
@@ -52,6 +47,7 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: MyColor
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(x)
@@ -62,8 +58,7 @@ KtConstructorSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: MyColor
   classKind: CLASS
   companionObject: null
@@ -76,7 +71,7 @@ KtNamedClassOrObjectSymbol:
   name: MyColor
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -84,20 +79,18 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtAnonymousFunctionSymbol:
-  annotatedType: [] MyColor
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: MyColor
   valueParameters: []
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] MyColor
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Some.delegate
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -118,6 +111,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: MyColor
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Some
@@ -128,20 +122,18 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtAnonymousFunctionSymbol:
-  annotatedType: [] MyColor
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: MyColor
   valueParameters: []
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Lazy<MyColor>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Some.lambda
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -162,6 +154,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Lazy<MyColor>
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Some
@@ -172,9 +165,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] MyColor
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Some.nonLazy
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -195,6 +186,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: MyColor
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Some
@@ -205,8 +197,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: Some
   classKind: CLASS
   companionObject: null
@@ -219,9 +210,9 @@ KtNamedClassOrObjectSymbol:
   name: Some
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt

@@ -1,9 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use i)
       psi: KtAnnotationEntry
   ]
@@ -27,6 +23,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
@@ -36,9 +33,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /i2
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -59,6 +54,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -68,9 +64,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /i3
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -91,6 +85,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -100,9 +95,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i3)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /i4
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -123,6 +116,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -132,11 +126,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i4)
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use f)
       psi: KtAnnotationEntry
   ]
@@ -155,16 +145,14 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f)
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use MyClass)
       psi: KtAnnotationEntry
   ]
@@ -180,7 +168,7 @@ KtNamedClassOrObjectSymbol:
   name: MyClass
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -188,11 +176,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use MyClass)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use i2)
       psi: KtAnnotationEntry
   ]
@@ -216,6 +200,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -226,11 +211,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use f2)
       psi: KtAnnotationEntry
   ]
@@ -249,6 +230,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -256,8 +238,7 @@ KtFunctionSymbol:
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f2)
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: Foo
   classKind: CLASS
   companionObject: null
@@ -270,7 +251,7 @@ KtNamedClassOrObjectSymbol:
   name: Foo
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -278,11 +259,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.ERROR), message = don't use j)
       psi: KtAnnotationEntry
   ]
@@ -306,6 +283,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=don't use j)
@@ -315,11 +293,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=don't use j)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.HIDDEN), message = don't use j2)
       psi: KtAnnotationEntry
   ]
@@ -343,6 +317,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=don't use j2)
@@ -352,9 +327,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=don't use j2)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /j2
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -375,6 +348,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt

@@ -1,9 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use i)
       psi: KtAnnotationEntry
   ]
@@ -27,6 +23,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
@@ -36,9 +33,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /i2
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -59,6 +54,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -68,9 +64,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /i3
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -91,6 +85,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -100,9 +95,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i3)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /i4
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -123,6 +116,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -132,11 +126,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i4)
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use f)
       psi: KtAnnotationEntry
   ]
@@ -155,16 +145,14 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f)
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use MyClass)
       psi: KtAnnotationEntry
   ]
@@ -180,7 +168,7 @@ KtNamedClassOrObjectSymbol:
   name: MyClass
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -188,11 +176,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use MyClass)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use i2)
       psi: KtAnnotationEntry
   ]
@@ -216,6 +200,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -226,11 +211,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(message = don't use f2)
       psi: KtAnnotationEntry
   ]
@@ -249,6 +230,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -256,8 +238,7 @@ KtFunctionSymbol:
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f2)
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: Foo
   classKind: CLASS
   companionObject: null
@@ -270,7 +251,7 @@ KtNamedClassOrObjectSymbol:
   name: Foo
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -278,11 +259,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.ERROR), message = don't use j)
       psi: KtAnnotationEntry
   ]
@@ -306,6 +283,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null)
@@ -315,11 +293,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.HIDDEN), message = don't use j2)
       psi: KtAnnotationEntry
   ]
@@ -343,6 +317,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null)
@@ -352,11 +327,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null)
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    java/lang/Deprecated
-  ]
-  annotations: [
+  annotationsList: [
     java/lang/Deprecated()
       psi: KtAnnotationEntry
   ]
@@ -380,6 +351,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)

analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt

@@ -1,5 +1,4 @@
 KtEnumEntrySymbol:
-  annotatedType: [] X
   callableIdIfNonLocal: /X.Y
   containingEnumClassIdIfNonLocal: X
   isExtension: false
@@ -7,10 +6,10 @@ KtEnumEntrySymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: X
   deprecationStatus: null
 
 KtEnumEntrySymbol:
-  annotatedType: [] X
   callableIdIfNonLocal: /X.Z
   containingEnumClassIdIfNonLocal: X
   isExtension: false
@@ -18,11 +17,11 @@ KtEnumEntrySymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: X
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X
   classKind: ENUM_CLASS
   companionObject: null
@@ -35,9 +34,9 @@ KtNamedClassOrObjectSymbol:
   name: X
   origin: SOURCE
   superTypes: [
-    [] kotlin/Enum<X>
+    kotlin/Enum<X>
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt

@@ -1,7 +1,5 @@
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -10,12 +8,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/String
   deprecationStatus: null
 
 KtConstructorSymbol:
-  annotatedType: [] Style
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: Style
   hasStableParameterNames: true
@@ -24,6 +21,7 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: Style
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(value)
@@ -32,9 +30,7 @@ KtConstructorSymbol:
   deprecationStatus: null
 
 KtPropertyGetterSymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasBody: true
   hasStableParameterNames: true
@@ -46,15 +42,14 @@ KtPropertyGetterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/String
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): Style.SHEET
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -75,6 +70,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/String
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Style.SHEET
@@ -85,7 +81,6 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtEnumEntrySymbol:
-  annotatedType: [] Style
   callableIdIfNonLocal: /Style.SHEET
   containingEnumClassIdIfNonLocal: Style
   isExtension: false
@@ -93,12 +88,11 @@ KtEnumEntrySymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: Style
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Style.exitAnimation
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -119,6 +113,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/String
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Style
@@ -129,8 +124,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: Style
   classKind: ENUM_CLASS
   companionObject: null
@@ -143,9 +137,9 @@ KtNamedClassOrObjectSymbol:
   name: Style
   origin: SOURCE
   superTypes: [
-    [] kotlin/Enum<Style>
+    kotlin/Enum<Style>
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt

@@ -1,7 +1,5 @@
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -10,12 +8,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/String
   deprecationStatus: null
 
 KtConstructorSymbol:
-  annotatedType: [] Style
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: Style
   hasStableParameterNames: true
@@ -24,6 +21,7 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: Style
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(value)
@@ -32,9 +30,7 @@ KtConstructorSymbol:
   deprecationStatus: null
 
 KtPropertyGetterSymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasBody: true
   hasStableParameterNames: true
@@ -46,14 +42,13 @@ KtPropertyGetterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/String
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -74,6 +69,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/String
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): <anonymous>
@@ -84,7 +80,6 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtEnumEntrySymbol:
-  annotatedType: [] Style
   callableIdIfNonLocal: /Style.SHEET
   containingEnumClassIdIfNonLocal: Style
   isExtension: false
@@ -92,12 +87,11 @@ KtEnumEntrySymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: Style
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/String
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Style.exitAnimation
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -118,6 +112,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/String
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Style
@@ -128,8 +123,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: Style
   classKind: ENUM_CLASS
   companionObject: null
@@ -142,9 +136,9 @@ KtNamedClassOrObjectSymbol:
   name: Style
   origin: SOURCE
   superTypes: [
-    [] kotlin/Enum<Style>
+    kotlin/Enum<Style>
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /foo
   hasStableParameterNames: true
   isExtension: true
@@ -15,9 +13,10 @@ KtFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverType: [] kotlin/String
+  receiverType: kotlin/String
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt

@@ -1,5 +1,4 @@
 KtLocalVariableSymbol:
-  annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
   isVal: true
@@ -7,12 +6,11 @@ KtLocalVariableSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /usage
   hasStableParameterNames: true
   isExtension: false
@@ -28,7 +26,8 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/function.txt

@@ -1,7 +1,5 @@
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -10,12 +8,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /foo
   hasStableParameterNames: true
   isExtension: false
@@ -31,9 +28,10 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(x)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt

@@ -9,9 +9,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] X
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -20,12 +18,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: X
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /foo
   hasStableParameterNames: true
   isExtension: false
@@ -41,6 +38,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: [
     KtTypeParameterSymbol(X)
   ]
@@ -48,4 +46,4 @@ KtFunctionSymbol:
     KtValueParameterSymbol(x)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt

@@ -1,7 +1,5 @@
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -10,12 +8,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtConstructorSymbol:
-  annotatedType: [] A
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
   hasStableParameterNames: true
@@ -24,6 +21,7 @@ KtConstructorSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: A
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(i)
@@ -32,8 +30,7 @@ KtConstructorSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -46,9 +43,9 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /foo
   hasStableParameterNames: true
   isExtension: false
@@ -17,7 +15,8 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt

@@ -1,7 +1,5 @@
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -10,10 +8,10 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtLocalVariableSymbol:
-  annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
   isVal: true
@@ -21,23 +19,23 @@ KtLocalVariableSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtAnonymousFunctionSymbol:
-  annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   valueParameters: [
     KtValueParameterSymbol(a)
   ]
   deprecationStatus: null
 
 KtLocalVariableSymbol:
-  annotatedType: [] kotlin/Function1<kotlin/Int, kotlin/Int>
   callableIdIfNonLocal: null
   isExtension: false
   isVal: true
@@ -45,12 +43,11 @@ KtLocalVariableSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Function1<kotlin/Int, kotlin/Int>
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -59,10 +56,10 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtLocalVariableSymbol:
-  annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
   isVal: true
@@ -70,23 +67,23 @@ KtLocalVariableSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtAnonymousFunctionSymbol:
-  annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   valueParameters: [
     KtValueParameterSymbol(a)
   ]
   deprecationStatus: null
 
 KtLocalVariableSymbol:
-  annotatedType: [] kotlin/Function1<kotlin/Int, kotlin/Int>
   callableIdIfNonLocal: null
   isExtension: false
   isVal: true
@@ -94,10 +91,10 @@ KtLocalVariableSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Function1<kotlin/Int, kotlin/Int>
   deprecationStatus: null
 
 KtLocalVariableSymbol:
-  annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
   isVal: true
@@ -105,25 +102,24 @@ KtLocalVariableSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtAnonymousFunctionSymbol:
-  annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   valueParameters: [
     KtValueParameterSymbol(it)
   ]
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /foo
   hasStableParameterNames: true
   isExtension: false
@@ -139,15 +135,14 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Function1<kotlin/Int, kotlin/Int>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -156,12 +151,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Function1<kotlin/Int, kotlin/Int>
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /bar
   hasStableParameterNames: true
   isExtension: false
@@ -177,9 +171,10 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(lmbd)
   ]
   visibility: Private
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt

@@ -1,7 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Foo.i
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -22,6 +20,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -32,11 +31,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtPropertyGetterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/jvm/JvmName
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/jvm/JvmName(name = getMyJ)
       psi: KtAnnotationEntry
   ]
@@ -51,15 +46,14 @@ KtPropertyGetterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/Int
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -68,14 +62,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtPropertySetterSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: [
-    kotlin/jvm/JvmName
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/jvm/JvmName(name = setMyJ)
       psi: KtAnnotationEntry
   ]
@@ -91,6 +82,7 @@ KtPropertySetterSymbol:
   parameter: KtValueParameterSymbol(value)
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/Unit
   valueParameters: [
     KtValueParameterSymbol(value)
   ]
@@ -99,9 +91,7 @@ KtPropertySetterSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Foo.j
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -122,6 +112,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -132,8 +123,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: Foo
   classKind: CLASS
   companionObject: null
@@ -146,9 +136,9 @@ KtNamedClassOrObjectSymbol:
   name: Foo
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt

@@ -1,7 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Foo.i
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -22,6 +20,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -32,11 +31,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtPropertyGetterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: [
-    kotlin/jvm/JvmName
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/jvm/JvmName(name = getMyJ)
       psi: KtAnnotationEntry
   ]
@@ -51,14 +46,13 @@ KtPropertyGetterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -67,14 +61,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtPropertySetterSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: [
-    kotlin/jvm/JvmName
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/jvm/JvmName(name = setMyJ)
       psi: KtAnnotationEntry
   ]
@@ -90,6 +81,7 @@ KtPropertySetterSymbol:
   parameter: KtValueParameterSymbol(value)
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/Unit
   valueParameters: [
     KtValueParameterSymbol(value)
   ]
@@ -97,9 +89,7 @@ KtPropertySetterSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /Foo.j
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -120,6 +110,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -130,8 +121,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: Foo
   classKind: CLASS
   companionObject: null
@@ -144,9 +134,9 @@ KtNamedClassOrObjectSymbol:
   name: Foo
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt

@@ -1,5 +1,4 @@
 KtLocalVariableSymbol:
-  annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
   isVal: true
@@ -7,12 +6,11 @@ KtLocalVariableSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasStableParameterNames: true
   isExtension: false
@@ -28,14 +26,14 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Local
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: null
   classKind: CLASS
   companionObject: null
@@ -48,7 +46,7 @@ KtNamedClassOrObjectSymbol:
   name: F
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: LOCAL
   typeParameters: []
@@ -56,9 +54,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /yyy
   hasStableParameterNames: true
   isExtension: false
@@ -74,7 +70,8 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /A.x
   hasStableParameterNames: true
   isExtension: false
@@ -17,6 +15,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -24,9 +23,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /A.y
   hasStableParameterNames: true
   isExtension: false
@@ -42,6 +39,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -49,8 +47,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -63,9 +60,9 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt

@@ -1,7 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /A.x
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -22,6 +20,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -32,9 +31,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtPropertyGetterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasBody: true
   hasStableParameterNames: true
@@ -44,17 +41,16 @@ KtPropertyGetterSymbol:
   isOverride: false
   modality: FINAL
   origin: SOURCE
-  receiverType: [] kotlin/Int
+  receiverType: kotlin/Int
   symbolKind: ACCESSOR
+  type: kotlin/Int
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): A
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /A.y
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -72,9 +68,10 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: [] kotlin/Int
+  receiverType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -85,8 +82,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -99,9 +95,9 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt

@@ -1,7 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /A.x
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -22,6 +20,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -32,9 +31,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtPropertyGetterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasBody: true
   hasStableParameterNames: true
@@ -46,14 +43,13 @@ KtPropertyGetterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /A.y
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -71,9 +67,10 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: [] kotlin/Int
+  receiverType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -84,8 +81,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: A
   classKind: CLASS
   companionObject: null
@@ -98,9 +94,9 @@ KtNamedClassOrObjectSymbol:
   name: A
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt

@@ -19,8 +19,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X.Y
   classKind: CLASS
   companionObject: null
@@ -33,7 +32,7 @@ KtNamedClassOrObjectSymbol:
   name: Y
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
@@ -53,8 +52,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X.Z
   classKind: CLASS
   companionObject: null
@@ -67,7 +65,7 @@ KtNamedClassOrObjectSymbol:
   name: Z
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
@@ -107,8 +105,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: null
   classKind: CLASS
   companionObject: null
@@ -121,7 +118,7 @@ KtNamedClassOrObjectSymbol:
   name: K
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
@@ -141,8 +138,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: null
   classKind: CLASS
   companionObject: null
@@ -155,7 +151,7 @@ KtNamedClassOrObjectSymbol:
   name: C
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
@@ -165,8 +161,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: null
   classKind: CLASS
   companionObject: null
@@ -179,7 +174,7 @@ KtNamedClassOrObjectSymbol:
   name: U
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: LOCAL
   typeParameters: [
@@ -189,9 +184,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /X.foo
   hasStableParameterNames: true
   isExtension: false
@@ -207,6 +200,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: [
     KtTypeParameterSymbol(T3)
   ]
@@ -216,8 +210,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X
   classKind: CLASS
   companionObject: null
@@ -230,11 +223,11 @@ KtNamedClassOrObjectSymbol:
   name: X
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt

@@ -19,8 +19,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X.Y
   classKind: CLASS
   companionObject: null
@@ -33,7 +32,7 @@ KtNamedClassOrObjectSymbol:
   name: Y
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
@@ -53,8 +52,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X.Z
   classKind: CLASS
   companionObject: null
@@ -67,7 +65,7 @@ KtNamedClassOrObjectSymbol:
   name: Z
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
@@ -107,8 +105,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: null
   classKind: CLASS
   companionObject: null
@@ -121,7 +118,7 @@ KtNamedClassOrObjectSymbol:
   name: K
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: LOCAL
   typeParameters: [
@@ -141,8 +138,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: null
   classKind: CLASS
   companionObject: null
@@ -155,7 +151,7 @@ KtNamedClassOrObjectSymbol:
   name: C
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: LOCAL
   typeParameters: [
@@ -165,8 +161,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: null
   classKind: CLASS
   companionObject: null
@@ -179,7 +174,7 @@ KtNamedClassOrObjectSymbol:
   name: U
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: LOCAL
   typeParameters: [
@@ -189,9 +184,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /X.foo
   hasStableParameterNames: true
   isExtension: false
@@ -207,6 +200,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: kotlin/Unit
   typeParameters: [
     KtTypeParameterSymbol(T3)
   ]
@@ -216,8 +210,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X
   classKind: CLASS
   companionObject: null
@@ -230,11 +223,11 @@ KtNamedClassOrObjectSymbol:
   name: X
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt

@@ -1,7 +1,5 @@
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /x
   hasStableParameterNames: true
   isExtension: false
@@ -17,15 +15,14 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /y
   hasStableParameterNames: true
   isExtension: false
@@ -41,7 +38,8 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt

@@ -1,7 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /x
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -22,6 +20,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -31,9 +30,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtPropertyGetterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasBody: true
   hasStableParameterNames: true
@@ -43,16 +40,15 @@ KtPropertyGetterSymbol:
   isOverride: false
   modality: FINAL
   origin: SOURCE
-  receiverType: [] kotlin/Int
+  receiverType: kotlin/Int
   symbolKind: ACCESSOR
+  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /y
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -70,13 +66,14 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: [] kotlin/Int
+  receiverType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getY
   javaSetterName: null
-  setterDeprecationStatus: null
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt

@@ -1,7 +1,5 @@
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /x
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -22,6 +20,7 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -31,9 +30,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtPropertyGetterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasBody: true
   hasStableParameterNames: true
@@ -45,14 +42,13 @@ KtPropertyGetterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: ACCESSOR
+  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /y
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
@@ -70,13 +66,14 @@ KtKotlinPropertySymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: [] kotlin/Int
+  receiverType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getY
   javaSetterName: null
-  setterDeprecationStatus: null
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt

@@ -9,8 +9,7 @@ KtTypeParameterSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X
   classKind: CLASS
   companionObject: null
@@ -23,7 +22,7 @@ KtNamedClassOrObjectSymbol:
   name: X
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
@@ -52,4 +51,4 @@ KtTypeAliasSymbol:
     KtTypeParameterSymbol(Z)
   ]
   visibility: Private
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt

@@ -1,8 +1,5 @@
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/annotation/Target
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/annotation/Target(allowedTargets = KtArrayConstantValue)
       psi: KtAnnotationEntry
   ]
@@ -18,7 +15,7 @@ KtNamedClassOrObjectSymbol:
   name: Anno1
   origin: SOURCE
   superTypes: [
-    [] kotlin/Annotation
+    kotlin/Annotation
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -26,10 +23,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/annotation/Target
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/annotation/Target(allowedTargets = KtArrayConstantValue)
       psi: KtAnnotationEntry
   ]
@@ -45,7 +39,7 @@ KtNamedClassOrObjectSymbol:
   name: Anno2
   origin: SOURCE
   superTypes: [
-    [] kotlin/Annotation
+    kotlin/Annotation
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -53,10 +47,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/annotation/Target
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/annotation/Target(allowedTargets = KtArrayConstantValue)
       psi: KtAnnotationEntry
   ]
@@ -72,7 +63,7 @@ KtNamedClassOrObjectSymbol:
   name: Anno3
   origin: SOURCE
   superTypes: [
-    [] kotlin/Annotation
+    kotlin/Annotation
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -80,10 +71,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/annotation/Target
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/annotation/Target(allowedTargets = KtArrayConstantValue)
       psi: KtAnnotationEntry
   ]
@@ -99,7 +87,7 @@ KtNamedClassOrObjectSymbol:
   name: Anno4
   origin: SOURCE
   superTypes: [
-    [] kotlin/Annotation
+    kotlin/Annotation
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -107,8 +95,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: I
   classKind: INTERFACE
   companionObject: null
@@ -121,7 +108,7 @@ KtNamedClassOrObjectSymbol:
   name: I
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -129,12 +116,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [
-    Anno2()
-      psi: KtAnnotationEntry
-  ] @R|Anno2|()  I
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -143,15 +125,14 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: [
+    Anno2()
+      psi: KtAnnotationEntry
+  ] @R|Anno2|()  I
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [
-    Anno3()
-      psi: KtAnnotationEntry
-  ] @R|Anno3|()  I
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /X.f
   hasStableParameterNames: true
   isExtension: false
@@ -167,6 +148,10 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: [
+    Anno3()
+      psi: KtAnnotationEntry
+  ] @R|Anno3|()  I
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(arg)
@@ -176,12 +161,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [
-    Anno4()
-      psi: KtAnnotationEntry
-  ] @R|Anno4|()  I
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /X.x
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -202,6 +182,10 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: [
+    Anno4()
+      psi: KtAnnotationEntry
+  ] @R|Anno4|()  I
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): X
@@ -212,8 +196,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X
   classKind: CLASS
   companionObject: null
@@ -226,7 +209,7 @@ KtNamedClassOrObjectSymbol:
   name: X
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
     [
       Anno1()
         psi: KtAnnotationEntry
@@ -235,4 +218,4 @@ KtNamedClassOrObjectSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt

@@ -1,8 +1,5 @@
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/annotation/Target
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/annotation/Target(allowedTargets = KtEnumEntryConstantValue(kotlin/annotation/AnnotationTarget.TYPE))
       psi: KtAnnotationEntry
   ]
@@ -18,7 +15,7 @@ KtNamedClassOrObjectSymbol:
   name: Anno1
   origin: SOURCE
   superTypes: [
-    [] kotlin/Annotation
+    kotlin/Annotation
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -26,10 +23,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/annotation/Target
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/annotation/Target(allowedTargets = KtEnumEntryConstantValue(kotlin/annotation/AnnotationTarget.TYPE))
       psi: KtAnnotationEntry
   ]
@@ -45,7 +39,7 @@ KtNamedClassOrObjectSymbol:
   name: Anno2
   origin: SOURCE
   superTypes: [
-    [] kotlin/Annotation
+    kotlin/Annotation
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -53,10 +47,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/annotation/Target
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/annotation/Target(allowedTargets = KtEnumEntryConstantValue(kotlin/annotation/AnnotationTarget.TYPE))
       psi: KtAnnotationEntry
   ]
@@ -72,7 +63,7 @@ KtNamedClassOrObjectSymbol:
   name: Anno3
   origin: SOURCE
   superTypes: [
-    [] kotlin/Annotation
+    kotlin/Annotation
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -80,10 +71,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: [
-    kotlin/annotation/Target
-  ]
-  annotations: [
+  annotationsList: [
     kotlin/annotation/Target(allowedTargets = KtEnumEntryConstantValue(kotlin/annotation/AnnotationTarget.TYPE))
       psi: KtAnnotationEntry
   ]
@@ -99,7 +87,7 @@ KtNamedClassOrObjectSymbol:
   name: Anno4
   origin: SOURCE
   superTypes: [
-    [] kotlin/Annotation
+    kotlin/Annotation
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -107,8 +95,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: I
   classKind: INTERFACE
   companionObject: null
@@ -121,7 +108,7 @@ KtNamedClassOrObjectSymbol:
   name: I
   origin: SOURCE
   superTypes: [
-    [] kotlin/Any
+    kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -129,12 +116,7 @@ KtNamedClassOrObjectSymbol:
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [
-    Anno2()
-      psi: KtAnnotationEntry
-  ] @R|Anno2|()  I
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -143,15 +125,14 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: [
+    Anno2()
+      psi: KtAnnotationEntry
+  ] @R|Anno2|()  I
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [
-    Anno3()
-      psi: KtAnnotationEntry
-  ] @R|Anno2|()  I
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /X.f
   hasStableParameterNames: true
   isExtension: false
@@ -167,6 +148,10 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: [
+    Anno2()
+      psi: KtAnnotationEntry
+  ] @R|Anno2|()  I
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(arg)
@@ -176,12 +161,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotatedType: [
-    Anno4()
-      psi: KtAnnotationEntry
-  ] @R|Anno2|()  I
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /X.x
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -202,6 +182,10 @@ KtKotlinPropertySymbol:
   receiverType: null
   setter: null
   symbolKind: CLASS_MEMBER
+  type: [
+    Anno2()
+      psi: KtAnnotationEntry
+  ] @R|Anno2|()  I
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): X
@@ -212,8 +196,7 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   classIdIfNonLocal: X
   classKind: CLASS
   companionObject: null
@@ -227,11 +210,11 @@ KtNamedClassOrObjectSymbol:
   origin: SOURCE
   superTypes: [
     [
-      Anno1()
+      Anno2()
         psi: KtAnnotationEntry
     ] @R|Anno2|()  I
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt

@@ -1,7 +1,5 @@
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Int
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -10,12 +8,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /primitive
   hasStableParameterNames: true
   isExtension: false
@@ -31,6 +28,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(a)
@@ -39,9 +37,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Float?
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -50,12 +46,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Float?
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /nullablePrimitive
   hasStableParameterNames: true
   isExtension: false
@@ -71,6 +66,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(b)
@@ -79,9 +75,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] kotlin/Any
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -90,12 +84,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /nonPrimitive
   hasStableParameterNames: true
   isExtension: false
@@ -111,6 +104,7 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(c)
@@ -119,9 +113,7 @@ KtFunctionSymbol:
   deprecationStatus: null
 
 KtValueParameterSymbol:
-  annotatedType: [] ERROR_TYPE
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   hasDefaultValue: false
   isExtension: false
@@ -130,12 +122,11 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: LOCAL
+  type: ERROR_TYPE
   deprecationStatus: null
 
 KtFunctionSymbol:
-  annotatedType: [] kotlin/Unit
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: /error
   hasStableParameterNames: true
   isExtension: false
@@ -151,9 +142,10 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverType: null
   symbolKind: TOP_LEVEL
+  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(d)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt

@@ -1,5 +1,4 @@
 KtBackingFieldSymbol:
-  annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
   name: field
@@ -7,4 +6,5 @@ KtBackingFieldSymbol:
   owningProperty: KtKotlinPropertySymbol(/x)
   receiverType: null
   symbolKind: LOCAL
-  deprecationStatus: null
+  type: kotlin/Int
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt

@@ -1,7 +1,5 @@
 KtConstructorSymbol:
-  annotatedType: [] java/util/ArrayList<E>
-  annotationClassIds: []
-  annotations: []
+  annotationsList: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/util/ArrayList
   hasStableParameterNames: false
@@ -10,6 +8,7 @@ KtConstructorSymbol:
   origin: JAVA
   receiverType: null
   symbolKind: CLASS_MEMBER
+  type: java/util/ArrayList<E>
   typeParameters: [
     KtTypeParameterSymbol(E)
   ]
@@ -17,4 +16,4 @@ KtConstructorSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt

@@ -1,5 +1,4 @@
 KtSamConstructorSymbol:
-  annotatedType: [] java/lang/Runnable
   callableIdIfNonLocal: java/lang/Runnable
   hasStableParameterNames: true
   isExtension: false
@@ -7,7 +6,8 @@ KtSamConstructorSymbol:
   origin: SAM_CONSTRUCTOR
   receiverType: null
   symbolKind: SAM_CONSTRUCTOR
+  type: java/lang/Runnable
   valueParameters: [
     KtValueParameterSymbol(function)
   ]
-  deprecationStatus: null
+  deprecationStatus: null