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

^KT-56046

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

@@ -8,9 +8,9 @@ KtBackingFieldSymbol:
   owningProperty: KtKotlinPropertySymbol(/x)
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
   getContainingModule: KtSourceModule "Sources of main"

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

@@ -13,9 +13,9 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
   getContainingModule: KtSourceModule "Sources of main"

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

@@ -9,13 +9,13 @@ KtConstructorSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: java/util/ArrayList<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: java/util/ArrayList<E>
   symbolKind: CLASS_MEMBER
   typeParameters: [
     KtTypeParameterSymbol(E)
@@ -36,8 +36,8 @@ KtConstructorSymbol:
       origin: JAVA
       receiverParameter: null
       returnType: KtFlexibleType:
-        type: (kotlin/collections/MutableCollection<out E!>..kotlin/collections/Collection<E!>?)
         annotationsList: []
+        type: (kotlin/collections/MutableCollection<out E!>..kotlin/collections/Collection<E!>?)
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: Could not render due to java.util.NoSuchElementException: Collection contains no element matching the predicate.

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

@@ -9,13 +9,13 @@ KtConstructorSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: java/util/ArrayList<E>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: E
         annotationsList: []
+        type: E
     ]
+    type: java/util/ArrayList<E>
   symbolKind: CLASS_MEMBER
   typeParameters: [
     KtTypeParameterSymbol(E)
@@ -36,8 +36,8 @@ KtConstructorSymbol:
       origin: JAVA
       receiverParameter: null
       returnType: KtFlexibleType:
-        type: ft<kotlin/collections/MutableCollection<out ft<E & Any, E?>>, kotlin/collections/Collection<out ft<E & Any, E?>>?>
         annotationsList: []
+        type: ft<kotlin/collections/MutableCollection<out ft<E & Any, E?>>, kotlin/collections/Collection<out ft<E & Any, E?>>?>
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSdkModule "SDK jdk"

analysis/analysis-api/testData/symbols/symbolByReference/enumEntries.descriptors.txt

@@ -16,14 +16,14 @@ KtKotlinPropertySymbol:
     origin: SOURCE_MEMBER_GENERATED
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/enums/EnumEntries<MyKotlinEnum>
       annotationsList: []
       ownTypeArguments: [
         KtUsualClassType:
-          type: MyKotlinEnum
           annotationsList: []
           ownTypeArguments: []
+          type: MyKotlinEnum
       ]
+      type: kotlin/enums/EnumEntries<MyKotlinEnum>
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -47,14 +47,14 @@ KtKotlinPropertySymbol:
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/enums/EnumEntries<MyKotlinEnum>
     annotationsList: []
     ownTypeArguments: [
       KtUsualClassType:
-        type: MyKotlinEnum
         annotationsList: []
         ownTypeArguments: []
+        type: MyKotlinEnum
     ]
+    type: kotlin/enums/EnumEntries<MyKotlinEnum>
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []

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

@@ -16,14 +16,14 @@ KtKotlinPropertySymbol:
     origin: SOURCE_MEMBER_GENERATED
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/enums/EnumEntries<MyKotlinEnum>
       annotationsList: []
       ownTypeArguments: [
         KtUsualClassType:
-          type: MyKotlinEnum
           annotationsList: []
           ownTypeArguments: []
+          type: MyKotlinEnum
       ]
+      type: kotlin/enums/EnumEntries<MyKotlinEnum>
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -47,14 +47,14 @@ KtKotlinPropertySymbol:
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/enums/EnumEntries<MyKotlinEnum>
     annotationsList: []
     ownTypeArguments: [
       KtUsualClassType:
-        type: MyKotlinEnum
         annotationsList: []
         ownTypeArguments: []
+        type: MyKotlinEnum
     ]
+    type: kotlin/enums/EnumEntries<MyKotlinEnum>
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/enumValueOf.descriptors.txt

@@ -18,9 +18,9 @@ KtFunctionSymbol:
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: MyKotlinEnum
     annotationsList: []
     ownTypeArguments: []
+    type: MyKotlinEnum
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -39,9 +39,9 @@ KtFunctionSymbol:
       origin: SOURCE
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/String
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/String
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"

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

@@ -18,9 +18,9 @@ KtFunctionSymbol:
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: MyKotlinEnum
     annotationsList: []
     ownTypeArguments: []
+    type: MyKotlinEnum
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -39,9 +39,9 @@ KtFunctionSymbol:
       origin: SOURCE_MEMBER_GENERATED
       receiverParameter: null
       returnType: KtUsualClassType:
-        type: kotlin/String
         annotationsList: []
         ownTypeArguments: []
+        type: kotlin/String
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"

analysis/analysis-api/testData/symbols/symbolByReference/enumValues.descriptors.txt

@@ -18,14 +18,14 @@ KtFunctionSymbol:
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Array<MyKotlinEnum>
     annotationsList: []
     ownTypeArguments: [
       KtUsualClassType:
-        type: MyKotlinEnum
         annotationsList: []
         ownTypeArguments: []
+        type: MyKotlinEnum
     ]
+    type: kotlin/Array<MyKotlinEnum>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

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

@@ -18,14 +18,14 @@ KtFunctionSymbol:
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Array<MyKotlinEnum>
     annotationsList: []
     ownTypeArguments: [
       KtUsualClassType:
-        type: MyKotlinEnum
         annotationsList: []
         ownTypeArguments: []
+        type: MyKotlinEnum
     ]
+    type: kotlin/Array<MyKotlinEnum>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

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

@@ -13,9 +13,9 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
   getContainingModule: KtSourceModule "Sources of main"

analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.txt

@@ -24,18 +24,18 @@ KtFunctionSymbol:
     origin: SOURCE
     owningCallableSymbol: KtFunctionSymbol(/foo)
     type: KtUsualClassType:
-      type: @R|ReceiverTypeAnnotation|()  kotlin/Int
       annotationsList: [
         ReceiverTypeAnnotation()
           psi: KtAnnotationEntry
       ]
       ownTypeArguments: []
+      type: @R|ReceiverTypeAnnotation|()  kotlin/Int
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
-    type: kotlin/Unit
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Unit
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.pretty.txt

@@ -6,9 +6,9 @@ KtReceiverParameterSymbol:
   origin: SOURCE
   owningCallableSymbol: KtFunctionSymbol(/foo)
   type: KtUsualClassType:
-    type: @R|ReceiverTypeAnnotation|()  kotlin/Int
     annotationsList: [
       ReceiverTypeAnnotation()
         psi: KtAnnotationEntry
     ]
-    ownTypeArguments: []
+    ownTypeArguments: []
+    type: @R|ReceiverTypeAnnotation|()  kotlin/Int

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

@@ -6,11 +6,11 @@ KtReceiverParameterSymbol:
   origin: SOURCE
   owningCallableSymbol: KtFunctionSymbol(/foo)
   type: KtUsualClassType:
-    type: @R|ReceiverTypeAnnotation|()  kotlin/Int
     annotationsList: [
       ReceiverTypeAnnotation()
         psi: KtAnnotationEntry
     ]
     ownTypeArguments: []
+    type: @R|ReceiverTypeAnnotation|()  kotlin/Int
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

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

@@ -18,15 +18,15 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtTypeParameterType:
-    type: Outer?
     annotationsList: []
+    type: Outer?
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: test/Base<Outer>
     annotationsList: []
     ownTypeArguments: []
+    type: test/Base<Outer>
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/genericFromOuterClassInInnerClass.descriptors.txt

@@ -18,22 +18,22 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtTypeParameterType:
-    type: Outer?
     annotationsList: []
+    type: Outer?
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: test/TopLevel<Outer>.test/TopLevel.Base<T>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
+        annotationsList: []
         type: T
-        annotationsList: []
       KtTypeParameterType:
-        type: Outer
         annotationsList: []
+        type: Outer
     ]
+    type: test/TopLevel<Outer>.test/TopLevel.Base<T>
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

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

@@ -18,19 +18,19 @@ KtFunctionSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtTypeParameterType:
-    type: Outer?
     annotationsList: []
+    type: Outer?
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: test/TopLevel.Base<T, Outer>
     annotationsList: []
     ownTypeArguments: [
       KtTypeParameterType:
-        type: T
         annotationsList: []
+        type: T
     ]
+    type: test/TopLevel.Base<T, Outer>
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

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

@@ -13,9 +13,9 @@ KtValueParameterSymbol:
   origin: SOURCE_MEMBER_GENERATED
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
   getContainingModule: KtSourceModule "Sources of main"

analysis/analysis-api/testData/symbols/symbolByReference/javaClassWithEmptyAnnotationName.descriptors.txt

@@ -17,9 +17,9 @@ KtNamedClassOrObjectSymbol:
   origin: JAVA
   superTypes: [
     KtUsualClassType:
-      type: kotlin/Any
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []

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

@@ -17,9 +17,9 @@ KtNamedClassOrObjectSymbol:
   origin: JAVA
   superTypes: [
     KtUsualClassType:
-      type: kotlin/Any
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Any
   ]
   symbolKind: TOP_LEVEL
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/javaField.descriptors.txt

@@ -10,15 +10,15 @@ KtJavaFieldSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: JavaClass
     annotationsList: []
     ownTypeArguments: []
+    type: JavaClass
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

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

@@ -10,15 +10,15 @@ KtJavaFieldSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: JavaClass
     annotationsList: []
     ownTypeArguments: []
+    type: JavaClass
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/javaFieldWithTypeAnnotation.descriptors.txt

@@ -13,17 +13,17 @@ KtJavaFieldSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtFlexibleType:
-    type: @R|Anno1|()  @R|Anno1|()  kotlin/String!
     annotationsList: [
       Anno1()
         psi: null
     ]
+    type: @R|Anno1|()  @R|Anno1|()  kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: JavaClass
     annotationsList: []
     ownTypeArguments: []
+    type: JavaClass
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

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

@@ -13,17 +13,17 @@ KtJavaFieldSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtFlexibleType:
-    type: @R|Anno1|()  kotlin/String!
     annotationsList: [
       Anno1()
         psi: null
     ]
+    type: @R|Anno1|()  kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: JavaClass
     annotationsList: []
     ownTypeArguments: []
+    type: JavaClass
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

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

@@ -18,16 +18,16 @@ KtFunctionSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Unit
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Unit
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: JavaClass
     annotationsList: []
     ownTypeArguments: []
+    type: JavaClass
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/javaStaticField.descriptors.txt

@@ -10,9 +10,9 @@ KtJavaFieldSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public

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

@@ -10,9 +10,9 @@ KtJavaFieldSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public

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

@@ -18,9 +18,9 @@ KtFunctionSymbol:
   origin: JAVA
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Unit
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Unit
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/javaSyntheticAccessor.descriptors.txt

@@ -19,16 +19,16 @@ KtSyntheticJavaPropertySymbol:
       origin: SOURCE
       owningCallableSymbol: KtSyntheticJavaPropertySymbol(/JavaClass.foo)
       type: KtUsualClassType:
-        type: JavaClass
         annotationsList: []
         ownTypeArguments: []
+        type: JavaClass
       getContainingModule: Could not render due to kotlin.NotImplementedError: An operation is not implemented: org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.KtFe10ReceiverParameterSymbol
 
       deprecationStatus: null
     returnType: KtUsualClassType:
-      type: kotlin/Int
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -56,16 +56,16 @@ KtSyntheticJavaPropertySymbol:
     origin: SOURCE
     owningCallableSymbol: KtSyntheticJavaPropertySymbol(/JavaClass.foo)
     type: KtUsualClassType:
-      type: JavaClass
       annotationsList: []
       ownTypeArguments: []
+      type: JavaClass
     getContainingModule: Could not render due to kotlin.NotImplementedError: An operation is not implemented: org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.KtFe10ReceiverParameterSymbol
 
     deprecationStatus: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []

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

@@ -16,17 +16,17 @@ KtSyntheticJavaPropertySymbol:
     origin: JAVA_SYNTHETIC_PROPERTY
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/Int
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
     getDispatchReceiver(): KtUsualClassType:
-      type: JavaClass
       annotationsList: []
       ownTypeArguments: []
+      type: JavaClass
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -46,17 +46,17 @@ KtSyntheticJavaPropertySymbol:
   origin: JAVA_SYNTHETIC_PROPERTY
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: JavaClass
     annotationsList: []
     ownTypeArguments: []
+    type: JavaClass
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

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

@@ -13,9 +13,9 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
   getContainingModule: KtSourceModule "Sources of main"

analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.descriptors.txt

@@ -16,17 +16,17 @@ KtKotlinPropertySymbol:
     origin: SOURCE
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/Int
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
     getDispatchReceiver(): KtUsualClassType:
-      type: A
       annotationsList: []
       ownTypeArguments: []
+      type: A
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -46,17 +46,17 @@ KtKotlinPropertySymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: A
     annotationsList: []
     ownTypeArguments: []
+    type: A
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

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

@@ -16,17 +16,17 @@ KtKotlinPropertySymbol:
     origin: SOURCE
     receiverParameter: null
     returnType: KtUsualClassType:
-      type: kotlin/Int
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Int
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
     visibility: Public
     getDispatchReceiver(): KtUsualClassType:
-      type: A
       annotationsList: []
       ownTypeArguments: []
+      type: A
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -46,17 +46,17 @@ KtKotlinPropertySymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): KtUsualClassType:
-    type: A
     annotationsList: []
     ownTypeArguments: []
+    type: A
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.txt

@@ -22,18 +22,18 @@ KtKotlinPropertySymbol:
       origin: SOURCE
       owningCallableSymbol: KtKotlinPropertySymbol(/prop)
       type: KtUsualClassType:
-        type: @R|ReceiverTypeAnnotation|()  kotlin/Long
         annotationsList: [
           ReceiverTypeAnnotation()
             psi: KtAnnotationEntry
         ]
         ownTypeArguments: []
+        type: @R|ReceiverTypeAnnotation|()  kotlin/Long
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     returnType: KtUsualClassType:
-      type: kotlin/Boolean
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Boolean
     symbolKind: ACCESSOR
     typeParameters: []
     valueParameters: []
@@ -63,18 +63,18 @@ KtKotlinPropertySymbol:
     origin: SOURCE
     owningCallableSymbol: KtKotlinPropertySymbol(/prop)
     type: KtUsualClassType:
-      type: @R|ReceiverTypeAnnotation|()  kotlin/Long
       annotationsList: [
         ReceiverTypeAnnotation()
           psi: KtAnnotationEntry
       ]
       ownTypeArguments: []
+      type: @R|ReceiverTypeAnnotation|()  kotlin/Long
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
-    type: kotlin/Boolean
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Boolean
   setter: null
   symbolKind: TOP_LEVEL
   typeParameters: []

analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.pretty.txt

@@ -6,9 +6,9 @@ KtReceiverParameterSymbol:
   origin: SOURCE
   owningCallableSymbol: KtKotlinPropertySymbol(/prop)
   type: KtUsualClassType:
-    type: @R|ReceiverTypeAnnotation|()  kotlin/Long
     annotationsList: [
       ReceiverTypeAnnotation()
         psi: KtAnnotationEntry
     ]
-    ownTypeArguments: []
+    ownTypeArguments: []
+    type: @R|ReceiverTypeAnnotation|()  kotlin/Long

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

@@ -6,11 +6,11 @@ KtReceiverParameterSymbol:
   origin: SOURCE
   owningCallableSymbol: KtKotlinPropertySymbol(/prop)
   type: KtUsualClassType:
-    type: @R|ReceiverTypeAnnotation|()  kotlin/Long
     annotationsList: [
       ReceiverTypeAnnotation()
         psi: KtAnnotationEntry
     ]
     ownTypeArguments: []
+    type: @R|ReceiverTypeAnnotation|()  kotlin/Long
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

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

@@ -8,9 +8,9 @@ KtSamConstructorSymbol:
   origin: SAM_CONSTRUCTOR
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: java/lang/Runnable
     annotationsList: []
     ownTypeArguments: []
+    type: java/lang/Runnable
   symbolKind: SAM_CONSTRUCTOR
   typeParameters: []
   valueParameters: [
@@ -29,14 +29,14 @@ KtSamConstructorSymbol:
       origin: SOURCE
       receiverParameter: null
       returnType: KtFunctionalType:
-        type: kotlin/Function0<kotlin/Unit>
         annotationsList: []
         ownTypeArguments: [
           KtUsualClassType:
-            type: kotlin/Unit
             annotationsList: []
             ownTypeArguments: []
+            type: kotlin/Unit
         ]
+        type: kotlin/Function0<kotlin/Unit>
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: Could not render due to kotlin.NotImplementedError: An operation is not implemented: org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.KtFe10DescValueParameterSymbol

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

@@ -8,9 +8,9 @@ KtSamConstructorSymbol:
   origin: SAM_CONSTRUCTOR
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: java/lang/Runnable
     annotationsList: []
     ownTypeArguments: []
+    type: java/lang/Runnable
   symbolKind: SAM_CONSTRUCTOR
   typeParameters: []
   valueParameters: [
@@ -29,14 +29,14 @@ KtSamConstructorSymbol:
       origin: SAM_CONSTRUCTOR
       receiverParameter: null
       returnType: KtFunctionalType:
-        type: kotlin/Function0<kotlin/Unit>
         annotationsList: []
         ownTypeArguments: [
           KtUsualClassType:
-            type: kotlin/Unit
             annotationsList: []
             ownTypeArguments: []
+            type: kotlin/Unit
         ]
+        type: kotlin/Function0<kotlin/Unit>
       symbolKind: LOCAL
       typeParameters: []
       getContainingModule: KtSourceModule "Sources of main"

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

@@ -13,9 +13,9 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
   getContainingModule: KtSourceModule "Sources of main"

analysis/analysis-api/testData/symbols/symbolByReference/typeAnnotationOnBackingField.descriptors.txt

@@ -8,7 +8,6 @@ KtBackingFieldSymbol:
   owningProperty: KtKotlinPropertySymbol(/foo)
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: @R|Anno3|() @R|Anno2|() @R|Anno1|()  @R|Anno3|()  SecondTypeAlias
     annotationsList: [
       Anno3()
         psi: KtAnnotationEntry
@@ -18,6 +17,7 @@ KtBackingFieldSymbol:
         psi: KtAnnotationEntry
     ]
     ownTypeArguments: []
+    type: @R|Anno3|() @R|Anno2|() @R|Anno1|()  @R|Anno3|()  SecondTypeAlias
   symbolKind: LOCAL
   typeParameters: []
   getContainingModule: KtSourceModule "Sources of main"

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

@@ -8,7 +8,6 @@ KtBackingFieldSymbol:
   owningProperty: KtKotlinPropertySymbol(/foo)
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: @R|Anno1|()  @R|Anno2|()  @R|Anno3|()  BaseInterface
     annotationsList: [
       Anno1()
         psi: KtAnnotationEntry
@@ -18,6 +17,7 @@ KtBackingFieldSymbol:
         psi: KtAnnotationEntry
     ]
     ownTypeArguments: []
+    type: @R|Anno1|()  @R|Anno2|()  @R|Anno3|()  BaseInterface
   symbolKind: LOCAL
   typeParameters: []
   getContainingModule: KtSourceModule "Sources of main"

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

@@ -13,9 +13,9 @@ KtValueParameterSymbol:
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
-    type: kotlin/Int
     annotationsList: []
     ownTypeArguments: []
+    type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
   getContainingModule: KtSourceModule "Sources of main"

analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.txt

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

analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.txt

@@ -14,9 +14,9 @@ KtNamedClassOrObjectSymbol:
   origin: PLUGIN
   superTypes: [
     KtUsualClassType:
-      type: kotlin/Any
       annotationsList: []
       ownTypeArguments: []
+      type: kotlin/Any
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: []