Analysis API: rename KtCallableSymbol.type -> returnType

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescAnonymousFunctionSymbol.kt

@@ -33,7 +33,7 @@ internal class KtFe10DescAnonymousFunctionSymbol(
     override val hasStableParameterNames: Boolean
         get() = withValidityAssertion { descriptor.ktHasStableParameterNames }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtType(analysisContext) }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescConstructorSymbol.kt

@@ -35,7 +35,7 @@ internal class KtFe10DescConstructorSymbol(
     override val hasStableParameterNames: Boolean
         get() = withValidityAssertion { descriptor.ktHasStableParameterNames }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.returnType.toKtType(analysisContext) }
 
     override val typeParameters: List<KtTypeParameterSymbol>

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertyGetterSymbol.kt

@@ -55,7 +55,7 @@ class KtFe10DescDefaultPropertyGetterSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { propertyDescriptor.getterCallableIdIfNotLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { propertyDescriptor.type.toKtType(analysisContext) }
 
     override val origin: KtSymbolOrigin

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertySetterSymbol.kt

@@ -56,7 +56,7 @@ class KtFe10DescDefaultPropertySetterSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { propertyDescriptor.setterCallableIdIfNotLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { analysisContext.builtIns.unitType.toKtType(analysisContext) }
 
     override val origin: KtSymbolOrigin
@@ -96,7 +96,7 @@ class KtFe10DescDefaultPropertySetterSymbol(
         override val name: Name
             get() = withValidityAssertion { Name.identifier("value") }
 
-        override val type: KtType
+        override val returnType: KtType
             get() = withValidityAssertion { propertyDescriptor.type.toKtType(analysisContext) }
 
         override val origin: KtSymbolOrigin

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescEnumEntrySymbol.kt

@@ -41,7 +41,7 @@ internal class KtFe10DescEnumEntrySymbol(
             )
         }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { enumDescriptor.defaultType.toKtType(analysisContext) }
 
     override val name: Name

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt

@@ -65,7 +65,7 @@ internal class KtFe10DescFunctionSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtType(analysisContext) }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescJavaFieldSymbol.kt

@@ -36,7 +36,7 @@ internal class KtFe10DescJavaFieldSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.returnType.toKtType(analysisContext) }
 
     override fun createPointer(): KtSymbolPointer<KtJavaFieldSymbol> = withValidityAssertion {

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt

@@ -89,7 +89,7 @@ internal class KtFe10DescKotlinPropertySymbol(
             return KtFe10DescPropertySetterSymbol(setter, analysisContext)
         }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.type.toKtType(analysisContext) }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescLocalVariableSymbol.kt

@@ -28,7 +28,7 @@ internal class KtFe10DescLocalVariableSymbol(
     override val isVal: Boolean
         get() = withValidityAssertion { !descriptor.isVar }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.type.toKtType(analysisContext) }
 
     override val symbolKind: KtSymbolKind

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt

@@ -44,7 +44,7 @@ internal class KtFe10DescPropertyGetterSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { descriptor.correspondingProperty.getterCallableIdIfNotLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtType(analysisContext) }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt

@@ -22,7 +22,7 @@ internal class KtFe10DescPropertySetterSymbol(
     override val descriptor: PropertySetterDescriptor,
     override val analysisContext: Fe10AnalysisContext
 ) : KtPropertySetterSymbol(), KtFe10DescMemberSymbol<PropertySetterDescriptor> {
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { analysisContext.builtIns.unitType.toKtType(analysisContext) }
 
     override val isDefault: Boolean

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt

@@ -41,7 +41,7 @@ internal class KtFe10DescSamConstructorSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { expandedDescriptor.callableIdIfNotLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtType(analysisContext) }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticFieldSymbol.kt

@@ -35,7 +35,7 @@ internal class KtFe10DescSyntheticFieldSymbol(
             KtFe10DescKotlinPropertySymbol(kotlinProperty, analysisContext)
         }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.propertyDescriptor.type.toKtType(analysisContext) }
 
     override fun createPointer(): KtSymbolPointer<KtVariableLikeSymbol> = withValidityAssertion {

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt

@@ -79,7 +79,7 @@ internal class KtFe10DescSyntheticJavaPropertySymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.type.toKtType(analysisContext) }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt

@@ -79,7 +79,7 @@ internal class KtFe10DescSyntheticJavaPropertySymbolForOverride(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor.type.toKtType(analysisContext) }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescValueParameterSymbol.kt

@@ -39,7 +39,7 @@ internal class KtFe10DescValueParameterSymbol(
     override val isVararg: Boolean
         get() = withValidityAssertion { descriptor.isVararg }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion {
             return (descriptor.varargElementType ?: descriptor.type).toKtType(analysisContext)
         }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiAnonymousFunctionSymbol.kt

@@ -39,7 +39,7 @@ internal class KtFe10PsiAnonymousFunctionSymbol(
     override val hasStableParameterNames: Boolean
         get() = withValidityAssertion { true }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion {
             descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType()
         }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiConstructorSymbol.kt

@@ -50,7 +50,7 @@ internal class KtFe10PsiConstructorSymbol(
     override val hasStableParameterNames: Boolean
         get() = withValidityAssertion { true }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion {
             descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType()
         }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt

@@ -74,7 +74,7 @@ class KtFe10PsiDefaultPropertyGetterSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { null }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor?.type?.toKtType(analysisContext) ?: createErrorType() }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt

@@ -78,7 +78,7 @@ class KtFe10PsiDefaultPropertySetterSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { null }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion {
             return analysisContext.builtIns.unitType.toKtType(analysisContext)
         }
@@ -119,7 +119,7 @@ class KtFe10PsiDefaultPropertySetterSymbol(
         override val name: Name
             get() = withValidityAssertion { Name.identifier("value") }
 
-        override val type: KtType
+        override val returnType: KtType
             get() = withValidityAssertion { descriptor?.type?.toKtType(analysisContext) ?: createErrorType() }
 
         override val origin: KtSymbolOrigin

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultSetterParameterSymbol.kt

@@ -46,7 +46,7 @@ internal class KtFe10PsiDefaultSetterParameterSymbol(
     override val isVararg: Boolean
         get() = withValidityAssertion { false }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor?.type?.toKtType(analysisContext) ?: createErrorType() }
 
     override val psi: PsiElement?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiEnumEntrySymbol.kt

@@ -46,7 +46,7 @@ internal class KtFe10PsiEnumEntrySymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { psi.callableIdIfNonLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion {
             val containingDescriptor = descriptor?.containingDeclaration
             if (containingDescriptor is ClassDescriptor && containingDescriptor.kind == ClassKind.ENUM_CLASS) {

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt

@@ -71,7 +71,7 @@ internal class KtFe10PsiFunctionSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { psi.callableIdIfNonLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType() }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt

@@ -111,7 +111,7 @@ internal class KtFe10PsiKotlinPropertySymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { psi.callableIdIfNonLocal }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor?.type?.toKtType(analysisContext) ?: createErrorType() }
 
     override val receiverType: KtType?

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiLiteralAnonymousFunctionSymbol.kt

@@ -45,7 +45,7 @@ internal class KtFe10PsiLiteralAnonymousFunctionSymbol(
     override val hasStableParameterNames: Boolean
         get() = withValidityAssertion { true }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion {
             descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType()
         }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiLocalVariableSymbol.kt

@@ -36,7 +36,7 @@ internal class KtFe10PsiLocalVariableSymbol(
     override val name: Name
         get() = withValidityAssertion { psi.nameAsSafeName }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor?.type?.toKtType(analysisContext) ?: createErrorType() }
 
     override val isVal: Boolean

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiLoopParameterLocalVariableSymbol.kt

@@ -35,7 +35,7 @@ internal class KtFe10PsiLoopParameterLocalVariableSymbol(
     override val name: Name
         get() = withValidityAssertion { psi.nameAsSafeName }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion { descriptor?.type?.toKtType(analysisContext) ?: createErrorType() }
 
     override val isVal: Boolean

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt

@@ -67,7 +67,7 @@ internal class KtFe10PsiPropertyGetterSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { null }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion {
             descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType()
         }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertySetterSymbol.kt

@@ -68,7 +68,7 @@ internal class KtFe10PsiPropertySetterSymbol(
     override val callableIdIfNonLocal: CallableId?
         get() = withValidityAssertion { null }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion {
             descriptor?.returnType?.toKtType(analysisContext) ?: createErrorType()
         }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiValueParameterSymbol.kt

@@ -39,7 +39,7 @@ internal class KtFe10PsiValueParameterSymbol(
     override val isVararg: Boolean
         get() = withValidityAssertion { psi.isVarArg }
 
-    override val type: KtType
+    override val returnType: KtType
         get() = withValidityAssertion {
             val type = (descriptor as? ValueParameterDescriptor)?.varargElementType ?: descriptor?.type
             return type?.toKtType(analysisContext) ?: createErrorType()

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirExpressionTypeProvider.kt

@@ -149,7 +149,7 @@ internal class KtFirExpressionTypeProvider(
     private fun getExpectedTypeByReturnExpression(expression: PsiElement): KtType? {
         val returnParent = expression.getReturnExpressionWithThisType() ?: return null
         val targetSymbol = with(analysisSession) { returnParent.getReturnTargetSymbol() } ?: return null
-        return targetSymbol.type
+        return targetSymbol.returnType
     }
 
     private fun PsiElement.getReturnExpressionWithThisType(): KtReturnExpression? =

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt

@@ -30,7 +30,7 @@ internal class KtFirAnonymousFunctionSymbol(
     override val firRef = firRef(fir, resolveState)
     override val psi: PsiElement? by firRef.withFirAndCache { fir -> fir.findPsi(fir.moduleData.session) }
 
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirBackingFieldSymbol.kt

@@ -26,7 +26,7 @@ internal class KtFirBackingFieldSymbol(
 ) : KtBackingFieldSymbol() {
     private val propertyFirRef = firRef(propertyFir, resolveState)
 
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         propertyFirRef.returnType(FirResolvePhase.TYPES, builder)
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirConstructorSymbol.kt

@@ -39,7 +39,7 @@ internal class KtFirConstructorSymbol(
     override val firRef = firRef(fir, resolveState)
     override val psi: PsiElement? by firRef.withFirAndCache { fir -> fir.findPsi(fir.moduleData.session) }
 
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirEnumEntrySymbol.kt

@@ -35,7 +35,7 @@ internal class KtFirEnumEntrySymbol(
     override val psi: PsiElement? by firRef.withFirAndCache { fir -> fir.findPsi(fir.moduleData.session) }
 
     override val name: Name get() = firRef.withFir { it.name }
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt

@@ -43,7 +43,7 @@ internal class KtFirFunctionSymbol(
     override val firRef = firRef(fir, resolveState)
     override val psi: PsiElement? by firRef.withFirAndCache { fir -> fir.findPsi(fir.moduleData.session) }
     override val name: Name get() = firRef.withFir { it.name }
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirJavaFieldSymbol.kt

@@ -34,7 +34,7 @@ internal class KtFirJavaFieldSymbol(
     override val firRef = firRef(fir, resolveState)
     override val psi: PsiElement? by firRef.withFirAndCache { fir -> fir.findPsi(fir.moduleData.session) }
 
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.TYPES, builder)
     }
     override val isVal: Boolean get() = firRef.withFir { it.isVal }

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt

@@ -56,7 +56,7 @@ internal class KtFirKotlinPropertySymbol(
     override val isVal: Boolean get() = firRef.withFir { it.isVal }
     override val name: Name get() = firRef.withFir { it.name }
 
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirLocalVariableSymbol.kt

@@ -38,7 +38,7 @@ internal class KtFirLocalVariableSymbol(
 
     override val isVal: Boolean get() = firRef.withFir { it.isVal }
     override val name: Name get() = firRef.withFir { it.name }
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
     override val symbolKind: KtSymbolKind get() = KtSymbolKind.LOCAL

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt

@@ -47,7 +47,7 @@ internal class KtFirPropertyGetterSymbol(
     override val isOverride: Boolean get() = firRef.withFir { it.isOverride }
     override val hasBody: Boolean get() = firRef.withFir { it.body != null }
 
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
     override val modality: Modality get() = getModality()

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt

@@ -69,7 +69,7 @@ internal class KtFirPropertySetterSymbol(
 
     override val valueParameters: List<KtValueParameterSymbol> by cached { listOf(parameter) }
 
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt

@@ -33,7 +33,7 @@ internal class KtFirSamConstructorSymbol(
     override val firRef = firRef(fir, resolveState)
     override val psi: PsiElement? by firRef.withFirAndCache { fir -> fir.findPsi(fir.moduleData.session) }
     override val name: Name get() = firRef.withFir { it.name }
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt

@@ -44,7 +44,7 @@ internal class KtFirSyntheticJavaPropertySymbol(
 
     override val isVal: Boolean get() = firRef.withFir { it.isVal }
     override val name: Name get() = firRef.withFir { it.name }
-    override val type: KtType by cached {
+    override val returnType: KtType by cached {
         firRef.returnType(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt

@@ -88,7 +88,7 @@ internal class KtFirValueParameterSymbol(
     }
 
     override val isVararg: Boolean get() = firRef.withFir { it.isVararg }
-    override val type: KtType by firRef.withFirAndCache(FirResolvePhase.TYPES) { fir ->
+    override val returnType: KtType by firRef.withFirAndCache(FirResolvePhase.TYPES) { fir ->
         if (fir.isVararg) {
             // There SHOULD always be an array element type (even if it is an error type, e.g., unresolved).
             val arrayElementType = fir.returnTypeRef.coneType.arrayElementType()

analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt

@@ -49,7 +49,7 @@ abstract class AbstractOverriddenDeclarationProviderTest(
             symbol.valueParameters.forEachIndexed { index, parameter ->
                 append(parameter.name.identifier)
                 append(": ")
-                append(parameter.type.render(KtTypeRendererOptions.SHORT_NAMES))
+                append(parameter.returnType.render(KtTypeRendererOptions.SHORT_NAMES))
                 if (index != symbol.valueParameters.lastIndex) {
                     append(", ")
                 }
@@ -57,7 +57,7 @@ abstract class AbstractOverriddenDeclarationProviderTest(
             append(")")
         }
         append(": ")
-        append(symbol.type.render(KtTypeRendererOptions.SHORT_NAMES))
+        append(symbol.returnType.render(KtTypeRendererOptions.SHORT_NAMES))
     }
 
     private fun getPath(symbol: KtCallableSymbol): String = when (symbol) {

analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt

@@ -87,11 +87,11 @@ private fun KtAnalysisSession.stringRepresentation(call: KtCall): String {
             }
             valueParameters.joinTo(this) { it.stringValue() }
             append(")")
-            append(": ${type.render()}")
+            append(": ${returnType.render()}")
         }
-        is KtValueParameterSymbol -> "${if (isVararg) "vararg " else ""}$name: ${type.render()}"
+        is KtValueParameterSymbol -> "${if (isVararg) "vararg " else ""}$name: ${returnType.render()}"
         is KtTypeParameterSymbol -> this.nameOrAnonymous.asString()
-        is KtVariableSymbol -> "${if (isVal) "val" else "var"} $name: ${type.render()}"
+        is KtVariableSymbol -> "${if (isVal) "val" else "var"} $name: ${returnType.render()}"
         is KtSuccessCallTarget -> symbol.stringValue()
         is KtErrorCallTarget -> "ERR<${this.diagnostic.defaultMessage}, [${candidates.joinToString { it.stringValue() }}]>"
         is Boolean -> toString()

analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.name.CallableId
 
 public abstract class KtCallableSymbol : KtSymbol, KtSymbolWithKind {
     public abstract val callableIdIfNonLocal: CallableId?
-    public abstract val type: KtType
+    public abstract val returnType: KtType
 
     public abstract val receiverType: KtType?
     public abstract val isExtension: Boolean

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

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: foo
   origin: DELEGATED
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public

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

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: bar
   origin: DELEGATED
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public

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

@@ -24,8 +24,8 @@ KtFunctionSymbol:
   name: test
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -51,9 +51,9 @@ KtKotlinPropertySymbol:
   name: testVal
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null

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

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: and
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -40,8 +40,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -66,8 +66,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -92,8 +92,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -118,8 +118,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -144,8 +144,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -170,8 +170,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -196,8 +196,8 @@ KtFunctionSymbol:
   name: dec
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -220,8 +220,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -246,8 +246,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -272,8 +272,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -298,8 +298,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -324,8 +324,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -350,8 +350,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -376,8 +376,8 @@ KtFunctionSymbol:
   name: inc
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -400,8 +400,8 @@ KtFunctionSymbol:
   name: inv
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -424,8 +424,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -450,8 +450,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -476,8 +476,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -502,8 +502,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -528,8 +528,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -554,8 +554,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -580,8 +580,8 @@ KtFunctionSymbol:
   name: or
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -606,8 +606,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -632,8 +632,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -658,8 +658,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -684,8 +684,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -710,8 +710,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -736,8 +736,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -762,8 +762,8 @@ KtFunctionSymbol:
   name: rangeTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/ranges/IntRange
   symbolKind: CLASS_MEMBER
-  type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -788,8 +788,8 @@ KtFunctionSymbol:
   name: rangeTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/ranges/IntRange
   symbolKind: CLASS_MEMBER
-  type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -814,8 +814,8 @@ KtFunctionSymbol:
   name: rangeTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/ranges/LongRange
   symbolKind: CLASS_MEMBER
-  type: kotlin/ranges/LongRange
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -840,8 +840,8 @@ KtFunctionSymbol:
   name: rangeTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/ranges/IntRange
   symbolKind: CLASS_MEMBER
-  type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -869,8 +869,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -898,8 +898,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -927,8 +927,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -956,8 +956,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -985,8 +985,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1014,8 +1014,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1040,8 +1040,8 @@ KtFunctionSymbol:
   name: shl
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(bitCount)
@@ -1066,8 +1066,8 @@ KtFunctionSymbol:
   name: shr
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(bitCount)
@@ -1092,8 +1092,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1118,8 +1118,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1144,8 +1144,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1170,8 +1170,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1196,8 +1196,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1222,8 +1222,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1248,8 +1248,8 @@ KtFunctionSymbol:
   name: toByte
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Byte
   symbolKind: CLASS_MEMBER
-  type: kotlin/Byte
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1272,8 +1272,8 @@ KtFunctionSymbol:
   name: toChar
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Char
   symbolKind: CLASS_MEMBER
-  type: kotlin/Char
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1296,8 +1296,8 @@ KtFunctionSymbol:
   name: toDouble
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1320,8 +1320,8 @@ KtFunctionSymbol:
   name: toFloat
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1344,8 +1344,8 @@ KtFunctionSymbol:
   name: toInt
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1368,8 +1368,8 @@ KtFunctionSymbol:
   name: toLong
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1392,8 +1392,8 @@ KtFunctionSymbol:
   name: toShort
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Short
   symbolKind: CLASS_MEMBER
-  type: kotlin/Short
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1416,8 +1416,8 @@ KtFunctionSymbol:
   name: unaryMinus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1440,8 +1440,8 @@ KtFunctionSymbol:
   name: unaryPlus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1464,8 +1464,8 @@ KtFunctionSymbol:
   name: ushr
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(bitCount)
@@ -1490,8 +1490,8 @@ KtFunctionSymbol:
   name: xor
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1516,8 +1516,8 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1542,8 +1542,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1566,8 +1566,8 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/String
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1604,8 +1604,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/Integer
   symbolKind: CLASS_MEMBER
-  type: java/lang/Integer
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1622,8 +1622,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Private

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

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: add
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -40,8 +40,8 @@ KtFunctionSymbol:
   name: add
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -67,8 +67,8 @@ KtFunctionSymbol:
   name: addAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -94,8 +94,8 @@ KtFunctionSymbol:
   name: addAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -120,8 +120,8 @@ KtFunctionSymbol:
   name: clear
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -144,8 +144,8 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/MutableListIterator<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -168,8 +168,8 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/MutableListIterator<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -194,8 +194,8 @@ KtFunctionSymbol:
   name: remove
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -220,8 +220,8 @@ KtFunctionSymbol:
   name: removeAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -246,8 +246,8 @@ KtFunctionSymbol:
   name: removeAt
   origin: LIBRARY
   receiverType: null
+  returnType: E
   symbolKind: CLASS_MEMBER
-  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -272,8 +272,8 @@ KtFunctionSymbol:
   name: retainAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -298,8 +298,8 @@ KtFunctionSymbol:
   name: set
   origin: LIBRARY
   receiverType: null
+  returnType: E
   symbolKind: CLASS_MEMBER
-  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -325,8 +325,8 @@ KtFunctionSymbol:
   name: subList
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/MutableList<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/MutableList<E>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(fromIndex)
@@ -352,8 +352,8 @@ KtFunctionSymbol:
   name: contains
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -378,8 +378,8 @@ KtFunctionSymbol:
   name: containsAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -404,8 +404,8 @@ KtFunctionSymbol:
   name: get
   origin: LIBRARY
   receiverType: null
+  returnType: E
   symbolKind: CLASS_MEMBER
-  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -430,8 +430,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -456,8 +456,8 @@ KtFunctionSymbol:
   name: isEmpty
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -480,8 +480,8 @@ KtFunctionSymbol:
   name: iterator
   origin: INTERSECTION_OVERRIDE
   receiverType: null
+  returnType: kotlin/collections/MutableIterator<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/MutableIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -504,8 +504,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -534,9 +534,9 @@ KtKotlinPropertySymbol:
   name: size
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): kotlin/collections/MutableList<E>
@@ -562,8 +562,8 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -588,8 +588,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -612,8 +612,8 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/String
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt

@@ -7,8 +7,8 @@ KtJavaFieldSymbol:
   name: value
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/CharArray, kotlin/CharArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/CharArray, kotlin/CharArray?>
   visibility: Private
   deprecationStatus: null
 
@@ -21,8 +21,8 @@ KtJavaFieldSymbol:
   name: hash
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   visibility: Private
   deprecationStatus: null
 
@@ -42,8 +42,8 @@ KtFunctionSymbol:
   name: hash32
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PackageVisibility
@@ -59,8 +59,8 @@ KtJavaFieldSymbol:
   name: hash32
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   visibility: Private
   deprecationStatus: null
 
@@ -84,9 +84,9 @@ KtSyntheticJavaPropertySymbol:
   name: length
   origin: JAVA_SYNTHETIC_PROPERTY
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): java/lang/String
@@ -112,8 +112,8 @@ KtFunctionSymbol:
   name: isEmpty
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -136,8 +136,8 @@ KtFunctionSymbol:
   name: codePointAt
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -162,8 +162,8 @@ KtFunctionSymbol:
   name: codePointBefore
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -188,8 +188,8 @@ KtFunctionSymbol:
   name: codePointCount
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -215,8 +215,8 @@ KtFunctionSymbol:
   name: offsetByCodePoints
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -242,8 +242,8 @@ KtFunctionSymbol:
   name: getChars
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -269,8 +269,8 @@ KtFunctionSymbol:
   name: getChars
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -301,8 +301,8 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -330,8 +330,8 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/ByteArray, kotlin/ByteArray?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -356,8 +356,8 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/ByteArray, kotlin/ByteArray?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -382,8 +382,8 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/ByteArray, kotlin/ByteArray?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -406,8 +406,8 @@ KtFunctionSymbol:
   name: equals
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -432,8 +432,8 @@ KtFunctionSymbol:
   name: contentEquals
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -458,8 +458,8 @@ KtFunctionSymbol:
   name: contentEquals
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -484,8 +484,8 @@ KtFunctionSymbol:
   name: equalsIgnoreCase
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -510,8 +510,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -536,8 +536,8 @@ KtFunctionSymbol:
   name: compareToIgnoreCase
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -562,8 +562,8 @@ KtFunctionSymbol:
   name: regionMatches
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -591,8 +591,8 @@ KtFunctionSymbol:
   name: regionMatches
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -621,8 +621,8 @@ KtFunctionSymbol:
   name: startsWith
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -648,8 +648,8 @@ KtFunctionSymbol:
   name: startsWith
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -674,8 +674,8 @@ KtFunctionSymbol:
   name: endsWith
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -700,8 +700,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -724,8 +724,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -750,8 +750,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -777,8 +777,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -803,8 +803,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -830,8 +830,8 @@ KtFunctionSymbol:
   name: indexOfSupplementary
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -857,8 +857,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -883,8 +883,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -910,8 +910,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -936,8 +936,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -963,8 +963,8 @@ KtFunctionSymbol:
   name: lastIndexOfSupplementary
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -990,8 +990,8 @@ KtFunctionSymbol:
   name: substring
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1016,8 +1016,8 @@ KtFunctionSymbol:
   name: substring
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1043,8 +1043,8 @@ KtFunctionSymbol:
   name: subSequence
   origin: JAVA
   receiverType: null
+  returnType: @EnhancedNullability kotlin/CharSequence
   symbolKind: CLASS_MEMBER
-  type: @EnhancedNullability kotlin/CharSequence
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1070,8 +1070,8 @@ KtFunctionSymbol:
   name: concat
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1096,8 +1096,8 @@ KtFunctionSymbol:
   name: replace
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1123,8 +1123,8 @@ KtFunctionSymbol:
   name: replace
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1150,8 +1150,8 @@ KtFunctionSymbol:
   name: matches
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1176,8 +1176,8 @@ KtFunctionSymbol:
   name: contains
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1202,8 +1202,8 @@ KtFunctionSymbol:
   name: replaceFirst
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1229,8 +1229,8 @@ KtFunctionSymbol:
   name: replaceAll
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1256,8 +1256,8 @@ KtFunctionSymbol:
   name: split
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1283,8 +1283,8 @@ KtFunctionSymbol:
   name: split
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1309,8 +1309,8 @@ KtFunctionSymbol:
   name: toLowerCase
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1335,8 +1335,8 @@ KtFunctionSymbol:
   name: toLowerCase
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1359,8 +1359,8 @@ KtFunctionSymbol:
   name: toUpperCase
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1385,8 +1385,8 @@ KtFunctionSymbol:
   name: toUpperCase
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1409,8 +1409,8 @@ KtFunctionSymbol:
   name: trim
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1433,8 +1433,8 @@ KtFunctionSymbol:
   name: toString
   origin: JAVA
   receiverType: null
+  returnType: @EnhancedNullability kotlin/String
   symbolKind: CLASS_MEMBER
-  type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1457,8 +1457,8 @@ KtFunctionSymbol:
   name: toCharArray
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/CharArray, kotlin/CharArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/CharArray, kotlin/CharArray?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1481,8 +1481,8 @@ KtFunctionSymbol:
   name: intern
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1505,8 +1505,8 @@ KtFunctionSymbol:
   name: get
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Char
   symbolKind: CLASS_MEMBER
-  type: kotlin/Char
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1547,8 +1547,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1563,8 +1563,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1581,8 +1581,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1599,8 +1599,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1619,8 +1619,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1642,8 +1642,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1666,8 +1666,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1685,8 +1685,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1706,8 +1706,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1727,8 +1727,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1746,8 +1746,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1765,8 +1765,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1785,8 +1785,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1803,8 +1803,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1821,8 +1821,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1839,8 +1839,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1861,8 +1861,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)

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

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: invoke
   origin: LIBRARY
   receiverType: null
+  returnType: R
   symbolKind: CLASS_MEMBER
-  type: R
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p1)
@@ -41,8 +41,8 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -67,8 +67,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -91,8 +91,8 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/String
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public

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

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: funWithOuterAndOwnGenericsAndBounds
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: [
     KtTypeParameterSymbol(TT1)
     KtTypeParameterSymbol(TT2)
@@ -48,9 +48,9 @@ KtKotlinPropertySymbol:
   name: propWithOuterAndOwnGenericsAndBounds
   origin: SOURCE
   receiverType: test/TwoParams<TT1, TT2>
+  returnType: test/Foo?
   setter: null
   symbolKind: CLASS_MEMBER
-  type: test/Foo?
   typeParameters: [
     KtTypeParameterSymbol(TT1)
     KtTypeParameterSymbol(TT2)
@@ -79,8 +79,8 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -105,8 +105,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -129,8 +129,8 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/String
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -146,8 +146,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE_MEMBER_GENERATED
   receiverType: null
+  returnType: test/MyClass
   symbolKind: CLASS_MEMBER
-  type: test/MyClass
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt

@@ -5,6 +5,6 @@ KtEnumEntrySymbol:
   name: SYNCHRONIZED
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/LazyThreadSafetyMode
   symbolKind: CLASS_MEMBER
-  type: kotlin/LazyThreadSafetyMode
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: listOf
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/List<T>
   symbolKind: TOP_LEVEL
-  type: kotlin/collections/List<T>
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]
@@ -44,8 +44,8 @@ KtFunctionSymbol:
   name: listOf
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/List<T>
   symbolKind: TOP_LEVEL
-  type: kotlin/collections/List<T>
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]
@@ -69,8 +69,8 @@ KtFunctionSymbol:
   name: listOf
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/List<T>
   symbolKind: TOP_LEVEL
-  type: kotlin/collections/List<T>
   typeParameters: [
     KtTypeParameterSymbol(T)
   ]

analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: get
   origin: LIBRARY
   receiverType: null
+  returnType: E
   symbolKind: CLASS_MEMBER
-  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)

analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/ListIterator<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/ListIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -38,8 +38,8 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/ListIterator<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/ListIterator<E>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)

analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt

@@ -7,8 +7,8 @@ KtValueParameterSymbol:
   name: param1
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   symbolKind: LOCAL
-  type: kotlin/String
   deprecationStatus: null
 
 KtValueParameterSymbol:
@@ -20,8 +20,8 @@ KtValueParameterSymbol:
   name: param2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtConstructorSymbol:
@@ -33,8 +33,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE
   receiverType: null
+  returnType: Anno
   symbolKind: CLASS_MEMBER
-  type: Anno
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(param1)
@@ -83,8 +83,8 @@ KtFunctionSymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: run
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -42,9 +42,9 @@ KtKotlinPropertySymbol:
   name: data
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): <no name provided>
@@ -86,9 +86,9 @@ KtKotlinPropertySymbol:
   name: anonymousObject
   origin: SOURCE
   receiverType: null
+  returnType: java/lang/Runnable
   setter: null
   symbolKind: CLASS_MEMBER
-  type: java/lang/Runnable
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): AnonymousContainer

analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: run
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -42,9 +42,9 @@ KtKotlinPropertySymbol:
   name: data
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): <anonymous>
@@ -86,9 +86,9 @@ KtKotlinPropertySymbol:
   name: anonymousObject
   origin: SOURCE
   receiverType: null
+  returnType: java/lang/Runnable
   setter: null
   symbolKind: CLASS_MEMBER
-  type: java/lang/Runnable
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): AnonymousContainer

analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt

@@ -10,8 +10,8 @@ KtPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: ACCESSOR
-  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
@@ -25,8 +25,8 @@ KtValueParameterSymbol:
   name: value
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtPropertySetterSymbol:
@@ -42,8 +42,8 @@ KtPropertySetterSymbol:
   origin: SOURCE
   parameter: KtValueParameterSymbol(value)
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: ACCESSOR
-  type: kotlin/Unit
   valueParameters: [
     KtValueParameterSymbol(value)
   ]
@@ -70,9 +70,9 @@ KtKotlinPropertySymbol:
   name: p
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt

@@ -18,9 +18,9 @@ KtKotlinPropertySymbol:
   name: i
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A

analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt

@@ -18,9 +18,9 @@ KtKotlinPropertySymbol:
   name: a
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -46,8 +46,8 @@ KtFunctionSymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt

@@ -7,8 +7,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE
   receiverType: null
+  returnType: A
   symbolKind: CLASS_MEMBER
-  type: A
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt

@@ -7,8 +7,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE
   receiverType: null
+  returnType: A
   symbolKind: CLASS_MEMBER
-  type: A
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -23,8 +23,8 @@ KtValueParameterSymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtConstructorSymbol:
@@ -36,8 +36,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: SOURCE
   receiverType: null
+  returnType: A
   symbolKind: CLASS_MEMBER
-  type: A
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(x)
@@ -54,8 +54,8 @@ KtValueParameterSymbol:
   name: y
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtValueParameterSymbol:
@@ -67,8 +67,8 @@ KtValueParameterSymbol:
   name: z
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   symbolKind: LOCAL
-  type: kotlin/String
   deprecationStatus: null
 
 KtConstructorSymbol:
@@ -80,8 +80,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: SOURCE
   receiverType: null
+  returnType: A
   symbolKind: CLASS_MEMBER
-  type: A
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(y)

analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt

@@ -7,8 +7,8 @@ KtValueParameterSymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtValueParameterSymbol:
@@ -20,8 +20,8 @@ KtValueParameterSymbol:
   name: y
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtValueParameterSymbol:
@@ -33,8 +33,8 @@ KtValueParameterSymbol:
   name: z
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtConstructorSymbol:
@@ -46,8 +46,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE
   receiverType: null
+  returnType: MyColor
   symbolKind: CLASS_MEMBER
-  type: MyColor
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(x)
@@ -84,8 +84,8 @@ KtAnonymousFunctionSymbol:
   isExtension: false
   origin: SOURCE
   receiverType: null
+  returnType: MyColor
   symbolKind: LOCAL
-  type: MyColor
   valueParameters: []
   deprecationStatus: null
 
@@ -109,9 +109,9 @@ KtKotlinPropertySymbol:
   name: delegate
   origin: SOURCE
   receiverType: null
+  returnType: MyColor
   setter: null
   symbolKind: CLASS_MEMBER
-  type: MyColor
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Some
@@ -127,8 +127,8 @@ KtAnonymousFunctionSymbol:
   isExtension: false
   origin: SOURCE
   receiverType: null
+  returnType: MyColor
   symbolKind: LOCAL
-  type: MyColor
   valueParameters: []
   deprecationStatus: null
 
@@ -152,9 +152,9 @@ KtKotlinPropertySymbol:
   name: lambda
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Lazy<MyColor>
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Lazy<MyColor>
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Some
@@ -184,9 +184,9 @@ KtKotlinPropertySymbol:
   name: nonLazy
   origin: SOURCE
   receiverType: null
+  returnType: MyColor
   setter: null
   symbolKind: CLASS_MEMBER
-  type: MyColor
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Some

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt

@@ -21,9 +21,9 @@ KtKotlinPropertySymbol:
   name: i
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
@@ -52,9 +52,9 @@ KtKotlinPropertySymbol:
   name: i2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -83,9 +83,9 @@ KtKotlinPropertySymbol:
   name: i3
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -114,9 +114,9 @@ KtKotlinPropertySymbol:
   name: i4
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -144,8 +144,8 @@ KtFunctionSymbol:
   name: f
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -198,9 +198,9 @@ KtKotlinPropertySymbol:
   name: i2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -229,8 +229,8 @@ KtFunctionSymbol:
   name: f2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -281,9 +281,9 @@ KtKotlinPropertySymbol:
   name: j
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=don't use j)
@@ -315,9 +315,9 @@ KtKotlinPropertySymbol:
   name: j2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=don't use j2)
@@ -346,9 +346,9 @@ KtKotlinPropertySymbol:
   name: j2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt

@@ -21,9 +21,9 @@ KtKotlinPropertySymbol:
   name: i
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
@@ -52,9 +52,9 @@ KtKotlinPropertySymbol:
   name: i2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -83,9 +83,9 @@ KtKotlinPropertySymbol:
   name: i3
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -114,9 +114,9 @@ KtKotlinPropertySymbol:
   name: i4
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -144,8 +144,8 @@ KtFunctionSymbol:
   name: f
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -198,9 +198,9 @@ KtKotlinPropertySymbol:
   name: i2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -229,8 +229,8 @@ KtFunctionSymbol:
   name: f2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -281,9 +281,9 @@ KtKotlinPropertySymbol:
   name: j
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null)
@@ -315,9 +315,9 @@ KtKotlinPropertySymbol:
   name: j2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null)
@@ -349,9 +349,9 @@ KtKotlinPropertySymbol:
   name: j2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)

analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt

@@ -5,8 +5,8 @@ KtEnumEntrySymbol:
   name: Y
   origin: SOURCE
   receiverType: null
+  returnType: X
   symbolKind: CLASS_MEMBER
-  type: X
   deprecationStatus: null
 
 KtEnumEntrySymbol:
@@ -16,8 +16,8 @@ KtEnumEntrySymbol:
   name: Z
   origin: SOURCE
   receiverType: null
+  returnType: X
   symbolKind: CLASS_MEMBER
-  type: X
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt

@@ -7,8 +7,8 @@ KtValueParameterSymbol:
   name: value
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   symbolKind: LOCAL
-  type: kotlin/String
   deprecationStatus: null
 
 KtConstructorSymbol:
@@ -20,8 +20,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE
   receiverType: null
+  returnType: Style
   symbolKind: CLASS_MEMBER
-  type: Style
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(value)
@@ -41,8 +41,8 @@ KtPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   symbolKind: ACCESSOR
-  type: kotlin/String
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): Style.SHEET
@@ -68,9 +68,9 @@ KtKotlinPropertySymbol:
   name: exitAnimation
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Style.SHEET
@@ -87,8 +87,8 @@ KtEnumEntrySymbol:
   name: SHEET
   origin: SOURCE
   receiverType: null
+  returnType: Style
   symbolKind: CLASS_MEMBER
-  type: Style
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -111,9 +111,9 @@ KtKotlinPropertySymbol:
   name: exitAnimation
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Style

analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt

@@ -7,8 +7,8 @@ KtValueParameterSymbol:
   name: value
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   symbolKind: LOCAL
-  type: kotlin/String
   deprecationStatus: null
 
 KtConstructorSymbol:
@@ -20,8 +20,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE
   receiverType: null
+  returnType: Style
   symbolKind: CLASS_MEMBER
-  type: Style
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(value)
@@ -41,8 +41,8 @@ KtPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   symbolKind: ACCESSOR
-  type: kotlin/String
   valueParameters: []
   visibility: Public
   deprecationStatus: null
@@ -67,9 +67,9 @@ KtKotlinPropertySymbol:
   name: exitAnimation
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): <anonymous>
@@ -86,8 +86,8 @@ KtEnumEntrySymbol:
   name: SHEET
   origin: SOURCE
   receiverType: null
+  returnType: Style
   symbolKind: CLASS_MEMBER
-  type: Style
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -110,9 +110,9 @@ KtKotlinPropertySymbol:
   name: exitAnimation
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/String
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Style

analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverType: kotlin/String
+  returnType: kotlin/Int
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt

@@ -5,8 +5,8 @@ KtLocalVariableSymbol:
   name: loopVariable
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -25,8 +25,8 @@ KtFunctionSymbol:
   name: usage
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByPsi/function.txt

@@ -7,8 +7,8 @@ KtValueParameterSymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -27,8 +27,8 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(x)

analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt

@@ -17,8 +17,8 @@ KtValueParameterSymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: X
   symbolKind: LOCAL
-  type: X
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -37,8 +37,8 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: [
     KtTypeParameterSymbol(X)
   ]

analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt

@@ -7,8 +7,8 @@ KtValueParameterSymbol:
   name: i
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtConstructorSymbol:
@@ -20,8 +20,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: SOURCE
   receiverType: null
+  returnType: A
   symbolKind: CLASS_MEMBER
-  type: A
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(i)

analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt

@@ -7,8 +7,8 @@ KtValueParameterSymbol:
   name: a
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtLocalVariableSymbol:
@@ -18,8 +18,8 @@ KtLocalVariableSymbol:
   name: b
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtAnonymousFunctionSymbol:
@@ -28,8 +28,8 @@ KtAnonymousFunctionSymbol:
   isExtension: false
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   valueParameters: [
     KtValueParameterSymbol(a)
   ]
@@ -42,8 +42,8 @@ KtLocalVariableSymbol:
   name: lam1
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Function1<kotlin/Int, kotlin/Int>
   symbolKind: LOCAL
-  type: kotlin/Function1<kotlin/Int, kotlin/Int>
   deprecationStatus: null
 
 KtValueParameterSymbol:
@@ -55,8 +55,8 @@ KtValueParameterSymbol:
   name: a
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtLocalVariableSymbol:
@@ -66,8 +66,8 @@ KtLocalVariableSymbol:
   name: c
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtAnonymousFunctionSymbol:
@@ -76,8 +76,8 @@ KtAnonymousFunctionSymbol:
   isExtension: false
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   valueParameters: [
     KtValueParameterSymbol(a)
   ]
@@ -90,8 +90,8 @@ KtLocalVariableSymbol:
   name: lam2
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Function1<kotlin/Int, kotlin/Int>
   symbolKind: LOCAL
-  type: kotlin/Function1<kotlin/Int, kotlin/Int>
   deprecationStatus: null
 
 KtLocalVariableSymbol:
@@ -101,8 +101,8 @@ KtLocalVariableSymbol:
   name: b
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtAnonymousFunctionSymbol:
@@ -111,8 +111,8 @@ KtAnonymousFunctionSymbol:
   isExtension: false
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   valueParameters: [
     KtValueParameterSymbol(it)
   ]
@@ -134,8 +134,8 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -150,8 +150,8 @@ KtValueParameterSymbol:
   name: lmbd
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Function1<kotlin/Int, kotlin/Int>
   symbolKind: LOCAL
-  type: kotlin/Function1<kotlin/Int, kotlin/Int>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -170,8 +170,8 @@ KtFunctionSymbol:
   name: bar
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(lmbd)

analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt

@@ -18,9 +18,9 @@ KtKotlinPropertySymbol:
   name: i
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -45,8 +45,8 @@ KtPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: ACCESSOR
-  type: kotlin/Int
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -61,8 +61,8 @@ KtValueParameterSymbol:
   name: value
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtPropertySetterSymbol:
@@ -81,8 +81,8 @@ KtPropertySetterSymbol:
   origin: SOURCE
   parameter: KtValueParameterSymbol(value)
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: ACCESSOR
-  type: kotlin/Unit
   valueParameters: [
     KtValueParameterSymbol(value)
   ]
@@ -110,9 +110,9 @@ KtKotlinPropertySymbol:
   name: j
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo

analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt

@@ -18,9 +18,9 @@ KtKotlinPropertySymbol:
   name: i
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo
@@ -45,8 +45,8 @@ KtPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: ACCESSOR
-  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
@@ -60,8 +60,8 @@ KtValueParameterSymbol:
   name: value
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtPropertySetterSymbol:
@@ -80,8 +80,8 @@ KtPropertySetterSymbol:
   origin: SOURCE
   parameter: KtValueParameterSymbol(value)
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: ACCESSOR
-  type: kotlin/Unit
   valueParameters: [
     KtValueParameterSymbol(value)
   ]
@@ -108,9 +108,9 @@ KtKotlinPropertySymbol:
   name: j
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): Foo

analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt

@@ -5,8 +5,8 @@ KtLocalVariableSymbol:
   name: q
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -25,8 +25,8 @@ KtFunctionSymbol:
   name: aaa
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: LOCAL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Local
@@ -69,8 +69,8 @@ KtFunctionSymbol:
   name: yyy
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -38,8 +38,8 @@ KtFunctionSymbol:
   name: y
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt

@@ -18,9 +18,9 @@ KtKotlinPropertySymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -42,8 +42,8 @@ KtPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   receiverType: kotlin/Int
+  returnType: kotlin/Int
   symbolKind: ACCESSOR
-  type: kotlin/Int
   valueParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -69,9 +69,9 @@ KtKotlinPropertySymbol:
   name: y
   origin: SOURCE
   receiverType: kotlin/Int
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A

analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt

@@ -18,9 +18,9 @@ KtKotlinPropertySymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A
@@ -42,8 +42,8 @@ KtPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: ACCESSOR
-  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
@@ -68,9 +68,9 @@ KtKotlinPropertySymbol:
   name: y
   origin: SOURCE
   receiverType: kotlin/Int
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): A

analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt

@@ -199,8 +199,8 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: [
     KtTypeParameterSymbol(T3)
   ]

analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt

@@ -199,8 +199,8 @@ KtFunctionSymbol:
   name: foo
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: [
     KtTypeParameterSymbol(T3)
   ]

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -37,8 +37,8 @@ KtFunctionSymbol:
   name: y
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt

@@ -18,9 +18,9 @@ KtKotlinPropertySymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -41,8 +41,8 @@ KtPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   receiverType: kotlin/Int
+  returnType: kotlin/Int
   symbolKind: ACCESSOR
-  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
@@ -67,9 +67,9 @@ KtKotlinPropertySymbol:
   name: y
   origin: SOURCE
   receiverType: kotlin/Int
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt

@@ -18,9 +18,9 @@ KtKotlinPropertySymbol:
   name: x
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null
@@ -41,8 +41,8 @@ KtPropertyGetterSymbol:
   modality: FINAL
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: ACCESSOR
-  type: kotlin/Int
   valueParameters: []
   visibility: Public
   deprecationStatus: null
@@ -67,9 +67,9 @@ KtKotlinPropertySymbol:
   name: y
   origin: SOURCE
   receiverType: kotlin/Int
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt

@@ -124,11 +124,11 @@ KtValueParameterSymbol:
   name: arg
   origin: SOURCE
   receiverType: null
-  symbolKind: LOCAL
+  returnType: [
-  type: [
     Anno2()
       psi: KtAnnotationEntry
   ] @R|Anno2|()  I
+  symbolKind: LOCAL
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -147,11 +147,11 @@ KtFunctionSymbol:
   name: f
   origin: SOURCE
   receiverType: null
-  symbolKind: CLASS_MEMBER
+  returnType: [
-  type: [
     Anno3()
       psi: KtAnnotationEntry
   ] @R|Anno3|()  I
+  symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(arg)
@@ -180,12 +180,12 @@ KtKotlinPropertySymbol:
   name: x
   origin: SOURCE
   receiverType: null
-  setter: null
+  returnType: [
-  symbolKind: CLASS_MEMBER
-  type: [
     Anno4()
       psi: KtAnnotationEntry
   ] @R|Anno4|()  I
+  setter: null
+  symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): X

analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt

@@ -124,11 +124,11 @@ KtValueParameterSymbol:
   name: arg
   origin: SOURCE
   receiverType: null
-  symbolKind: LOCAL
+  returnType: [
-  type: [
     Anno2()
       psi: KtAnnotationEntry
   ] @R|Anno2|()  I
+  symbolKind: LOCAL
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -147,11 +147,11 @@ KtFunctionSymbol:
   name: f
   origin: SOURCE
   receiverType: null
-  symbolKind: CLASS_MEMBER
+  returnType: [
-  type: [
     Anno2()
       psi: KtAnnotationEntry
   ] @R|Anno2|()  I
+  symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(arg)
@@ -180,12 +180,12 @@ KtKotlinPropertySymbol:
   name: x
   origin: SOURCE
   receiverType: null
-  setter: null
+  returnType: [
-  symbolKind: CLASS_MEMBER
-  type: [
     Anno2()
       psi: KtAnnotationEntry
   ] @R|Anno2|()  I
+  setter: null
+  symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): X

analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt

@@ -7,8 +7,8 @@ KtValueParameterSymbol:
   name: a
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -27,8 +27,8 @@ KtFunctionSymbol:
   name: primitive
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(a)
@@ -45,8 +45,8 @@ KtValueParameterSymbol:
   name: b
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Float?
   symbolKind: LOCAL
-  type: kotlin/Float?
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -65,8 +65,8 @@ KtFunctionSymbol:
   name: nullablePrimitive
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(b)
@@ -83,8 +83,8 @@ KtValueParameterSymbol:
   name: c
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Any
   symbolKind: LOCAL
-  type: kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -103,8 +103,8 @@ KtFunctionSymbol:
   name: nonPrimitive
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(c)
@@ -121,8 +121,8 @@ KtValueParameterSymbol:
   name: d
   origin: SOURCE
   receiverType: null
+  returnType: ERROR_TYPE
   symbolKind: LOCAL
-  type: ERROR_TYPE
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -141,8 +141,8 @@ KtFunctionSymbol:
   name: error
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: TOP_LEVEL
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(d)

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

@@ -5,6 +5,6 @@ KtBackingFieldSymbol:
   origin: PROPERTY_BACKING_FIELD
   owningProperty: KtKotlinPropertySymbol(/x)
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: LOCAL
-  type: kotlin/Int
   deprecationStatus: null

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

@@ -7,8 +7,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/util/ArrayList<E>
   symbolKind: CLASS_MEMBER
-  type: java/util/ArrayList<E>
   typeParameters: [
     KtTypeParameterSymbol(E)
   ]

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

@@ -5,8 +5,8 @@ KtSamConstructorSymbol:
   name: Runnable
   origin: SAM_CONSTRUCTOR
   receiverType: null
+  returnType: java/lang/Runnable
   symbolKind: SAM_CONSTRUCTOR
-  type: java/lang/Runnable
   valueParameters: [
     KtValueParameterSymbol(function)
   ]

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForEnumEntry.kt

@@ -82,7 +82,7 @@ internal class FirLightClassForEnumEntry(
 
     private val _extendsList: PsiReferenceList? by lazyPub {
         val mappedType = analyzeWithSymbolAsContext(enumEntrySymbol) {
-            enumEntrySymbol.type.asPsiType(this@FirLightClassForEnumEntry, KtTypeMappingMode.SUPER_TYPE) as? PsiClassType
+            enumEntrySymbol.returnType.asPsiType(this@FirLightClassForEnumEntry, KtTypeMappingMode.SUPER_TYPE) as? PsiClassType
                 ?: return@lazyPub null
         }
 

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/FirLightFieldEnumEntry.kt

@@ -66,7 +66,7 @@ internal class FirLightFieldForEnumEntry(
 
     private val _type: PsiType by lazyPub {
         analyzeWithSymbolAsContext(enumEntrySymbol) {
-            enumEntrySymbol.type.asPsiType(this@FirLightFieldForEnumEntry)
+            enumEntrySymbol.returnType.asPsiType(this@FirLightFieldForEnumEntry)
         } ?: nonExistentType()
     }
 

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/FirLightFieldForPropertySymbol.kt

@@ -39,7 +39,7 @@ internal class FirLightFieldForPropertySymbol(
                         it.getKtType()?.asPsiType(this@FirLightFieldForPropertySymbol, KtTypeMappingMode.RETURN_TYPE)
                     }
                 else -> {
-                    propertySymbol.type.asPsiType(this@FirLightFieldForPropertySymbol, KtTypeMappingMode.RETURN_TYPE)
+                    propertySymbol.returnType.asPsiType(this@FirLightFieldForPropertySymbol, KtTypeMappingMode.RETURN_TYPE)
                 }
             }
         } ?: nonExistentType()
@@ -93,7 +93,7 @@ internal class FirLightFieldForPropertySymbol(
 
         val nullability = if (!(propertySymbol is KtKotlinPropertySymbol && propertySymbol.isLateInit)) {
             analyzeWithSymbolAsContext(propertySymbol) {
-                getTypeNullability(propertySymbol.type)
+                getTypeNullability(propertySymbol.returnType)
             }
         } else NullabilityType.Unknown