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

plugins/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/FirPluginPrototypeExtensionRegistrar.kt

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
 import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
 import org.jetbrains.kotlin.fir.plugin.generators.*
 import org.jetbrains.kotlin.fir.plugin.types.FirNumberSignAttributeExtension
-import org.jetbrains.kotlin.fir.plugin.types.ComposableLikeFunctionalTypeKindExtension
+import org.jetbrains.kotlin.fir.plugin.types.ComposableLikeFunctionTypeKindExtension
 import org.jetbrains.kotlin.ir.plugin.GeneratedDeclarationsIrBodyFiller
 
 class FirPluginPrototypeExtensionRegistrar : FirExtensionRegistrar() {
@@ -24,7 +24,7 @@ class FirPluginPrototypeExtensionRegistrar : FirExtensionRegistrar() {
         +::PluginAdditionalCheckers
         +::FirNumberSignAttributeExtension
         +::AlgebraReceiverInjector
-        +::ComposableLikeFunctionalTypeKindExtension
+        +::ComposableLikeFunctionTypeKindExtension
 
         // Declaration generators
         +::TopLevelDeclarationsGenerator

plugins/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/types/ComposableLikeFunctionTypeKindExtension.kt

@@ -5,16 +5,16 @@
 
 package org.jetbrains.kotlin.fir.plugin.types
 
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
 import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.extensions.FirFunctionalTypeKindExtension
+import org.jetbrains.kotlin.fir.extensions.FirFunctionTypeKindExtension
 import org.jetbrains.kotlin.fir.plugin.fqn
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
-class ComposableLikeFunctionalTypeKindExtension(session: FirSession) : FirFunctionalTypeKindExtension(session) {
-    override fun FunctionalTypeKindRegistrar.registerKinds() {
+class ComposableLikeFunctionTypeKindExtension(session: FirSession) : FirFunctionTypeKindExtension(session) {
+    override fun FunctionTypeKindRegistrar.registerKinds() {
         registerKind(ComposableFunction, KComposableFunction)
     }
 }
@@ -22,7 +22,7 @@ class ComposableLikeFunctionalTypeKindExtension(session: FirSession) : FirFuncti
 private val COMPOSABLE_PACKAGE_FQN = FqName.topLevel(Name.identifier("some"))
 private val MY_COMPOSABLE_ANNOTATION_CLASS_ID = ClassId.topLevel("MyComposable".fqn())
 
-object ComposableFunction : FunctionalTypeKind(
+object ComposableFunction : FunctionTypeKind(
     COMPOSABLE_PACKAGE_FQN,
     "MyComposableFunction",
     MY_COMPOSABLE_ANNOTATION_CLASS_ID,
@@ -31,14 +31,14 @@ object ComposableFunction : FunctionalTypeKind(
     override val prefixForTypeRender: String
         get() = "@MyComposable"
 
-    override fun reflectKind(): FunctionalTypeKind = KComposableFunction
+    override fun reflectKind(): FunctionTypeKind = KComposableFunction
 }
 
-object KComposableFunction : FunctionalTypeKind(
+object KComposableFunction : FunctionTypeKind(
     COMPOSABLE_PACKAGE_FQN,
     "KMyComposableFunction",
     MY_COMPOSABLE_ANNOTATION_CLASS_ID,
     isReflectType = true
 ) {
-    override fun nonReflectKind(): FunctionalTypeKind = ComposableFunction
+    override fun nonReflectKind(): FunctionTypeKind = ComposableFunction
 }

plugins/fir-plugin-prototype/testData/diagnostics/functionalTypes/ambigousKinds.fir.txt

@@ -1,3 +1,3 @@
 FILE: ambigousKinds.kt
-    public final fun incorrect(block: <ERROR TYPE REF: There are multiple functional kinds for functional type ref>): R|kotlin/Unit| {
+    public final fun incorrect(block: <ERROR TYPE REF: There are multiple function kinds for functional type ref>): R|kotlin/Unit| {
     }

plugins/fir-plugin-prototype/testData/diagnostics/functionalTypes/ambigousKinds.kt

@@ -1,3 +1,3 @@
 import org.jetbrains.kotlin.fir.plugin.MyComposable
 
-fun incorrect(block: <!AMBIGUOUS_FUNCTIONAL_TYPE_KIND!>@MyComposable suspend () -> Unit<!>) {}
+fun incorrect(block: <!AMBIGUOUS_FUNCTION_TYPE_KIND!>@MyComposable suspend () -> Unit<!>) {}

plugins/parcelize/parcelize-compiler/parcelize.k2/src/org/jetbrains/kotlin/parcelize/fir/diagnostics/FirParcelizePropertyChecker.kt

@@ -114,7 +114,7 @@ object FirParcelizePropertyChecker : FirPropertyChecker() {
             type.anySuperTypeConstructor {
                 it is ConeKotlinType &&
                         (it.classId?.asFqNameString() in BuiltinParcelableTypes.PARCELABLE_SUPERTYPE_FQNAMES ||
-                                it.isSomeFunctionalType(session))
+                                it.isSomeFunctionType(session))
             }
         }
     }

plugins/sam-with-receiver/sam-with-receiver.k2/src/org/jetbrains/kotlin/samWithReceiver/k2/FirSamWithReceiverConventionTransformer.kt

@@ -5,29 +5,29 @@
 
 package org.jetbrains.kotlin.samWithReceiver.k2
 
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.containingClassLookupTag
 import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
 import org.jetbrains.kotlin.fir.resolve.FirSamConversionTransformerExtension
-import org.jetbrains.kotlin.fir.resolve.createFunctionalType
+import org.jetbrains.kotlin.fir.resolve.createFunctionType
 import org.jetbrains.kotlin.fir.resolve.toFirRegularClassSymbol
 import org.jetbrains.kotlin.fir.types.ConeLookupTagBasedType
 import org.jetbrains.kotlin.fir.types.coneType
-import org.jetbrains.kotlin.fir.types.functionalTypeService
+import org.jetbrains.kotlin.fir.types.functionTypeService
 import org.jetbrains.kotlin.utils.addToStdlib.runIf
 
 class FirSamWithReceiverConventionTransformer(
     private val annotations: List<String>,
     session: FirSession
 ) : FirSamConversionTransformerExtension(session) {
-    override fun getCustomFunctionalTypeForSamConversion(function: FirSimpleFunction): ConeLookupTagBasedType? {
+    override fun getCustomFunctionTypeForSamConversion(function: FirSimpleFunction): ConeLookupTagBasedType? {
         val containingClassSymbol = function.containingClassLookupTag()?.toFirRegularClassSymbol(session) ?: return null
         return runIf(containingClassSymbol.resolvedAnnotationClassIds.any { it.asSingleFqName().asString() in annotations }) {
             val parameterTypes = function.valueParameters.map { it.returnTypeRef.coneType }
             if (parameterTypes.isEmpty()) return null
-            val kind = session.functionalTypeService.extractSingleSpecialKindForFunction(function.symbol) ?: FunctionalTypeKind.Function
-            createFunctionalType(
+            val kind = session.functionTypeService.extractSingleSpecialKindForFunction(function.symbol) ?: FunctionTypeKind.Function
+            createFunctionType(
                 kind,
                 parameters = parameterTypes.subList(1, parameterTypes.size),
                 receiverType = parameterTypes[0],

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt

@@ -8,7 +8,7 @@
 package org.jetbrains.kotlin.scripting.compiler.plugin.impl
 
 import com.intellij.openapi.Disposable
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
@@ -45,11 +45,11 @@ import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
 import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
 import org.jetbrains.kotlin.fir.extensions.extensionService
 import org.jetbrains.kotlin.fir.resolve.FirSamConversionTransformerExtension
-import org.jetbrains.kotlin.fir.resolve.createFunctionalType
+import org.jetbrains.kotlin.fir.resolve.createFunctionType
 import org.jetbrains.kotlin.fir.resolve.toFirRegularClassSymbol
 import org.jetbrains.kotlin.fir.types.ConeLookupTagBasedType
 import org.jetbrains.kotlin.fir.types.coneType
-import org.jetbrains.kotlin.fir.types.functionalTypeService
+import org.jetbrains.kotlin.fir.types.functionTypeService
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.jvm.isJvm
 import org.jetbrains.kotlin.psi.KtFile
@@ -154,13 +154,13 @@ internal class FirScriptingSamWithReceiverExtensionRegistrar() : FirExtensionReg
             }
         }
 
-        override fun getCustomFunctionalTypeForSamConversion(function: FirSimpleFunction): ConeLookupTagBasedType? {
+        override fun getCustomFunctionTypeForSamConversion(function: FirSimpleFunction): ConeLookupTagBasedType? {
             val containingClassSymbol = function.containingClassLookupTag()?.toFirRegularClassSymbol(session) ?: return null
             return runIf(containingClassSymbol.resolvedAnnotationClassIds.any { it.asSingleFqName().asString() in knownAnnotations }) {
                 val parameterTypes = function.valueParameters.map { it.returnTypeRef.coneType }
                 if (parameterTypes.isEmpty()) return null
-                val kind = session.functionalTypeService.extractSingleSpecialKindForFunction(function.symbol) ?: FunctionalTypeKind.Function
-                createFunctionalType(
+                val kind = session.functionTypeService.extractSingleSpecialKindForFunction(function.symbol) ?: FunctionTypeKind.Function
+                createFunctionType(
                     kind,
                     parameters = parameterTypes.subList(1, parameterTypes.size),
                     receiverType = parameterTypes[0],