[AA] DebugSymbolRenderer: improve type render

to process all nested annotations and types

^KT-56046

analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt

@@ -7,7 +7,15 @@ KtSuccessCallInfo:
           annotationsList: []
           origin: SOURCE
           owningCallableSymbol: KtAnonymousFunctionSymbol(<local>/<no name provided>)
-          type: test/Target<kotlin/String>
+          type: KtUsualClassType:
+            type: test/Target<kotlin/String>
+            annotationsList: []
+            ownTypeArguments: [
+              KtUsualClassType:
+                type: kotlin/String
+                annotationsList: []
+                ownTypeArguments: []
+            ]
         type = test.Target<kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:

analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt

@@ -7,7 +7,15 @@ KtSuccessCallInfo:
           annotationsList: []
           origin: SOURCE
           owningCallableSymbol: KtAnonymousFunctionSymbol(<local>/<no name provided>)
-          type: test/Target<kotlin/String>
+          type: KtUsualClassType:
+            type: test/Target<kotlin/String>
+            annotationsList: []
+            ownTypeArguments: [
+              KtUsualClassType:
+                type: kotlin/String
+                annotationsList: []
+                ownTypeArguments: []
+            ]
         type = test.Target<kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:

analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt

@@ -61,7 +61,10 @@ KtSuccessCallInfo:
           name: Foo
           origin: SOURCE
           superTypes: [
-            kotlin/Any
+            KtUsualClassType:
+              type: kotlin/Any
+              annotationsList: []
+              ownTypeArguments: []
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []

analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt

@@ -6,7 +6,10 @@ KtSuccessCallInfo:
           annotationsList: []
           origin: SOURCE
           owningCallableSymbol: KtFunctionSymbol(/call)
-          type: JavaClass
+          type: KtUsualClassType:
+            type: JavaClass
+            annotationsList: []
+            ownTypeArguments: []
         type = JavaClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
@@ -16,5 +19,5 @@ KtSuccessCallInfo:
         symbol = val foo: kotlin.Int
         callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Read:
-
+      
     typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt

@@ -6,7 +6,10 @@ KtSuccessCallInfo:
           annotationsList: []
           origin: SOURCE
           owningCallableSymbol: KtFunctionSymbol(/call)
-          type: JavaClass
+          type: KtUsualClassType:
+            type: JavaClass
+            annotationsList: []
+            ownTypeArguments: []
         type = JavaClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:

analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt

@@ -6,7 +6,10 @@ KtSuccessCallInfo:
           annotationsList: []
           origin: SOURCE
           owningCallableSymbol: KtFunctionSymbol(/foo)
-          type: A
+          type: KtUsualClassType:
+            type: A
+            annotationsList: []
+            ownTypeArguments: []
         type = A
       extensionReceiver = null
       signature = KtVariableLikeSignature:
@@ -16,5 +19,5 @@ KtSuccessCallInfo:
         symbol = val i: kotlin.Int
         callableIdIfNonLocal = /A.i
     simpleAccess = Read:
-
+      
     typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt

@@ -6,7 +6,10 @@ KtSuccessCallInfo:
           annotationsList: []
           origin: SOURCE
           owningCallableSymbol: KtFunctionSymbol(/foo)
-          type: A
+          type: KtUsualClassType:
+            type: A
+            annotationsList: []
+            ownTypeArguments: []
         type = A
       extensionReceiver = null
       signature = KtVariableLikeSignature:

analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt

@@ -54,7 +54,10 @@ KtSuccessCallInfo:
           name: Foo
           origin: SOURCE
           superTypes: [
-            kotlin/Any
+            KtUsualClassType:
+              type: kotlin/Any
+              annotationsList: []
+              ownTypeArguments: []
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []

analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt

@@ -54,7 +54,10 @@ KtSuccessCallInfo:
           name: Foo
           origin: SOURCE
           superTypes: [
-            kotlin/Any
+            KtUsualClassType:
+              type: kotlin/Any
+              annotationsList: []
+              ownTypeArguments: []
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []

analysis/analysis-api/testData/components/callResolver/resolveCall/recursiveTypeParameter.descriptors.txt

@@ -18,7 +18,10 @@ KtSuccessCallInfo:
           name: RunnerModule
           origin: SOURCE
           superTypes: [
-            AbstractModule
+            KtUsualClassType:
+              type: AbstractModule
+              annotationsList: []
+              ownTypeArguments: []
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []
@@ -46,4 +49,4 @@ KtSuccessCallInfo:
         returnType = AbstractModule.Builder<*>!
         symbol = builder: AbstractModule.Builder<*>!
         callableIdIfNonLocal = null)
-    }
+    }

analysis/analysis-api/testData/components/callResolver/resolveCall/recursiveTypeParameter.txt

@@ -18,7 +18,10 @@ KtSuccessCallInfo:
           name: RunnerModule
           origin: SOURCE
           superTypes: [
-            AbstractModule
+            KtUsualClassType:
+              type: AbstractModule
+              annotationsList: []
+              ownTypeArguments: []
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []
@@ -46,4 +49,4 @@ KtSuccessCallInfo:
         returnType = ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
         symbol = builder: ft<AbstractModule.Builder<*>, AbstractModule.Builder<*>?>
         callableIdIfNonLocal = null)
-    }
+    }

analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt

@@ -7,7 +7,10 @@ KtSuccessCallInfo:
             annotationsList: []
             origin: SOURCE
             owningCallableSymbol: KtFunctionSymbol(/test)
-            type: kotlin/Any
+            type: KtUsualClassType:
+              type: kotlin/Any
+              annotationsList: []
+              ownTypeArguments: []
           type = kotlin.Any
         type = kotlin.String
       extensionReceiver = null
@@ -18,5 +21,5 @@ KtSuccessCallInfo:
         symbol = val length: kotlin.Int
         callableIdIfNonLocal = kotlin/String.length
     simpleAccess = Read:
-
+      
     typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt

@@ -9,7 +9,10 @@ KtSuccessCallInfo:
             annotationsList: []
             origin: SOURCE
             owningCallableSymbol: KtFunctionSymbol(/test)
-            type: kotlin/Any
+            type: KtUsualClassType:
+              type: kotlin/Any
+              annotationsList: []
+              ownTypeArguments: []
           type = kotlin.Any
         type = kotlin.String
       signature = KtFunctionLikeSignature:

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt

@@ -7,7 +7,15 @@ KtApplicableCallCandidateInfo:
           annotationsList: []
           origin: SOURCE
           owningCallableSymbol: KtAnonymousFunctionSymbol(<local>/<no name provided>)
-          type: test/Target<kotlin/String>
+          type: KtUsualClassType:
+            type: test/Target<kotlin/String>
+            annotationsList: []
+            ownTypeArguments: [
+              KtUsualClassType:
+                type: kotlin/String
+                annotationsList: []
+                ownTypeArguments: []
+            ]
         type = test.Target<kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt

@@ -7,7 +7,15 @@ KtApplicableCallCandidateInfo:
           annotationsList: []
           origin: SOURCE
           owningCallableSymbol: KtAnonymousFunctionSymbol(<local>/<no name provided>)
-          type: test/Target<kotlin/String>
+          type: KtUsualClassType:
+            type: test/Target<kotlin/String>
+            annotationsList: []
+            ownTypeArguments: [
+              KtUsualClassType:
+                type: kotlin/String
+                annotationsList: []
+                ownTypeArguments: []
+            ]
         type = test.Target<Stub (chain inference): TypeVariable(T)>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
@@ -32,4 +40,4 @@ KtApplicableCallCandidateInfo:
         symbol = t: T
         callableIdIfNonLocal = null)
     }
-  isInBestCandidates = true
+  isInBestCandidates = true

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBody.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyQualified.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyWithTypeFromRHS.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyWithoutExplicitType.descriptors.txt

@@ -0,0 +1,4 @@
+expression: av
+expected type: KtTypeErrorType:
+  type: ERROR_TYPE
+  annotationsList: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyWithoutExplicitType.txt

@@ -1,2 +1,4 @@
 expression: av
-expected type: ERROR_TYPE
+expected type: KtClassErrorType:
+  type: ERROR_TYPE
+  annotationsList: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionLambdaParam.txt

@@ -1,2 +1,14 @@
 expression: av
-expected type: kotlin/Function1<kotlin/Int, kotlin/String>
+expected type: KtFunctionalType:
+  type: kotlin/Function1<kotlin/Int, kotlin/String>
+  annotationsList: []
+  ownTypeArguments: [
+    KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
+    KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
+  ]

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionNamedlParam.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/Boolean
+expected type: KtUsualClassType:
+  type: kotlin/Boolean
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionParamWithTypeParam.txt

@@ -1,2 +1,4 @@
 expression: ab
-expected type: T
+expected type: KtTypeParameterType:
+  type: T
+  annotationsList: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParam.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParamQualified.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/ifCondition.txt

@@ -1,2 +1,5 @@
 expression: xy
-expected type: kotlin/Boolean
+expected type: KtUsualClassType:
+  type: kotlin/Boolean
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/ifConditionQualified.txt

@@ -1,2 +1,5 @@
 expression: fdfd
-expected type: kotlin/Boolean
+expected type: KtUsualClassType:
+  type: kotlin/Boolean
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/infixFunctionAsRegularCallParam.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/infixFunctionParam.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/infixFunctionParamQualified.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/lambdaWithExplicitTypeFromVariable.txt

@@ -1,4 +1,12 @@
 expression: {
     val (a, b) = listOf(1, 2)
 }
-expected type: kotlin/Function0<kotlin/Unit>
+expected type: KtFunctionalType:
+  type: kotlin/Function0<kotlin/Unit>
+  annotationsList: []
+  ownTypeArguments: [
+    KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
+  ]

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/lambdaWithoutReturnNorExplicitType.txt

@@ -2,4 +2,16 @@ expression: { a: Int ->
     val b = 1
     a + b
 }
-expected type: kotlin/Function1<kotlin/Int, kotlin/Int>
+expected type: KtFunctionalType:
+  type: kotlin/Function1<kotlin/Int, kotlin/Int>
+  annotationsList: []
+  ownTypeArguments: [
+    KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
+    KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
+  ]

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclaration.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationQualified.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithSafeCast.txt

@@ -1,2 +1,5 @@
 expression: p0
-expected type: kotlin/String?
+expected type: KtUsualClassType:
+  type: kotlin/String?
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithTypeCast.txt

@@ -1,2 +1,5 @@
 expression: p0
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithTypeFromRHS.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/String
+expected type: KtUsualClassType:
+  type: kotlin/String
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithoutExplicitType.descriptors.txt

@@ -0,0 +1,4 @@
+expression: av
+expected type: KtTypeErrorType:
+  type: ERROR_TYPE
+  annotationsList: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithoutExplicitType.txt

@@ -1,2 +1,4 @@
 expression: av
-expected type: ERROR_TYPE
+expected type: KtClassErrorType:
+  type: ERROR_TYPE
+  annotationsList: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromFunction.txt

@@ -1,2 +1,5 @@
 expression: a
-expected type: kotlin/Int
+expected type: KtUsualClassType:
+  type: kotlin/Int
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromFunctionQualifiedSelector.txt

@@ -1,2 +1,5 @@
 expression: a
-expected type: kotlin/Int
+expected type: KtUsualClassType:
+  type: kotlin/Int
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromLambda.txt

@@ -1,2 +1,5 @@
 expression: fd
-expected type: kotlin/Int
+expected type: KtUsualClassType:
+  type: kotlin/Int
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/sam.txt

@@ -1,2 +1,5 @@
 expression: { /* SAM */ }
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsArgument.txt

@@ -1,2 +1,5 @@
 expression: { /* Argument */ }
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsConstructorArgument.txt

@@ -1,2 +1,4 @@
 expression: { println("hello1") }
-expected type: java/lang/Runnable!
+expected type: KtFlexibleType:
+  type: java/lang/Runnable!
+  annotationsList: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsReturn.txt

@@ -1,2 +1,5 @@
 expression: { /* Return */ }
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samReferenceAsArgument.txt

@@ -1,2 +1,5 @@
 expression: ::dummy
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samReferenceAsVararg.txt

@@ -1,2 +1,5 @@
 expression: ::dummy
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samReferenceWithTypeCast.txt

@@ -1,2 +1,5 @@
 expression: ::dummy
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samWithExplicitTypeFromProperty.txt

@@ -1,2 +1,5 @@
 expression: { /* Variable */ }
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samWithReturnToExplicitLabel.txt

@@ -1,2 +1,5 @@
 expression: { return@l }
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samWithReturnToImplicitLabel.txt

@@ -1,2 +1,5 @@
 expression: { return@Runnable }
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samWithTypeCast.txt

@@ -1,2 +1,5 @@
 expression: { /* Type Cast */ }
-expected type: java/lang/Runnable
+expected type: KtUsualClassType:
+  type: java/lang/Runnable
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/variableAssignment.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/Int
+expected type: KtUsualClassType:
+  type: kotlin/Int
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/variableAssignmentQualified.txt

@@ -1,2 +1,5 @@
 expression: av
-expected type: kotlin/Int
+expected type: KtUsualClassType:
+  type: kotlin/Int
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/whileCondition.txt

@@ -1,2 +1,5 @@
 expression: xy
-expected type: kotlin/Boolean
+expected type: KtUsualClassType:
+  type: kotlin/Boolean
+  annotationsList: []
+  ownTypeArguments: []

analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/whileConditionQualified.txt

@@ -1,2 +1,5 @@
 expression: fdfd
-expected type: kotlin/Boolean
+expected type: KtUsualClassType:
+  type: kotlin/Boolean
+  annotationsList: []
+  ownTypeArguments: []

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: []