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

analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.txt

@@ -15,12 +15,18 @@ KtKotlinPropertySymbol:
     modality: OPEN
     origin: DELEGATED
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): A
+    getDispatchReceiver(): KtUsualClassType:
+      type: A
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: false
@@ -39,12 +45,18 @@ KtKotlinPropertySymbol:
   name: foo
   origin: DELEGATED
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

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

@@ -19,12 +19,18 @@ KtKotlinPropertySymbol:
   name: foo
   origin: DELEGATED
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

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

@@ -18,15 +18,24 @@ KtKotlinPropertySymbol:
       annotationsList: []
       origin: SOURCE
       owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo)
-      type: kotlin/Int
+      type: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): A
+    getDispatchReceiver(): KtUsualClassType:
+      type: A
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: false
@@ -48,10 +57,16 @@ KtKotlinPropertySymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo)
-    type: kotlin/Int
+    type: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -78,7 +93,10 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Unit
+      returnType: KtUsualClassType:
+        type: kotlin/Unit
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -87,10 +105,16 @@ KtKotlinPropertySymbol:
       annotationsList: []
       origin: SOURCE
       owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo)
-      type: kotlin/Int
+      type: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -108,20 +132,29 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Unit
+        returnType: KtUsualClassType:
+          type: kotlin/Unit
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
         deprecationStatus: null
     ]
     visibility: Public
-    getDispatchReceiver(): A
+    getDispatchReceiver(): KtUsualClassType:
+      type: A
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -148,12 +181,18 @@ KtFunctionSymbol:
   name: foo
   origin: DELEGATED
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -179,15 +218,24 @@ KtFunctionSymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtFunctionSymbol(/I.smth)
-    type: kotlin/Int
+    type: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Short
+  returnType: KtUsualClassType:
+    type: kotlin/Short
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -208,12 +256,18 @@ KtKotlinPropertySymbol:
     modality: OPEN
     origin: DELEGATED
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): A
+    getDispatchReceiver(): KtUsualClassType:
+      type: A
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: false
@@ -232,12 +286,18 @@ KtKotlinPropertySymbol:
   name: foo
   origin: DELEGATED
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -262,12 +322,18 @@ KtKotlinPropertySymbol:
     modality: OPEN
     origin: DELEGATED
     receiverParameter: null
-    returnType: kotlin/Long
+    returnType: KtUsualClassType:
+      type: kotlin/Long
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): A
+    getDispatchReceiver(): KtUsualClassType:
+      type: A
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: false
@@ -286,7 +352,10 @@ KtKotlinPropertySymbol:
   name: bar
   origin: DELEGATED
   receiverParameter: null
-  returnType: kotlin/Long
+  returnType: KtUsualClassType:
+    type: kotlin/Long
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -313,13 +382,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Long
+      returnType: KtUsualClassType:
+        type: kotlin/Long
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -337,20 +412,29 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Long
+        returnType: KtUsualClassType:
+          type: kotlin/Long
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
         deprecationStatus: null
     ]
     visibility: Public
-    getDispatchReceiver(): A
+    getDispatchReceiver(): KtUsualClassType:
+      type: A
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -378,15 +462,24 @@ KtKotlinPropertySymbol:
       annotationsList: []
       origin: SOURCE
       owningCallableSymbol: KtKotlinPropertySymbol(/I.doo)
-      type: kotlin/Int
+      type: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): A
+    getDispatchReceiver(): KtUsualClassType:
+      type: A
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: false
@@ -408,15 +501,24 @@ KtKotlinPropertySymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtKotlinPropertySymbol(/I.doo)
-    type: kotlin/Int
+    type: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

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

@@ -22,15 +22,24 @@ KtKotlinPropertySymbol:
     annotationsList: []
     origin: DELEGATED
     owningCallableSymbol: KtKotlinPropertySymbol(/I.zoo)
-    type: kotlin/Int
+    type: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -57,12 +66,18 @@ KtFunctionSymbol:
   name: foo
   origin: DELEGATED
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -87,12 +102,18 @@ KtKotlinPropertySymbol:
   name: foo
   origin: DELEGATED
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -122,15 +143,24 @@ KtFunctionSymbol:
     annotationsList: []
     origin: DELEGATED
     owningCallableSymbol: KtFunctionSymbol(/I.smth)
-    type: kotlin/Int
+    type: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Short
+  returnType: KtUsualClassType:
+    type: kotlin/Short
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -155,12 +185,18 @@ KtKotlinPropertySymbol:
   name: bar
   origin: DELEGATED
   receiverParameter: null
-  returnType: kotlin/Long
+  returnType: KtUsualClassType:
+    type: kotlin/Long
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -192,15 +228,24 @@ KtKotlinPropertySymbol:
     annotationsList: []
     origin: DELEGATED
     owningCallableSymbol: KtKotlinPropertySymbol(/I.doo)
-    type: kotlin/Int
+    type: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): A
+  getDispatchReceiver(): KtUsualClassType:
+    type: A
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

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

@@ -17,11 +17,17 @@ KtFunctionSymbol:
   name: bar
   origin: DELEGATED
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): B
+  getDispatchReceiver(): KtUsualClassType:
+    type: B
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.descriptors.txt

@@ -28,7 +28,10 @@ KtFunctionSymbol:
   name: function
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: []
@@ -58,7 +61,10 @@ KtFunctionSymbol:
   name: functionWithDefault
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -76,7 +82,10 @@ KtFunctionSymbol:
       name: par1
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -103,7 +112,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -126,7 +138,10 @@ KtKotlinPropertySymbol:
   name: testVal
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -155,7 +170,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -178,7 +196,10 @@ KtKotlinPropertySymbol:
   name: initializedVariable
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -205,13 +226,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -229,7 +256,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Int
+        returnType: KtUsualClassType:
+          type: kotlin/Int
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -265,7 +295,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Long
+    returnType: KtUsualClassType:
+      type: kotlin/Long
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -288,7 +321,10 @@ KtKotlinPropertySymbol:
   name: unitializedVariable
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Long
+  returnType: KtUsualClassType:
+    type: kotlin/Long
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -315,13 +351,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Long
+      returnType: KtUsualClassType:
+        type: kotlin/Long
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -339,7 +381,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Long
+        returnType: KtUsualClassType:
+          type: kotlin/Long
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -375,7 +420,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -398,7 +446,10 @@ KtKotlinPropertySymbol:
   name: lateinitVariable
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -425,13 +476,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/String
+      returnType: KtUsualClassType:
+        type: kotlin/String
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -449,7 +506,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/String
+        returnType: KtUsualClassType:
+          type: kotlin/String
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -485,7 +545,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Long
+    returnType: KtUsualClassType:
+      type: kotlin/Long
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -508,7 +571,10 @@ KtKotlinPropertySymbol:
   name: variableWithBackingField
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Long
+  returnType: KtUsualClassType:
+    type: kotlin/Long
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -535,13 +601,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Long
+      returnType: KtUsualClassType:
+        type: kotlin/Long
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -559,7 +631,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Long
+        returnType: KtUsualClassType:
+          type: kotlin/Long
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -595,7 +670,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -618,7 +696,10 @@ KtKotlinPropertySymbol:
   name: privateSetter
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: [
       kotlin/jvm/JvmName(name = "customPrivateSetter")
@@ -648,13 +729,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/String
+      returnType: KtUsualClassType:
+        type: kotlin/String
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -672,7 +759,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/String
+        returnType: KtUsualClassType:
+          type: kotlin/String
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -708,7 +798,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -731,7 +824,10 @@ KtKotlinPropertySymbol:
   name: jvmNameOnSetter
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: [
       kotlin/jvm/JvmName(name = "customPrivateSetter")
@@ -761,13 +857,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/String
+      returnType: KtUsualClassType:
+        type: kotlin/String
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -785,7 +887,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/String
+        returnType: KtUsualClassType:
+          type: kotlin/String
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -824,7 +929,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -847,7 +955,10 @@ KtKotlinPropertySymbol:
   name: customGetter
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -879,7 +990,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -902,7 +1016,10 @@ KtKotlinPropertySymbol:
   name: jvmNameOnGetter
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -934,10 +1051,16 @@ KtKotlinPropertySymbol:
       annotationsList: []
       origin: SOURCE
       owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver)
-      type: kotlin/Int
+      type: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -963,10 +1086,16 @@ KtKotlinPropertySymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver)
-    type: kotlin/Int
+    type: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -998,10 +1127,15 @@ KtKotlinPropertySymbol:
       annotationsList: []
       origin: SOURCE
       owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver)
-      type: T
+      type: KtTypeParameterType:
+        type: T
+        annotationsList: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -1027,10 +1161,15 @@ KtKotlinPropertySymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver)
-    type: T
+    type: KtTypeParameterType:
+      type: T
+      annotationsList: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: [
@@ -1061,7 +1200,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -1084,7 +1226,10 @@ KtKotlinPropertySymbol:
   name: constant
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -1113,7 +1258,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Long
+    returnType: KtUsualClassType:
+      type: kotlin/Long
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -1136,7 +1284,10 @@ KtKotlinPropertySymbol:
   name: jvmField
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Long
+  returnType: KtUsualClassType:
+    type: kotlin/Long
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -1163,13 +1314,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Long
+      returnType: KtUsualClassType:
+        type: kotlin/Long
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -1187,7 +1344,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Long
+        returnType: KtUsualClassType:
+          type: kotlin/Long
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -1225,7 +1385,10 @@ KtNamedClassOrObjectSymbol:
   name: OuterClass
   origin: SOURCE
   superTypes: [
-    kotlin/Any
+    KtUsualClassType:
+      type: kotlin/Any
+      annotationsList: []
+      ownTypeArguments: []
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []

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

@@ -28,7 +28,10 @@ KtFunctionSymbol:
   name: function
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: []
@@ -58,7 +61,10 @@ KtFunctionSymbol:
   name: functionWithDefault
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -76,7 +82,10 @@ KtFunctionSymbol:
       name: par1
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -103,7 +112,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -126,7 +138,10 @@ KtKotlinPropertySymbol:
   name: testVal
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -155,7 +170,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -178,7 +196,10 @@ KtKotlinPropertySymbol:
   name: initializedVariable
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -205,13 +226,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -229,7 +256,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Int
+        returnType: KtUsualClassType:
+          type: kotlin/Int
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -265,7 +295,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Long
+    returnType: KtUsualClassType:
+      type: kotlin/Long
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -288,7 +321,10 @@ KtKotlinPropertySymbol:
   name: unitializedVariable
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Long
+  returnType: KtUsualClassType:
+    type: kotlin/Long
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -315,13 +351,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Long
+      returnType: KtUsualClassType:
+        type: kotlin/Long
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -339,7 +381,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Long
+        returnType: KtUsualClassType:
+          type: kotlin/Long
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -375,7 +420,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -398,7 +446,10 @@ KtKotlinPropertySymbol:
   name: lateinitVariable
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -425,13 +476,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/String
+      returnType: KtUsualClassType:
+        type: kotlin/String
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -449,7 +506,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/String
+        returnType: KtUsualClassType:
+          type: kotlin/String
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -485,7 +545,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Long
+    returnType: KtUsualClassType:
+      type: kotlin/Long
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -508,7 +571,10 @@ KtKotlinPropertySymbol:
   name: variableWithBackingField
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Long
+  returnType: KtUsualClassType:
+    type: kotlin/Long
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -535,13 +601,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Long
+      returnType: KtUsualClassType:
+        type: kotlin/Long
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -559,7 +631,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Long
+        returnType: KtUsualClassType:
+          type: kotlin/Long
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -595,7 +670,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -618,7 +696,10 @@ KtKotlinPropertySymbol:
   name: privateSetter
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: [
       kotlin/jvm/JvmName(name = "customPrivateSetter")
@@ -648,13 +729,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/String
+      returnType: KtUsualClassType:
+        type: kotlin/String
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -672,7 +759,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/String
+        returnType: KtUsualClassType:
+          type: kotlin/String
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -708,7 +798,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -731,7 +824,10 @@ KtKotlinPropertySymbol:
   name: jvmNameOnSetter
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: [
       kotlin/jvm/JvmName(name = "customPrivateSetter")
@@ -761,13 +857,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/String
+      returnType: KtUsualClassType:
+        type: kotlin/String
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -785,7 +887,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/String
+        returnType: KtUsualClassType:
+          type: kotlin/String
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -824,7 +929,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -847,7 +955,10 @@ KtKotlinPropertySymbol:
   name: customGetter
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -879,7 +990,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -902,7 +1016,10 @@ KtKotlinPropertySymbol:
   name: jvmNameOnGetter
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -934,10 +1051,16 @@ KtKotlinPropertySymbol:
       annotationsList: []
       origin: SOURCE
       owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver)
-      type: kotlin/Int
+      type: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -963,10 +1086,16 @@ KtKotlinPropertySymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithReceiver)
-    type: kotlin/Int
+    type: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -998,10 +1127,15 @@ KtKotlinPropertySymbol:
       annotationsList: []
       origin: SOURCE
       owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver)
-      type: T
+      type: KtTypeParameterType:
+        type: T
+        annotationsList: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -1027,10 +1161,15 @@ KtKotlinPropertySymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtKotlinPropertySymbol(/propertyWithGenericReceiver)
-    type: T
+    type: KtTypeParameterType:
+      type: T
+      annotationsList: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: [
@@ -1061,7 +1200,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -1084,7 +1226,10 @@ KtKotlinPropertySymbol:
   name: constant
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -1116,7 +1261,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Long
+    returnType: KtUsualClassType:
+      type: kotlin/Long
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -1139,7 +1287,10 @@ KtKotlinPropertySymbol:
   name: jvmField
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Long
+  returnType: KtUsualClassType:
+    type: kotlin/Long
+    annotationsList: []
+    ownTypeArguments: []
   setter: KtPropertySetterSymbol:
     annotationsList: []
     callableIdIfNonLocal: null
@@ -1166,13 +1317,19 @@ KtKotlinPropertySymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Long
+      returnType: KtUsualClassType:
+        type: kotlin/Long
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
-    returnType: kotlin/Unit
+    returnType: KtUsualClassType:
+      type: kotlin/Unit
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: [
@@ -1190,7 +1347,10 @@ KtKotlinPropertySymbol:
         name: value
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Long
+        returnType: KtUsualClassType:
+          type: kotlin/Long
+          annotationsList: []
+          ownTypeArguments: []
         symbolKind: LOCAL
         typeParameters: []
         getContainingModule: KtSourceModule "Sources of main"
@@ -1228,7 +1388,10 @@ KtNamedClassOrObjectSymbol:
   name: OuterClass
   origin: SOURCE
   superTypes: [
-    kotlin/Any
+    KtUsualClassType:
+      type: kotlin/Any
+      annotationsList: []
+      ownTypeArguments: []
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []

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

@@ -28,7 +28,10 @@ KtFunctionSymbol:
   name: test
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: []
@@ -53,7 +56,10 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -76,7 +82,10 @@ KtKotlinPropertySymbol:
   name: testVal
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -107,7 +116,10 @@ KtNamedClassOrObjectSymbol:
   name: C
   origin: SOURCE
   superTypes: [
-    kotlin/Any
+    KtUsualClassType:
+      type: kotlin/Any
+      annotationsList: []
+      ownTypeArguments: []
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []
@@ -131,7 +143,10 @@ KtNamedClassOrObjectSymbol:
   name: I
   origin: SOURCE
   superTypes: [
-    kotlin/Any
+    KtUsualClassType:
+      type: kotlin/Any
+      annotationsList: []
+      ownTypeArguments: []
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []

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

@@ -17,7 +17,10 @@ KtFunctionSymbol:
   name: add
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -35,14 +38,23 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -65,7 +77,10 @@ KtFunctionSymbol:
   name: add
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -83,7 +98,10 @@ KtFunctionSymbol:
       name: index
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
@@ -102,14 +120,23 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -132,7 +159,10 @@ KtFunctionSymbol:
   name: addAll
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -150,7 +180,10 @@ KtFunctionSymbol:
       name: index
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
@@ -169,14 +202,28 @@ 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: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -199,7 +246,10 @@ KtFunctionSymbol:
   name: addAll
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -217,14 +267,28 @@ 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: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -247,12 +311,22 @@ KtFunctionSymbol:
   name: clear
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -275,12 +349,26 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/MutableListIterator<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/MutableListIterator<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -303,7 +391,14 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/MutableListIterator<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/MutableListIterator<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -321,14 +416,24 @@ KtFunctionSymbol:
       name: index
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -351,7 +456,10 @@ KtFunctionSymbol:
   name: remove
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -369,14 +477,23 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -399,7 +516,10 @@ KtFunctionSymbol:
   name: removeAll
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -417,14 +537,28 @@ 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: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -447,7 +581,9 @@ KtFunctionSymbol:
   name: removeAt
   origin: LIBRARY
   receiverParameter: null
-  returnType: E
+  returnType: KtTypeParameterType:
+    type: E
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -465,14 +601,24 @@ KtFunctionSymbol:
       name: index
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -495,7 +641,10 @@ KtFunctionSymbol:
   name: retainAll
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -513,14 +662,28 @@ 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: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -543,7 +706,9 @@ KtFunctionSymbol:
   name: set
   origin: LIBRARY
   receiverParameter: null
-  returnType: E
+  returnType: KtTypeParameterType:
+    type: E
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -561,7 +726,10 @@ KtFunctionSymbol:
       name: index
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
@@ -580,14 +748,23 @@ KtFunctionSymbol:
       name: element
       origin: LIBRARY
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -610,7 +787,14 @@ KtFunctionSymbol:
   name: subList
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/collections/MutableList<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -628,7 +812,10 @@ KtFunctionSymbol:
       name: fromIndex
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
@@ -647,14 +834,24 @@ KtFunctionSymbol:
       name: toIndex
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -677,7 +874,10 @@ KtFunctionSymbol:
   name: contains
   origin: SUBSTITUTION_OVERRIDE
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -695,14 +895,23 @@ KtFunctionSymbol:
       name: element
       origin: SUBSTITUTION_OVERRIDE
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -725,7 +934,10 @@ KtFunctionSymbol:
   name: containsAll
   origin: SUBSTITUTION_OVERRIDE
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -743,14 +955,28 @@ KtFunctionSymbol:
       name: elements
       origin: SUBSTITUTION_OVERRIDE
       receiverParameter: null
-      returnType: kotlin/collections/Collection<E>
+      returnType: KtUsualClassType:
+        type: kotlin/collections/Collection<E>
+        annotationsList: []
+        ownTypeArguments: [
+          KtTypeParameterType:
+            type: E
+            annotationsList: []
+        ]
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -773,7 +999,9 @@ KtFunctionSymbol:
   name: get
   origin: SUBSTITUTION_OVERRIDE
   receiverParameter: null
-  returnType: E
+  returnType: KtTypeParameterType:
+    type: E
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -791,14 +1019,24 @@ KtFunctionSymbol:
       name: index
       origin: SUBSTITUTION_OVERRIDE
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -821,7 +1059,10 @@ KtFunctionSymbol:
   name: indexOf
   origin: SUBSTITUTION_OVERRIDE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -839,14 +1080,23 @@ KtFunctionSymbol:
       name: element
       origin: SUBSTITUTION_OVERRIDE
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -869,12 +1119,22 @@ KtFunctionSymbol:
   name: isEmpty
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/List<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/List<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -897,12 +1157,26 @@ KtFunctionSymbol:
   name: iterator
   origin: INTERSECTION_OVERRIDE
   receiverParameter: null
-  returnType: kotlin/collections/MutableIterator<E>
+  returnType: KtUsualClassType:
+    type: kotlin/collections/MutableIterator<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -925,7 +1199,10 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: SUBSTITUTION_OVERRIDE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -943,14 +1220,23 @@ KtFunctionSymbol:
       name: element
       origin: SUBSTITUTION_OVERRIDE
       receiverParameter: null
-      returnType: E
+      returnType: KtTypeParameterType:
+        type: E
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/MutableList<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/MutableList<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -971,12 +1257,22 @@ KtKotlinPropertySymbol:
     modality: ABSTRACT
     origin: LIBRARY
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): kotlin/collections/List<E>
+    getDispatchReceiver(): KtUsualClassType:
+      type: kotlin/collections/List<E>
+      annotationsList: []
+      ownTypeArguments: [
+        KtTypeParameterType:
+          type: E
+          annotationsList: []
+      ]
     getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
     deprecationStatus: null
   hasBackingField: false
@@ -995,12 +1291,22 @@ KtKotlinPropertySymbol:
   name: size
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/collections/List<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/collections/List<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -1027,7 +1333,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1045,14 +1354,20 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -1075,12 +1390,18 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -1103,11 +1424,17 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null

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

@@ -15,12 +15,18 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): Abc
+    getDispatchReceiver(): KtUsualClassType:
+      type: Abc
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -39,12 +45,18 @@ KtKotlinPropertySymbol:
   name: firstProperty
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): Abc
+  getDispatchReceiver(): KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -69,12 +81,18 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/Double
+    returnType: KtUsualClassType:
+      type: kotlin/Double
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): Abc
+    getDispatchReceiver(): KtUsualClassType:
+      type: Abc
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -93,12 +111,18 @@ KtKotlinPropertySymbol:
   name: secondProperty
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Double
+  returnType: KtUsualClassType:
+    type: kotlin/Double
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): Abc
+  getDispatchReceiver(): KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -123,12 +147,18 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): Abc
+    getDispatchReceiver(): KtUsualClassType:
+      type: Abc
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -147,12 +177,18 @@ KtKotlinPropertySymbol:
   name: thirdProperty
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): Abc
+  getDispatchReceiver(): KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -179,12 +215,18 @@ KtFunctionSymbol:
   name: check
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): Abc
+  getDispatchReceiver(): KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -208,10 +250,16 @@ KtKotlinPropertySymbol:
       annotationsList: []
       origin: SOURCE
       owningCallableSymbol: KtKotlinPropertySymbol(/Abc.bodyProperty)
-      type: kotlin/Int
+      type: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
-    returnType: kotlin/Long
+    returnType: KtUsualClassType:
+      type: kotlin/Long
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -237,15 +285,24 @@ KtKotlinPropertySymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtKotlinPropertySymbol(/Abc.bodyProperty)
-    type: kotlin/Int
+    type: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Long
+  returnType: KtUsualClassType:
+    type: kotlin/Long
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): Abc
+  getDispatchReceiver(): KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -272,12 +329,18 @@ KtFunctionSymbol:
   name: component1
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): Abc
+  getDispatchReceiver(): KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -300,12 +363,18 @@ KtFunctionSymbol:
   name: component2
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
-  returnType: kotlin/Double
+  returnType: KtUsualClassType:
+    type: kotlin/Double
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): Abc
+  getDispatchReceiver(): KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -328,12 +397,18 @@ KtFunctionSymbol:
   name: component3
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): Abc
+  getDispatchReceiver(): KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -356,7 +431,10 @@ KtFunctionSymbol:
   name: copy
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
-  returnType: Abc
+  returnType: KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -374,7 +452,10 @@ KtFunctionSymbol:
       name: firstProperty
       origin: SOURCE_MEMBER_GENERATED
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -393,7 +474,10 @@ KtFunctionSymbol:
       name: secondProperty
       origin: SOURCE_MEMBER_GENERATED
       receiverParameter: null
-      returnType: kotlin/Double
+      returnType: KtUsualClassType:
+        type: kotlin/Double
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -412,14 +496,20 @@ KtFunctionSymbol:
       name: thirdProperty
       origin: SOURCE_MEMBER_GENERATED
       receiverParameter: null
-      returnType: kotlin/String
+      returnType: KtUsualClassType:
+        type: kotlin/String
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): Abc
+  getDispatchReceiver(): KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -442,7 +532,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -460,14 +553,20 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -490,12 +589,18 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -518,12 +623,18 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -537,7 +648,10 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE
   receiverParameter: null
-  returnType: Abc
+  returnType: KtUsualClassType:
+    type: Abc
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -562,12 +676,18 @@ KtConstructorSymbol:
           modality: FINAL
           origin: SOURCE
           receiverParameter: null
-          returnType: kotlin/Int
+          returnType: KtUsualClassType:
+            type: kotlin/Int
+            annotationsList: []
+            ownTypeArguments: []
           symbolKind: ACCESSOR
           typeParameters: []
           valueParameters: []
           visibility: Public
-          getDispatchReceiver(): Abc
+          getDispatchReceiver(): KtUsualClassType:
+            type: Abc
+            annotationsList: []
+            ownTypeArguments: []
           getContainingModule: KtSourceModule "Sources of main"
           deprecationStatus: null
         hasBackingField: true
@@ -586,12 +706,18 @@ KtConstructorSymbol:
         name: firstProperty
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Int
+        returnType: KtUsualClassType:
+          type: kotlin/Int
+          annotationsList: []
+          ownTypeArguments: []
         setter: null
         symbolKind: CLASS_MEMBER
         typeParameters: []
         visibility: Public
-        getDispatchReceiver(): Abc
+        getDispatchReceiver(): KtUsualClassType:
+          type: Abc
+          annotationsList: []
+          ownTypeArguments: []
         getContainingModule: KtSourceModule "Sources of main"
         deprecationStatus: null
         getterDeprecationStatus: null
@@ -607,7 +733,10 @@ KtConstructorSymbol:
       name: firstProperty
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -633,12 +762,18 @@ KtConstructorSymbol:
           modality: FINAL
           origin: SOURCE
           receiverParameter: null
-          returnType: kotlin/Double
+          returnType: KtUsualClassType:
+            type: kotlin/Double
+            annotationsList: []
+            ownTypeArguments: []
           symbolKind: ACCESSOR
           typeParameters: []
           valueParameters: []
           visibility: Public
-          getDispatchReceiver(): Abc
+          getDispatchReceiver(): KtUsualClassType:
+            type: Abc
+            annotationsList: []
+            ownTypeArguments: []
           getContainingModule: KtSourceModule "Sources of main"
           deprecationStatus: null
         hasBackingField: true
@@ -657,12 +792,18 @@ KtConstructorSymbol:
         name: secondProperty
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/Double
+        returnType: KtUsualClassType:
+          type: kotlin/Double
+          annotationsList: []
+          ownTypeArguments: []
         setter: null
         symbolKind: CLASS_MEMBER
         typeParameters: []
         visibility: Public
-        getDispatchReceiver(): Abc
+        getDispatchReceiver(): KtUsualClassType:
+          type: Abc
+          annotationsList: []
+          ownTypeArguments: []
         getContainingModule: KtSourceModule "Sources of main"
         deprecationStatus: null
         getterDeprecationStatus: null
@@ -678,7 +819,10 @@ KtConstructorSymbol:
       name: secondProperty
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Double
+      returnType: KtUsualClassType:
+        type: kotlin/Double
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -704,12 +848,18 @@ KtConstructorSymbol:
           modality: FINAL
           origin: SOURCE
           receiverParameter: null
-          returnType: kotlin/String
+          returnType: KtUsualClassType:
+            type: kotlin/String
+            annotationsList: []
+            ownTypeArguments: []
           symbolKind: ACCESSOR
           typeParameters: []
           valueParameters: []
           visibility: Public
-          getDispatchReceiver(): Abc
+          getDispatchReceiver(): KtUsualClassType:
+            type: Abc
+            annotationsList: []
+            ownTypeArguments: []
           getContainingModule: KtSourceModule "Sources of main"
           deprecationStatus: null
         hasBackingField: true
@@ -728,12 +878,18 @@ KtConstructorSymbol:
         name: thirdProperty
         origin: SOURCE
         receiverParameter: null
-        returnType: kotlin/String
+        returnType: KtUsualClassType:
+          type: kotlin/String
+          annotationsList: []
+          ownTypeArguments: []
         setter: null
         symbolKind: CLASS_MEMBER
         typeParameters: []
         visibility: Public
-        getDispatchReceiver(): Abc
+        getDispatchReceiver(): KtUsualClassType:
+          type: Abc
+          annotationsList: []
+          ownTypeArguments: []
         getContainingModule: KtSourceModule "Sources of main"
         deprecationStatus: null
         getterDeprecationStatus: null
@@ -749,7 +905,10 @@ KtConstructorSymbol:
       name: thirdProperty
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/String
+      returnType: KtUsualClassType:
+        type: kotlin/String
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"

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

@@ -15,12 +15,18 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: SOURCE
     receiverParameter: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): <anonymous>
+    getDispatchReceiver(): KtUsualClassType:
+      type: <anonymous>
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -39,12 +45,18 @@ KtKotlinPropertySymbol:
   name: x
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): <anonymous>
+  getDispatchReceiver(): KtUsualClassType:
+    type: <anonymous>
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -71,12 +83,22 @@ KtFunctionSymbol:
   name: clone
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Any
+  returnType: KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Protected
-  getDispatchReceiver(): kotlin/Enum<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Enum<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -99,7 +121,10 @@ KtFunctionSymbol:
   name: compareTo
   origin: SUBSTITUTION_OVERRIDE
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -117,14 +142,20 @@ KtFunctionSymbol:
       name: other
       origin: SUBSTITUTION_OVERRIDE
       receiverParameter: null
-      returnType: test/E
+      returnType: KtUsualClassType:
+        type: test/E
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): test/E
+  getDispatchReceiver(): KtUsualClassType:
+    type: test/E
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -147,7 +178,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -165,14 +199,24 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Enum<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Enum<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -195,12 +239,22 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Enum<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Enum<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -223,12 +277,22 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Enum<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Enum<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -252,12 +316,22 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: LIBRARY
     receiverParameter: null
-    returnType: kotlin/String
+    returnType: KtUsualClassType:
+      type: kotlin/String
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): kotlin/Enum<E>
+    getDispatchReceiver(): KtUsualClassType:
+      type: kotlin/Enum<E>
+      annotationsList: []
+      ownTypeArguments: [
+        KtTypeParameterType:
+          type: E
+          annotationsList: []
+      ]
     getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
     deprecationStatus: null
   hasBackingField: true
@@ -276,12 +350,22 @@ KtKotlinPropertySymbol:
   name: name
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Enum<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Enum<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
   getterDeprecationStatus: null
@@ -306,12 +390,22 @@ KtKotlinPropertySymbol:
     modality: FINAL
     origin: LIBRARY
     receiverParameter: null
-    returnType: kotlin/Int
+    returnType: KtUsualClassType:
+      type: kotlin/Int
+      annotationsList: []
+      ownTypeArguments: []
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
-    getDispatchReceiver(): kotlin/Enum<E>
+    getDispatchReceiver(): KtUsualClassType:
+      type: kotlin/Enum<E>
+      annotationsList: []
+      ownTypeArguments: [
+        KtTypeParameterType:
+          type: E
+          annotationsList: []
+      ]
     getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
     deprecationStatus: null
   hasBackingField: true
@@ -330,12 +424,22 @@ KtKotlinPropertySymbol:
   name: ordinal
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Enum<E>
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Enum<E>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: E
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
   getterDeprecationStatus: null

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

@@ -9,11 +9,17 @@ KtJavaFieldSymbol:
   name: field
   origin: JAVA
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): JavaClass
+  getDispatchReceiver(): KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -28,11 +34,16 @@ KtJavaFieldSymbol:
   name: field2
   origin: JAVA
   receiverParameter: null
-  returnType: kotlin/String!
+  returnType: KtFlexibleType:
+    type: kotlin/String!
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): JavaClass
+  getDispatchReceiver(): KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -55,7 +66,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -73,14 +87,20 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -103,12 +123,18 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -131,12 +157,18 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -150,7 +182,10 @@ KtConstructorSymbol:
   isPrimary: true
   origin: JAVA
   receiverParameter: null
-  returnType: JavaClass
+  returnType: KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

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

@@ -9,11 +9,17 @@ KtJavaFieldSymbol:
   name: field
   origin: JAVA
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): JavaClass
+  getDispatchReceiver(): KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -28,11 +34,16 @@ KtJavaFieldSymbol:
   name: field
   origin: JAVA
   receiverParameter: null
-  returnType: kotlin/String!
+  returnType: KtFlexibleType:
+    type: kotlin/String!
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
-  getDispatchReceiver(): JavaClass
+  getDispatchReceiver(): KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -55,7 +66,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -73,14 +87,20 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -103,12 +123,18 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -131,12 +157,18 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -150,7 +182,10 @@ KtConstructorSymbol:
   isPrimary: true
   origin: JAVA
   receiverParameter: null
-  returnType: JavaClass
+  returnType: KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

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

@@ -17,12 +17,18 @@ KtFunctionSymbol:
   name: foo
   origin: JAVA
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): JavaClass
+  getDispatchReceiver(): KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -45,7 +51,9 @@ KtFunctionSymbol:
   name: doo
   origin: JAVA
   receiverParameter: null
-  returnType: kotlin/String!
+  returnType: KtFlexibleType:
+    type: kotlin/String!
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -63,14 +71,20 @@ KtFunctionSymbol:
       name: i
       origin: JAVA
       receiverParameter: null
-      returnType: kotlin/Int
+      returnType: KtUsualClassType:
+        type: kotlin/Int
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): JavaClass
+  getDispatchReceiver(): KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -93,12 +107,17 @@ KtFunctionSymbol:
   name: getStringValue
   origin: JAVA
   receiverParameter: null
-  returnType: kotlin/String!
+  returnType: KtFlexibleType:
+    type: kotlin/String!
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): JavaClass
+  getDispatchReceiver(): KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -121,7 +140,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -139,14 +161,20 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -169,12 +197,18 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -197,12 +231,18 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -216,7 +256,10 @@ KtConstructorSymbol:
   isPrimary: true
   origin: JAVA
   receiverParameter: null
-  returnType: JavaClass
+  returnType: KtUsualClassType:
+    type: JavaClass
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

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

@@ -17,7 +17,9 @@ KtFunctionSymbol:
   name: invoke
   origin: LIBRARY
   receiverParameter: null
-  returnType: R
+  returnType: KtTypeParameterType:
+    type: R
+    annotationsList: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -35,7 +37,9 @@ KtFunctionSymbol:
       name: p1
       origin: LIBRARY
       receiverParameter: null
-      returnType: P1
+      returnType: KtTypeParameterType:
+        type: P1
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
@@ -54,14 +58,29 @@ KtFunctionSymbol:
       name: p2
       origin: LIBRARY
       receiverParameter: null
-      returnType: P2
+      returnType: KtTypeParameterType:
+        type: P2
+        annotationsList: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Function2<P1, P2, R>
+  getDispatchReceiver(): KtFunctionalType:
+    type: kotlin/Function2<P1, P2, R>
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        type: P1
+        annotationsList: []
+      KtTypeParameterType:
+        type: P2
+        annotationsList: []
+      KtTypeParameterType:
+        type: R
+        annotationsList: []
+    ]
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -84,7 +103,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -102,14 +124,20 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -132,12 +160,18 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -160,11 +194,17 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null

analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/customSerlializable.txt

@@ -17,7 +17,10 @@ KtFunctionSymbol:
   name: serializeFirstTarget
   origin: PLUGIN
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -35,14 +38,20 @@ KtFunctionSymbol:
       name: x
       origin: PLUGIN
       receiverParameter: null
-      returnType: test/FirstTarget
+      returnType: KtUsualClassType:
+        type: test/FirstTarget
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): test/Serializer
+  getDispatchReceiver(): KtUsualClassType:
+    type: test/Serializer
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -65,7 +74,10 @@ KtFunctionSymbol:
   name: serializeSecondTarget
   origin: PLUGIN
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -83,14 +95,20 @@ KtFunctionSymbol:
       name: x
       origin: PLUGIN
       receiverParameter: null
-      returnType: test/SecondTarget
+      returnType: KtUsualClassType:
+        type: test/SecondTarget
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): test/Serializer
+  getDispatchReceiver(): KtUsualClassType:
+    type: test/Serializer
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -113,7 +131,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -131,14 +152,20 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -161,12 +188,18 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -189,12 +222,18 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -208,7 +247,10 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
-  returnType: test/Serializer
+  returnType: KtUsualClassType:
+    type: test/Serializer
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/generatedCompanionWithFoo.txt

@@ -17,12 +17,18 @@ KtFunctionSymbol:
   name: foo
   origin: PLUGIN
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): test/WithGeneratedCompanion.Companion
+  getDispatchReceiver(): KtUsualClassType:
+    type: test/WithGeneratedCompanion.Companion
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -45,7 +51,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -63,14 +72,20 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -93,12 +108,18 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -121,12 +142,18 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -140,10 +167,13 @@ KtConstructorSymbol:
   isPrimary: true
   origin: PLUGIN
   receiverParameter: null
-  returnType: test/WithGeneratedCompanion.Companion
+  returnType: KtUsualClassType:
+    type: test/WithGeneratedCompanion.Companion
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Private
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/scopes/memberScopeByFqName/withTestCompilerPluginEnabled/nestedClassAndMaterializeMember.txt

@@ -17,12 +17,18 @@ KtFunctionSymbol:
   name: materialize
   origin: PLUGIN
   receiverParameter: null
-  returnType: test/MyClass
+  returnType: KtUsualClassType:
+    type: test/MyClass
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): test/MyClass
+  getDispatchReceiver(): KtUsualClassType:
+    type: test/MyClass
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
@@ -45,7 +51,10 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -63,14 +72,20 @@ KtFunctionSymbol:
       name: other
       origin: LIBRARY
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
       deprecationStatus: null
   ]
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -93,12 +108,18 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/Int
+  returnType: KtUsualClassType:
+    type: kotlin/Int
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -121,12 +142,18 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverParameter: null
-  returnType: kotlin/String
+  returnType: KtUsualClassType:
+    type: kotlin/String
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
-  getDispatchReceiver(): kotlin/Any
+  getDispatchReceiver(): KtUsualClassType:
+    type: kotlin/Any
+    annotationsList: []
+    ownTypeArguments: []
   getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
   deprecationStatus: null
 
@@ -145,7 +172,10 @@ KtNamedClassOrObjectSymbol:
   name: Nested
   origin: PLUGIN
   superTypes: [
-    kotlin/Any
+    KtUsualClassType:
+      type: kotlin/Any
+      annotationsList: []
+      ownTypeArguments: []
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -164,7 +194,10 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
-  returnType: test/MyClass
+  returnType: KtUsualClassType:
+    type: test/MyClass
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedParameterType.descriptors.txt

@@ -17,7 +17,10 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -35,7 +38,10 @@ KtFunctionSymbol:
       name: param
       origin: SOURCE
       receiverParameter: null
-      returnType: SecondAlias
+      returnType: KtUsualClassType:
+        type: SecondAlias
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedParameterType.txt

@@ -17,7 +17,10 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -35,7 +38,10 @@ KtFunctionSymbol:
       name: param
       origin: SOURCE
       receiverParameter: null
-      returnType: Base
+      returnType: KtUsualClassType:
+        type: Base
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedReturnType.descriptors.txt

@@ -17,7 +17,10 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverParameter: null
-  returnType: SecondAlias
+  returnType: KtUsualClassType:
+    type: SecondAlias
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedReturnType.txt

@@ -17,7 +17,10 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverParameter: null
-  returnType: Base
+  returnType: KtUsualClassType:
+    type: Base
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/booleanConstReferenceInImplies.txt

@@ -30,10 +30,13 @@ KtFunctionSymbol:
   name: booleanConstReferenceInImplies
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: []
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/booleanExprContract.txt

@@ -33,7 +33,10 @@ KtFunctionSymbol:
                       name: foo
                       origin: SOURCE
                       receiverParameter: null
-                      returnType: kotlin/Any?
+                      returnType: KtUsualClassType:
+                        type: kotlin/Any?
+                        annotationsList: []
+                        ownTypeArguments: []
                       symbolKind: LOCAL
                       typeParameters: []
                       getContainingModule: KtSourceModule "Sources of main"
@@ -58,7 +61,10 @@ KtFunctionSymbol:
                       name: bar
                       origin: SOURCE
                       receiverParameter: null
-                      returnType: kotlin/Any?
+                      returnType: KtUsualClassType:
+                        type: kotlin/Any?
+                        annotationsList: []
+                        ownTypeArguments: []
                       symbolKind: LOCAL
                       typeParameters: []
                       getContainingModule: KtSourceModule "Sources of main"
@@ -80,7 +86,10 @@ KtFunctionSymbol:
   name: boolenExprContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -98,7 +107,10 @@ KtFunctionSymbol:
       name: foo
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -117,7 +129,10 @@ KtFunctionSymbol:
       name: bar
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -125,4 +140,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/callsInPlaceAtLeastOnceContract.txt

@@ -24,7 +24,15 @@ KtFunctionSymbol:
               name: block
               origin: SOURCE
               receiverParameter: null
-              returnType: kotlin/Function0<kotlin/Unit>
+              returnType: KtFunctionalType:
+                type: kotlin/Function0<kotlin/Unit>
+                annotationsList: []
+                ownTypeArguments: [
+                  KtUsualClassType:
+                    type: kotlin/Unit
+                    annotationsList: []
+                    ownTypeArguments: []
+                ]
               symbolKind: LOCAL
               typeParameters: []
               getContainingModule: KtSourceModule "Sources of main"
@@ -45,7 +53,10 @@ KtFunctionSymbol:
   name: atLeastOnceContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -63,7 +74,15 @@ KtFunctionSymbol:
       name: block
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Function0<kotlin/Unit>
+      returnType: KtFunctionalType:
+        type: kotlin/Function0<kotlin/Unit>
+        annotationsList: []
+        ownTypeArguments: [
+          KtUsualClassType:
+            type: kotlin/Unit
+            annotationsList: []
+            ownTypeArguments: []
+        ]
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -71,4 +90,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/callsInPlaceAtMostOnceContract.txt

@@ -24,7 +24,15 @@ KtFunctionSymbol:
               name: block
               origin: SOURCE
               receiverParameter: null
-              returnType: kotlin/Function0<kotlin/Unit>
+              returnType: KtFunctionalType:
+                type: kotlin/Function0<kotlin/Unit>
+                annotationsList: []
+                ownTypeArguments: [
+                  KtUsualClassType:
+                    type: kotlin/Unit
+                    annotationsList: []
+                    ownTypeArguments: []
+                ]
               symbolKind: LOCAL
               typeParameters: []
               getContainingModule: KtSourceModule "Sources of main"
@@ -45,7 +53,10 @@ KtFunctionSymbol:
   name: atMostOnceContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -63,7 +74,15 @@ KtFunctionSymbol:
       name: block
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Function0<kotlin/Unit>
+      returnType: KtFunctionalType:
+        type: kotlin/Function0<kotlin/Unit>
+        annotationsList: []
+        ownTypeArguments: [
+          KtUsualClassType:
+            type: kotlin/Unit
+            annotationsList: []
+            ownTypeArguments: []
+        ]
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -71,4 +90,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/callsInPlaceExactlyOnceContract.txt

@@ -24,7 +24,15 @@ KtFunctionSymbol:
               name: block
               origin: SOURCE
               receiverParameter: null
-              returnType: kotlin/Function0<kotlin/Unit>
+              returnType: KtFunctionalType:
+                type: kotlin/Function0<kotlin/Unit>
+                annotationsList: []
+                ownTypeArguments: [
+                  KtUsualClassType:
+                    type: kotlin/Unit
+                    annotationsList: []
+                    ownTypeArguments: []
+                ]
               symbolKind: LOCAL
               typeParameters: []
               getContainingModule: KtSourceModule "Sources of main"
@@ -45,7 +53,10 @@ KtFunctionSymbol:
   name: exactlyOnceContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -63,7 +74,15 @@ KtFunctionSymbol:
       name: block
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Function0<kotlin/Unit>
+      returnType: KtFunctionalType:
+        type: kotlin/Function0<kotlin/Unit>
+        annotationsList: []
+        ownTypeArguments: [
+          KtUsualClassType:
+            type: kotlin/Unit
+            annotationsList: []
+            ownTypeArguments: []
+        ]
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -71,4 +90,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/callsInPlaceUnknownContract.txt

@@ -24,7 +24,15 @@ KtFunctionSymbol:
               name: block
               origin: SOURCE
               receiverParameter: null
-              returnType: kotlin/Function0<kotlin/Unit>
+              returnType: KtFunctionalType:
+                type: kotlin/Function0<kotlin/Unit>
+                annotationsList: []
+                ownTypeArguments: [
+                  KtUsualClassType:
+                    type: kotlin/Unit
+                    annotationsList: []
+                    ownTypeArguments: []
+                ]
               symbolKind: LOCAL
               typeParameters: []
               getContainingModule: KtSourceModule "Sources of main"
@@ -45,7 +53,10 @@ KtFunctionSymbol:
   name: unknownContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -63,7 +74,15 @@ KtFunctionSymbol:
       name: block
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Function0<kotlin/Unit>
+      returnType: KtFunctionalType:
+        type: kotlin/Function0<kotlin/Unit>
+        annotationsList: []
+        ownTypeArguments: [
+          KtUsualClassType:
+            type: kotlin/Unit
+            annotationsList: []
+            ownTypeArguments: []
+        ]
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -71,4 +90,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/invalidContractParameterPassedToReturns.txt

@@ -20,7 +20,10 @@ KtFunctionSymbol:
   name: invalidContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -38,7 +41,10 @@ KtFunctionSymbol:
       name: foo
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Any
+      returnType: KtUsualClassType:
+        type: kotlin/Any
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -57,7 +63,10 @@ KtFunctionSymbol:
       name: bar
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Boolean
+      returnType: KtUsualClassType:
+        type: kotlin/Boolean
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -65,4 +74,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/isInstancePredicateContract.txt

@@ -28,13 +28,19 @@ KtFunctionSymbol:
                   name: value
                   origin: SOURCE
                   receiverParameter: null
-                  returnType: kotlin/Any
+                  returnType: KtUsualClassType:
+                    type: kotlin/Any
+                    annotationsList: []
+                    ownTypeArguments: []
                   symbolKind: LOCAL
                   typeParameters: []
                   getContainingModule: KtSourceModule "Sources of main"
                   deprecationStatus: null
           type:
-            Foo
+            KtUsualClassType:
+              type: Foo
+              annotationsList: []
+              ownTypeArguments: []
           isNegated: false
   ]
   hasStableParameterNames: true
@@ -51,7 +57,10 @@ KtFunctionSymbol:
   name: isInstancePredicateContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -69,7 +78,10 @@ KtFunctionSymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Any
+      returnType: KtUsualClassType:
+        type: kotlin/Any
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -77,4 +89,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/logicalNotContract.txt

@@ -28,7 +28,10 @@ KtFunctionSymbol:
                   name: value
                   origin: SOURCE
                   receiverParameter: null
-                  returnType: kotlin/Boolean
+                  returnType: KtUsualClassType:
+                    type: kotlin/Boolean
+                    annotationsList: []
+                    ownTypeArguments: []
                   symbolKind: LOCAL
                   typeParameters: []
                   getContainingModule: KtSourceModule "Sources of main"
@@ -48,7 +51,10 @@ KtFunctionSymbol:
   name: logicalNotContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -66,7 +72,10 @@ KtFunctionSymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Boolean
+      returnType: KtUsualClassType:
+        type: kotlin/Boolean
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -74,4 +83,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/referenceBooleanReceiverInContract.txt

@@ -16,7 +16,10 @@ KtFunctionSymbol:
               annotationsList: []
               origin: SOURCE
               owningCallableSymbol: KtFunctionSymbol(/referenceReceiverInContract)
-              type: kotlin/Boolean
+              type: KtUsualClassType:
+                type: kotlin/Boolean
+                annotationsList: []
+                ownTypeArguments: []
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
   ]
@@ -37,13 +40,19 @@ KtFunctionSymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtFunctionSymbol(/referenceReceiverInContract)
-    type: kotlin/Boolean
+    type: KtUsualClassType:
+      type: kotlin/Boolean
+      annotationsList: []
+      ownTypeArguments: []
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: []
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/referenceReceiverInContract.txt

@@ -14,7 +14,15 @@ KtFunctionSymbol:
               annotationsList: []
               origin: SOURCE
               owningCallableSymbol: KtFunctionSymbol(/referenceReceiverInContract)
-              type: kotlin/Function0<kotlin/Unit>
+              type: KtFunctionalType:
+                type: kotlin/Function0<kotlin/Unit>
+                annotationsList: []
+                ownTypeArguments: [
+                  KtUsualClassType:
+                    type: kotlin/Unit
+                    annotationsList: []
+                    ownTypeArguments: []
+                ]
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
       occurrencesRange: EXACTLY_ONCE
@@ -36,13 +44,24 @@ KtFunctionSymbol:
     annotationsList: []
     origin: SOURCE
     owningCallableSymbol: KtFunctionSymbol(/referenceReceiverInContract)
-    type: kotlin/Function0<kotlin/Unit>
+    type: KtFunctionalType:
+      type: kotlin/Function0<kotlin/Unit>
+      annotationsList: []
+      ownTypeArguments: [
+        KtUsualClassType:
+          type: kotlin/Unit
+          annotationsList: []
+          ownTypeArguments: []
+      ]
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: []
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/returnsContract.txt

@@ -26,7 +26,10 @@ KtFunctionSymbol:
               name: value
               origin: SOURCE
               receiverParameter: null
-              returnType: kotlin/Boolean
+              returnType: KtUsualClassType:
+                type: kotlin/Boolean
+                annotationsList: []
+                ownTypeArguments: []
               symbolKind: LOCAL
               typeParameters: []
               getContainingModule: KtSourceModule "Sources of main"
@@ -46,7 +49,10 @@ KtFunctionSymbol:
   name: check
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Unit
+  returnType: KtUsualClassType:
+    type: kotlin/Unit
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -64,7 +70,10 @@ KtFunctionSymbol:
       name: value
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Boolean
+      returnType: KtUsualClassType:
+        type: kotlin/Boolean
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -72,4 +81,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/returnsFalseContract.txt

@@ -31,7 +31,10 @@ KtFunctionSymbol:
                   name: foo
                   origin: SOURCE
                   receiverParameter: null
-                  returnType: kotlin/Any?
+                  returnType: KtUsualClassType:
+                    type: kotlin/Any?
+                    annotationsList: []
+                    ownTypeArguments: []
                   symbolKind: LOCAL
                   typeParameters: []
                   getContainingModule: KtSourceModule "Sources of main"
@@ -52,7 +55,10 @@ KtFunctionSymbol:
   name: returnsFalseContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Boolean
+  returnType: KtUsualClassType:
+    type: kotlin/Boolean
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -70,7 +76,10 @@ KtFunctionSymbol:
       name: foo
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -78,4 +87,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/returnsNotNullContract.txt

@@ -28,7 +28,10 @@ KtFunctionSymbol:
                   name: foo
                   origin: SOURCE
                   receiverParameter: null
-                  returnType: kotlin/Any?
+                  returnType: KtUsualClassType:
+                    type: kotlin/Any?
+                    annotationsList: []
+                    ownTypeArguments: []
                   symbolKind: LOCAL
                   typeParameters: []
                   getContainingModule: KtSourceModule "Sources of main"
@@ -49,7 +52,10 @@ KtFunctionSymbol:
   name: returnsNotNullContract
   origin: SOURCE
   receiverParameter: null
-  returnType: kotlin/Any?
+  returnType: KtUsualClassType:
+    type: kotlin/Any?
+    annotationsList: []
+    ownTypeArguments: []
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
@@ -67,7 +73,10 @@ KtFunctionSymbol:
       name: foo
       origin: SOURCE
       receiverParameter: null
-      returnType: kotlin/Any?
+      returnType: KtUsualClassType:
+        type: kotlin/Any?
+        annotationsList: []
+        ownTypeArguments: []
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"
@@ -75,4 +84,4 @@ KtFunctionSymbol:
   ]
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null