[AA] DebugSymbolRenderer: improve type render

to process all nested annotations and types

^KT-56046

analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt

@@ -80,7 +80,25 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/collections/Map<X, kotlin/collections/Map<Y, O>>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/Map<X, kotlin/collections/Map<Y, O>>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: X
+        annotationsList: []
+      KtUsualClassType:
+        type: kotlin/collections/Map<Y, O>
+        annotationsList: []
+        ownTypeArguments: [
+          KtTypeParameterType:
+            type: Y
+            annotationsList: []
+          KtTypeParameterType:
+            type: O
+            annotationsList: []
+        ]
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
     KtTypeParameterSymbol(Y)
@@ -100,7 +118,9 @@ KtFunctionSymbol:
       name: x
       origin: SOURCE
       receiverParameter: null
-      returnType: X
+      returnType: KtTypeParameterType:
+        type: X
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -117,7 +137,9 @@ KtFunctionSymbol:
       name: y
       origin: SOURCE
       receiverParameter: null
-      returnType: Y
+      returnType: KtTypeParameterType:
+        type: Y
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -139,7 +161,17 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/collections/Map<X, O>
+    returnType: KtUsualClassType:
+      type: kotlin/collections/Map<X, O>
+      annotationsList: []
+      ownTypeArguments: [
+        KtTypeParameterType:
+          type: X
+          annotationsList: []
+        KtTypeParameterType:
+          type: O
+          annotationsList: []
+      ]
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -160,7 +192,17 @@ KtKotlinPropertySymbol:
   name: map
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/collections/Map<X, O>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/Map<X, O>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: X
+        annotationsList: []
+      KtTypeParameterType:
+        type: O
+        annotationsList: []
+    ]
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -184,7 +226,9 @@ KtFunctionSymbol:
   name: fromSuper
   origin: SUBSTITUTION_OVERRIDE
   receiverParameter: null
-  returnType: O
+  returnType: KtTypeParameterType:
+    type: O
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -208,7 +252,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -226,7 +273,10 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -250,7 +300,10 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -274,7 +327,10 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/components/scopeProvider/typeScope/intList.txt

@@ -170,7 +170,10 @@ KtFunctionSymbol:
   name: contains
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -188,7 +191,9 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -212,7 +217,10 @@ KtFunctionSymbol:
   name: containsAll
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -230,7 +238,14 @@ KtFunctionSymbol:
       name: elements
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/collections/Collection<E>
+      returnType: KtUsualClassType:
+        type: kotlin/collections/Collection<E>
+        annotationsList: []
+        ownTypeArguments: [
+          KtTypeParameterType:
+            type: E
+            annotationsList: []
+        ]
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -254,7 +269,9 @@ KtFunctionSymbol:
   name: get
   origin: LIBRARY
   receiverParameter: null
-  returnType: E
+  returnType: KtTypeParameterType:
+    type: E
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -272,7 +289,10 @@ KtFunctionSymbol:
       name: index
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -296,7 +316,10 @@ KtFunctionSymbol:
   name: indexOf
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -314,7 +337,9 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -338,7 +363,10 @@ KtFunctionSymbol:
   name: isEmpty
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -362,7 +390,14 @@ KtFunctionSymbol:
   name: iterator
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/Iterator<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/Iterator<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -386,7 +421,10 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -404,7 +442,9 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -428,7 +468,14 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/ListIterator<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/ListIterator<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -452,7 +499,14 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/ListIterator<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/ListIterator<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -470,7 +524,10 @@ KtFunctionSymbol:
       name: index
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -494,7 +551,14 @@ KtFunctionSymbol:
   name: subList
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/List<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/List<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -512,7 +576,10 @@ KtFunctionSymbol:
       name: fromIndex
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -529,7 +596,10 @@ KtFunctionSymbol:
       name: toIndex
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -551,7 +621,10 @@ KtKotlinPropertySymbol:
     modality: ABSTRACT
     origin: LIBRARY
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -572,7 +645,10 @@ KtKotlinPropertySymbol:
   name: size
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -596,7 +672,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -614,7 +693,10 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -638,7 +720,10 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -662,7 +747,10 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/components/scopeProvider/typeScope/outerClassTypeParamsSubstitution.txt

@@ -74,7 +74,25 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/collections/Map<X, kotlin/collections/Map<Y, O>>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/Map<X, kotlin/collections/Map<Y, O>>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: X
+        annotationsList: []
+      KtUsualClassType:
+        type: kotlin/collections/Map<Y, O>
+        annotationsList: []
+        ownTypeArguments: [
+          KtTypeParameterType:
+            type: Y
+            annotationsList: []
+          KtTypeParameterType:
+            type: O
+            annotationsList: []
+        ]
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
     KtTypeParameterSymbol(Y)
@@ -94,7 +112,9 @@ KtFunctionSymbol:
       name: x
       origin: SOURCE
       receiverParameter: null
-      returnType: X
+      returnType: KtTypeParameterType:
+        type: X
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -111,7 +131,9 @@ KtFunctionSymbol:
       name: y
       origin: SOURCE
       receiverParameter: null
-      returnType: Y
+      returnType: KtTypeParameterType:
+        type: Y
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -133,7 +155,17 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/collections/Map<X, O>
+    returnType: KtUsualClassType:
+      type: kotlin/collections/Map<X, O>
+      annotationsList: []
+      ownTypeArguments: [
+        KtTypeParameterType:
+          type: X
+          annotationsList: []
+        KtTypeParameterType:
+          type: O
+          annotationsList: []
+      ]
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -154,7 +186,17 @@ KtKotlinPropertySymbol:
   name: map
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/collections/Map<X, O>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/Map<X, O>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: X
+        annotationsList: []
+      KtTypeParameterType:
+        type: O
+        annotationsList: []
+    ]
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -178,7 +220,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -196,7 +241,10 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -220,7 +268,10 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -244,7 +295,10 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/components/scopeProvider/typeScope/outerTypeParamsSubstitution.txt

@@ -74,7 +74,17 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/collections/Map<X, Y>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/Map<X, Y>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: X
+        annotationsList: []
+      KtTypeParameterType:
+        type: Y
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
     KtTypeParameterSymbol(Y)
@@ -94,7 +104,9 @@ KtFunctionSymbol:
       name: x
       origin: SOURCE
       receiverParameter: null
-      returnType: X
+      returnType: KtTypeParameterType:
+        type: X
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -111,7 +123,9 @@ KtFunctionSymbol:
       name: y
       origin: SOURCE
       receiverParameter: null
-      returnType: Y
+      returnType: KtTypeParameterType:
+        type: Y
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -133,7 +147,18 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/collections/Map<X, kotlin/String>
+    returnType: KtUsualClassType:
+      type: kotlin/collections/Map<X, kotlin/String>
+      annotationsList: []
+      ownTypeArguments: [
+        KtTypeParameterType:
+          type: X
+          annotationsList: []
+        KtUsualClassType:
+          type: kotlin/String
+          annotationsList: []
+          ownTypeArguments: []
+      ]
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -154,7 +179,18 @@ KtKotlinPropertySymbol:
   name: map
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/collections/Map<X, kotlin/String>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/Map<X, kotlin/String>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: X
+        annotationsList: []
+      KtUsualClassType:
+        type: kotlin/String
+        annotationsList: []
+        ownTypeArguments: []
+    ]
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -178,7 +214,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -196,7 +235,10 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -220,7 +262,10 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -244,7 +289,10 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/components/scopeProvider/typeScope/typeParamList.txt

@@ -170,7 +170,10 @@ KtFunctionSymbol:
   name: contains
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -188,7 +191,9 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -212,7 +217,10 @@ KtFunctionSymbol:
   name: containsAll
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -230,7 +238,14 @@ KtFunctionSymbol:
       name: elements
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/collections/Collection<E>
+      returnType: KtUsualClassType:
+        type: kotlin/collections/Collection<E>
+        annotationsList: []
+        ownTypeArguments: [
+          KtTypeParameterType:
+            type: E
+            annotationsList: []
+        ]
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -254,7 +269,9 @@ KtFunctionSymbol:
   name: get
   origin: LIBRARY
   receiverParameter: null
-  returnType: E
+  returnType: KtTypeParameterType:
+    type: E
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -272,7 +289,10 @@ KtFunctionSymbol:
       name: index
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -296,7 +316,10 @@ KtFunctionSymbol:
   name: indexOf
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -314,7 +337,9 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -338,7 +363,10 @@ KtFunctionSymbol:
   name: isEmpty
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -362,7 +390,14 @@ KtFunctionSymbol:
   name: iterator
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/Iterator<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/Iterator<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -386,7 +421,10 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -404,7 +442,9 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -428,7 +468,14 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/ListIterator<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/ListIterator<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -452,7 +499,14 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/ListIterator<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/ListIterator<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -470,7 +524,10 @@ KtFunctionSymbol:
       name: index
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -494,7 +551,14 @@ KtFunctionSymbol:
   name: subList
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/List<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/List<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -512,7 +576,10 @@ KtFunctionSymbol:
       name: fromIndex
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -529,7 +596,10 @@ KtFunctionSymbol:
       name: toIndex
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -551,7 +621,10 @@ KtKotlinPropertySymbol:
     modality: ABSTRACT
     origin: LIBRARY
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -572,7 +645,10 @@ KtKotlinPropertySymbol:
   name: size
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -596,7 +672,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -614,7 +693,10 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -638,7 +720,10 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -662,7 +747,10 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []