Analysis API: rename KtCallableSymbol.type -> returnType

2021-11-19 18:56:03 +01:00
parent 9d6da14847
commit 1d1f5ace8f
112 changed files with 436 additions and 436 deletions
@@ -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? =
@@ -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)
    }

@@ -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)
    }

@@ -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)
    }

@@ -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)
    }

@@ -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)
    }

@@ -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 }
@@ -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)
    }

@@ -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
@@ -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()
@@ -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)
    }

@@ -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)
    }

@@ -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)
    }

@@ -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()