[AA] DebugSymbolRenderer: move annotations and type arguments renderer befor type to avoid resolve race

^KT-56046

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

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

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

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

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

@@ -62,9 +62,9 @@ KtSuccessCallInfo:
           origin: SOURCE
           superTypes: [
             KtUsualClassType:
-              type: kotlin/Any
               annotationsList: []
               ownTypeArguments: []
+              type: kotlin/Any
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []

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

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

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

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

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

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

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

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

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

@@ -55,9 +55,9 @@ KtSuccessCallInfo:
           origin: SOURCE
           superTypes: [
             KtUsualClassType:
-              type: kotlin/Any
               annotationsList: []
               ownTypeArguments: []
+              type: kotlin/Any
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []

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

@@ -55,9 +55,9 @@ KtSuccessCallInfo:
           origin: SOURCE
           superTypes: [
             KtUsualClassType:
-              type: kotlin/Any
               annotationsList: []
               ownTypeArguments: []
+              type: kotlin/Any
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []

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

@@ -19,9 +19,9 @@ KtSuccessCallInfo:
           origin: SOURCE
           superTypes: [
             KtUsualClassType:
-              type: AbstractModule
               annotationsList: []
               ownTypeArguments: []
+              type: AbstractModule
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []

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

@@ -19,9 +19,9 @@ KtSuccessCallInfo:
           origin: SOURCE
           superTypes: [
             KtUsualClassType:
-              type: AbstractModule
               annotationsList: []
               ownTypeArguments: []
+              type: AbstractModule
           ]
           symbolKind: TOP_LEVEL
           typeParameters: []

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

@@ -8,9 +8,9 @@ KtSuccessCallInfo:
             origin: SOURCE
             owningCallableSymbol: KtFunctionSymbol(/test)
             type: KtUsualClassType:
-              type: kotlin/Any
               annotationsList: []
               ownTypeArguments: []
+              type: kotlin/Any
           type = kotlin.Any
         type = kotlin.String
       extensionReceiver = null

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

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

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

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

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

@@ -8,14 +8,14 @@ KtApplicableCallCandidateInfo:
           origin: SOURCE
           owningCallableSymbol: KtAnonymousFunctionSymbol(<local>/<no name provided>)
           type: KtUsualClassType:
-            type: test/Target<kotlin/String>
             annotationsList: []
             ownTypeArguments: [
               KtUsualClassType:
-                type: kotlin/String
                 annotationsList: []
                 ownTypeArguments: []
+                type: kotlin/String
             ]
+            type: test/Target<kotlin/String>
         type = test.Target<Stub (chain inference): TypeVariable(T)>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,15 +3,15 @@ expression: { a: Int ->
     a + b
 }
 expected type: KtFunctionalType:
-  type: kotlin/Function1<kotlin/Int, kotlin/Int>
   annotationsList: []
   ownTypeArguments: [
     KtUsualClassType:
-      type: kotlin/Int
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Int
     KtUsualClassType:
-      type: kotlin/Int
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Int
   ]
+  type: kotlin/Function1<kotlin/Int, kotlin/Int>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -81,24 +81,24 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/Map<X, kotlin/collections/Map<Y, O>>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: X
         annotationsList: []
+        type: X
       KtUsualClassType:
-        type: kotlin/collections/Map<Y, O>
         annotationsList: []
         ownTypeArguments: [
           KtTypeParameterType:
+            annotationsList: []
             type: Y
-            annotationsList: []
           KtTypeParameterType:
-            type: O
             annotationsList: []
+            type: O
         ]
+        type: kotlin/collections/Map<Y, O>
     ]
+    type: kotlin/collections/Map<X, kotlin/collections/Map<Y, O>>
   symbolKind: CLASS_MEMBER
   typeParameters: [
     KtTypeParameterSymbol(Y)
@@ -119,8 +119,8 @@ KtFunctionSymbol:
       origin: SOURCE
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: X
         annotationsList: []
+        type: X
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -138,8 +138,8 @@ KtFunctionSymbol:
       origin: SOURCE
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: Y
         annotationsList: []
+        type: Y
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -162,16 +162,16 @@ KtKotlinPropertySymbol:
     origin: SOURCE
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/collections/Map<X, O>
       annotationsList: []
       ownTypeArguments: [
         KtTypeParameterType:
+          annotationsList: []
           type: X
-          annotationsList: []
         KtTypeParameterType:
-          type: O
           annotationsList: []
+          type: O
       ]
+      type: kotlin/collections/Map<X, O>
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -193,16 +193,16 @@ KtKotlinPropertySymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/Map<X, O>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
+        annotationsList: []
         type: X
-        annotationsList: []
       KtTypeParameterType:
-        type: O
         annotationsList: []
+        type: O
     ]
+    type: kotlin/collections/Map<X, O>
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -227,8 +227,8 @@ KtFunctionSymbol:
   origin: SUBSTITUTION_OVERRIDE
   receiverParameter: null
   returnType: KtTypeParameterType:
-    type: O
     annotationsList: []
+    type: O
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -253,9 +253,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -274,9 +274,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Any?
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -301,9 +301,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -328,9 +328,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/String
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/String
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

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

@@ -171,9 +171,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -192,8 +192,8 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -218,9 +218,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -239,13 +239,13 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/collections/Collection<E>
         annotationsList: []
         ownTypeArguments: [
           KtTypeParameterType:
-            type: E
             annotationsList: []
+            type: E
         ]
+        type: kotlin/collections/Collection<E>
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -270,8 +270,8 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtTypeParameterType:
-    type: E
     annotationsList: []
+    type: E
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -290,9 +290,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Int
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -317,9 +317,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -338,8 +338,8 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -364,9 +364,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -391,13 +391,13 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/Iterator<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: kotlin/collections/Iterator<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -422,9 +422,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -443,8 +443,8 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -469,13 +469,13 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/ListIterator<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: kotlin/collections/ListIterator<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -500,13 +500,13 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/ListIterator<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: kotlin/collections/ListIterator<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -525,9 +525,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Int
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -552,13 +552,13 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/List<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: kotlin/collections/List<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -577,9 +577,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Int
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -597,9 +597,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Int
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -622,9 +622,9 @@ KtKotlinPropertySymbol:
     origin: LIBRARY
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/Int
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -646,9 +646,9 @@ KtKotlinPropertySymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -673,9 +673,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -694,9 +694,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Any?
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -721,9 +721,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -748,9 +748,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/String
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/String
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

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

@@ -75,24 +75,24 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/Map<X, kotlin/collections/Map<Y, O>>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: X
         annotationsList: []
+        type: X
       KtUsualClassType:
-        type: kotlin/collections/Map<Y, O>
         annotationsList: []
         ownTypeArguments: [
           KtTypeParameterType:
+            annotationsList: []
             type: Y
-            annotationsList: []
           KtTypeParameterType:
-            type: O
             annotationsList: []
+            type: O
         ]
+        type: kotlin/collections/Map<Y, O>
     ]
+    type: kotlin/collections/Map<X, kotlin/collections/Map<Y, O>>
   symbolKind: CLASS_MEMBER
   typeParameters: [
     KtTypeParameterSymbol(Y)
@@ -113,8 +113,8 @@ KtFunctionSymbol:
       origin: SOURCE
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: X
         annotationsList: []
+        type: X
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -132,8 +132,8 @@ KtFunctionSymbol:
       origin: SOURCE
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: Y
         annotationsList: []
+        type: Y
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -156,16 +156,16 @@ KtKotlinPropertySymbol:
     origin: SOURCE
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/collections/Map<X, O>
       annotationsList: []
       ownTypeArguments: [
         KtTypeParameterType:
+          annotationsList: []
           type: X
-          annotationsList: []
         KtTypeParameterType:
-          type: O
           annotationsList: []
+          type: O
       ]
+      type: kotlin/collections/Map<X, O>
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -187,16 +187,16 @@ KtKotlinPropertySymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/Map<X, O>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
+        annotationsList: []
         type: X
-        annotationsList: []
       KtTypeParameterType:
-        type: O
         annotationsList: []
+        type: O
     ]
+    type: kotlin/collections/Map<X, O>
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -221,9 +221,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -242,9 +242,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Any?
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -269,9 +269,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -296,9 +296,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/String
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/String
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

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

@@ -75,16 +75,16 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/Map<X, Y>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
+        annotationsList: []
         type: X
-        annotationsList: []
       KtTypeParameterType:
-        type: Y
         annotationsList: []
+        type: Y
     ]
+    type: kotlin/collections/Map<X, Y>
   symbolKind: CLASS_MEMBER
   typeParameters: [
     KtTypeParameterSymbol(Y)
@@ -105,8 +105,8 @@ KtFunctionSymbol:
       origin: SOURCE
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: X
         annotationsList: []
+        type: X
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -124,8 +124,8 @@ KtFunctionSymbol:
       origin: SOURCE
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: Y
         annotationsList: []
+        type: Y
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -148,17 +148,17 @@ KtKotlinPropertySymbol:
     origin: SOURCE
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/collections/Map<X, kotlin/String>
       annotationsList: []
       ownTypeArguments: [
         KtTypeParameterType:
-          type: X
           annotationsList: []
+          type: X
         KtUsualClassType:
-          type: kotlin/String
           annotationsList: []
           ownTypeArguments: []
+          type: kotlin/String
       ]
+      type: kotlin/collections/Map<X, kotlin/String>
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -180,17 +180,17 @@ KtKotlinPropertySymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/Map<X, kotlin/String>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: X
         annotationsList: []
+        type: X
       KtUsualClassType:
-        type: kotlin/String
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/String
     ]
+    type: kotlin/collections/Map<X, kotlin/String>
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -215,9 +215,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -236,9 +236,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Any?
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -263,9 +263,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -290,9 +290,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/String
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/String
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

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

@@ -171,9 +171,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -192,8 +192,8 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -218,9 +218,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -239,13 +239,13 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/collections/Collection<E>
         annotationsList: []
         ownTypeArguments: [
           KtTypeParameterType:
-            type: E
             annotationsList: []
+            type: E
         ]
+        type: kotlin/collections/Collection<E>
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -270,8 +270,8 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtTypeParameterType:
-    type: E
     annotationsList: []
+    type: E
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -290,9 +290,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Int
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -317,9 +317,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -338,8 +338,8 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -364,9 +364,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -391,13 +391,13 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/Iterator<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: kotlin/collections/Iterator<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -422,9 +422,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -443,8 +443,8 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -469,13 +469,13 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/ListIterator<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: kotlin/collections/ListIterator<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -500,13 +500,13 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/ListIterator<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: kotlin/collections/ListIterator<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -525,9 +525,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Int
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -552,13 +552,13 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/collections/List<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: kotlin/collections/List<E>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -577,9 +577,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Int
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
     KtValueParameterSymbol:
@@ -597,9 +597,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Int
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -622,9 +622,9 @@ KtKotlinPropertySymbol:
     origin: LIBRARY
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/Int
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -646,9 +646,9 @@ KtKotlinPropertySymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
@@ -673,9 +673,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -694,9 +694,9 @@ KtFunctionSymbol:
       origin: LIBRARY
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/Any?
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
   ]
@@ -721,9 +721,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -748,9 +748,9 @@ KtFunctionSymbol:
   origin: LIBRARY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/String
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/String
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []