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

compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt

@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.fir.diagnostics
 
 import org.jetbrains.kotlin.KtSourceElement
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.name.Name
@@ -52,9 +52,9 @@ object ConeDanglingModifierOnTopLevel : ConeDiagnostic {
         get() = "Top level declaration expected"
 }
 
-class ConeAmbiguousFunctionalTypeKinds(val kinds: List<FunctionalTypeKind>) : ConeDiagnostic {
+class ConeAmbiguousFunctionTypeKinds(val kinds: List<FunctionTypeKind>) : ConeDiagnostic {
     override val reason: String
-        get() = "There are multiple functional kinds for functional type ref"
+        get() = "There are multiple function kinds for functional type ref"
 }
 
 enum class DiagnosticKind {

compiler/fir/tree/src/org/jetbrains/kotlin/fir/extensions/FirFunctionTypeKindExtension.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.extensions
+
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
+import org.jetbrains.kotlin.fir.FirSession
+import kotlin.reflect.KClass
+
+abstract class FirFunctionTypeKindExtension(session: FirSession) : FirExtension(session) {
+    companion object {
+        val NAME = FirExtensionPointName("CustomFunctionTypeKindExtension")
+    }
+
+    final override val name: FirExtensionPointName
+        get() = NAME
+
+    final override val extensionType: KClass<out FirExtension>
+        get() = FirFunctionTypeKindExtension::class
+
+    interface FunctionTypeKindRegistrar {
+        fun registerKind(nonReflectKind: FunctionTypeKind, reflectKind: FunctionTypeKind)
+    }
+
+    abstract fun FunctionTypeKindRegistrar.registerKinds()
+
+    fun interface Factory : FirExtension.Factory<FirFunctionTypeKindExtension>
+}
+
+val FirExtensionService.functionTypeKindExtensions: List<FirFunctionTypeKindExtension> by FirExtensionService.registeredExtensions()

compiler/fir/tree/src/org/jetbrains/kotlin/fir/extensions/FirFunctionalTypeKindExtension.kt

@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.extensions
-
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
-import org.jetbrains.kotlin.fir.FirSession
-import kotlin.reflect.KClass
-
-abstract class FirFunctionalTypeKindExtension(session: FirSession) : FirExtension(session) {
-    companion object {
-        val NAME = FirExtensionPointName("CustomFunctionalTypeKindExtension")
-    }
-
-    final override val name: FirExtensionPointName
-        get() = NAME
-
-    final override val extensionType: KClass<out FirExtension>
-        get() = FirFunctionalTypeKindExtension::class
-
-    interface FunctionalTypeKindRegistrar {
-        fun registerKind(nonReflectKind: FunctionalTypeKind, reflectKind: FunctionalTypeKind)
-    }
-
-    abstract fun FunctionalTypeKindRegistrar.registerKinds()
-
-    fun interface Factory : FirExtension.Factory<FirFunctionalTypeKindExtension>
-}
-
-val FirExtensionService.functionalTypeKindExtensions: List<FirFunctionalTypeKindExtension> by FirExtensionService.registeredExtensions()

compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt

@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.fir.renderer
 
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKindExtractor
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKindExtractor
 import org.jetbrains.kotlin.builtins.functions.AllowedToUsedOnlyInK1
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.fir.*
@@ -749,7 +749,7 @@ class FirRenderer(
                 resolvedTypeRef.type,
                 l@{
                     val classId = it.classId ?: return@l null
-                    FunctionalTypeKindExtractor.Default.getFunctionalClassKind(classId.packageFqName, classId.shortClassName.asString())
+                    FunctionTypeKindExtractor.Default.getFunctionalClassKind(classId.packageFqName, classId.shortClassName.asString())
                 }
             )
         }

compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirFunctionTypeKindService.kt

@@ -5,17 +5,17 @@
 
 package org.jetbrains.kotlin.fir.types
 
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKind
-import org.jetbrains.kotlin.builtins.functions.FunctionalTypeKindExtractor
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
+import org.jetbrains.kotlin.builtins.functions.FunctionTypeKindExtractor
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSessionComponent
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
 import org.jetbrains.kotlin.name.FqName
 
-abstract class FirFunctionalTypeKindService : FirSessionComponent {
-    protected abstract val extractor: FunctionalTypeKindExtractor
+abstract class FirFunctionTypeKindService : FirSessionComponent {
+    protected abstract val extractor: FunctionTypeKindExtractor
 
-    fun getKindByClassNamePrefix(packageFqName: FqName, className: String): FunctionalTypeKind? {
+    fun getKindByClassNamePrefix(packageFqName: FqName, className: String): FunctionTypeKind? {
         return extractor.getFunctionalClassKindWithArity(packageFqName, className)?.kind
     }
 
@@ -23,9 +23,9 @@ abstract class FirFunctionalTypeKindService : FirSessionComponent {
         return extractor.hasKindWithSpecificPackage(packageFqName)
     }
 
-    abstract fun extractSingleSpecialKindForFunction(functionSymbol: FirFunctionSymbol<*>): FunctionalTypeKind?
-    abstract fun extractAllSpecialKindsForFunction(functionSymbol: FirFunctionSymbol<*>): List<FunctionalTypeKind>
-    abstract fun extractAllSpecialKindsForFunctionalTypeRef(typeRef: FirFunctionTypeRef): List<FunctionalTypeKind>
+    abstract fun extractSingleSpecialKindForFunction(functionSymbol: FirFunctionSymbol<*>): FunctionTypeKind?
+    abstract fun extractAllSpecialKindsForFunction(functionSymbol: FirFunctionSymbol<*>): List<FunctionTypeKind>
+    abstract fun extractAllSpecialKindsForFunctionTypeRef(typeRef: FirFunctionTypeRef): List<FunctionTypeKind>
 }
 
-val FirSession.functionalTypeService: FirFunctionalTypeKindService by FirSession.sessionComponentAccessor()
+val FirSession.functionTypeService: FirFunctionTypeKindService by FirSession.sessionComponentAccessor()