[FIR] Consistently use _function_ instead of _functional_ in names of classes and functions

2023-01-26 13:35:07 +02:00
parent f268ab8858
commit 89c42e20c9
102 changed files with 573 additions and 574 deletions
@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.types.KtType
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
 import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
@@ -366,7 +366,7 @@ internal object FirToKtConversionCreator {
        ApiVersion::class,
        CallableId::class,
        ClassKind::class,
-        FunctionalTypeKind::class,
+        FunctionTypeKind::class,
    )

    private val KType.kClass: KClass<*>
@@ -487,7 +487,7 @@ internal class KtSymbolByFirBuilder constructor(
        }

        private fun hasFunctionalClassId(coneType: ConeClassLikeTypeImpl): Boolean {
-            return coneType.isSomeFunctionalType(analysisSession.firResolveSession.useSiteFirSession)
+            return coneType.isSomeFunctionType(analysisSession.firResolveSession.useSiteFirSession)
        }

        fun buildKtType(coneType: FirTypeRef): KtType {
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.expressions.*
 import org.jetbrains.kotlin.fir.references.FirNamedReference
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.references.FirSuperReference
-import org.jetbrains.kotlin.fir.resolve.constructFunctionalType
+import org.jetbrains.kotlin.fir.resolve.constructFunctionType
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -113,7 +113,7 @@ internal class KtFirExpressionTypeProvider(
            declaration.toFirAnonymousFunction()
        else
            declaration.getOrBuildFirOfType<FirFunction>(firResolveSession)
-        return firFunction.constructFunctionalType(firFunction.specialFunctionalTypeKind(firResolveSession.useSiteFirSession)).asKtType()
+        return firFunction.constructFunctionType(firFunction.specialFunctionTypeKind(firResolveSession.useSiteFirSession)).asKtType()
    }

    @OptIn(ExperimentalContracts::class)
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.api.fir.types.KtFirType
 import org.jetbrains.kotlin.analysis.api.fir.types.PublicTypeApproximator
 import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.api.types.KtType
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
 import org.jetbrains.kotlin.fir.resolve.FirSamResolver
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
 import org.jetbrains.kotlin.fir.types.*
@@ -31,9 +31,10 @@ internal class KtFirTypeInfoProvider(
        return samResolver.isSamType(coneType)
    }

-    override fun getFunctionClassKind(type: KtType): FunctionalTypeKind? {
-        return (type as KtFirType).coneType.functionalTypeKind(analysisSession.useSiteSession)
+    override fun getFunctionClassKind(type: KtType): FunctionTypeKind? {
+        return (type as KtFirType).coneType.functionTypeKind(analysisSession.useSiteSession)
    }
+
    override fun canBeNull(type: KtType): Boolean = (type as KtFirType).coneType.canBeNull

    override fun isDenotable(type: KtType): Boolean {
@@ -1814,10 +1814,10 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
            token,
        )
    }
-    add(FirErrors.AMBIGUOUS_FUNCTIONAL_TYPE_KIND) { firDiagnostic ->
-        AmbiguousFunctionalTypeKindImpl(
-            firDiagnostic.a.map { functionalTypeKind ->
-                functionalTypeKind
+    add(FirErrors.AMBIGUOUS_FUNCTION_TYPE_KIND) { firDiagnostic ->
+        AmbiguousFunctionTypeKindImpl(
+            firDiagnostic.a.map { functionTypeKind ->
+                functionTypeKind
            },
            firDiagnostic as KtPsiDiagnostic,
            token,
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtVariableLikeSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtVariableSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtType
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
 import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
@@ -1293,9 +1293,9 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
        abstract val candidates: List<KtSymbol>
    }

-    abstract class AmbiguousFunctionalTypeKind : KtFirDiagnostic<PsiElement>() {
-        override val diagnosticClass get() = AmbiguousFunctionalTypeKind::class
-        abstract val kinds: List<FunctionalTypeKind>
+    abstract class AmbiguousFunctionTypeKind : KtFirDiagnostic<PsiElement>() {
+        override val diagnosticClass get() = AmbiguousFunctionTypeKind::class
+        abstract val kinds: List<FunctionTypeKind>
    }

    abstract class NoContextReceiver : KtFirDiagnostic<KtElement>() {
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtVariableLikeSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtVariableSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtType
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
 import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
@@ -1553,11 +1553,11 @@ internal class NextAmbiguityImpl(
    override val token: KtLifetimeToken,
 ) : KtFirDiagnostic.NextAmbiguity(), KtAbstractFirDiagnostic<PsiElement>

-internal class AmbiguousFunctionalTypeKindImpl(
-    override val kinds: List<FunctionalTypeKind>,
+internal class AmbiguousFunctionTypeKindImpl(
+    override val kinds: List<FunctionTypeKind>,
    override val firDiagnostic: KtPsiDiagnostic,
    override val token: KtLifetimeToken,
-) : KtFirDiagnostic.AmbiguousFunctionalTypeKind(), KtAbstractFirDiagnostic<PsiElement>
+) : KtFirDiagnostic.AmbiguousFunctionTypeKind(), KtAbstractFirDiagnostic<PsiElement>

 internal class NoContextReceiverImpl(
    override val contextReceiverRepresentation: KtType,
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.analysis.api.types.KtFunctionalType
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.types.KtTypeNullability
 import org.jetbrains.kotlin.analysis.low.level.api.fir.util.errorWithFirSpecificEntries
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
 import org.jetbrains.kotlin.name.ClassId
@@ -49,10 +50,10 @@ internal class KtFirFunctionalType(

    override val nullability: KtTypeNullability get() = withValidityAssertion { coneType.nullability.asKtNullability() }

-    override val isSuspend: Boolean get() = withValidityAssertion { coneType.isSuspendFunctionType(builder.rootSession) }
+    override val isSuspend: Boolean get() = withValidityAssertion { coneType.isSuspendOrKSuspendFunctionType(builder.rootSession) }

    override val isReflectType: Boolean
-        get() = withValidityAssertion { coneType.functionalTypeKind(builder.rootSession)?.isReflectType == true }
+        get() = withValidityAssertion { coneType.functionTypeKind(builder.rootSession)?.isReflectType == true }

    override val arity: Int
        get() = withValidityAssertion {