Merge branch 'JetBrains:master' into master

Author: OoARIFINoO

.github/CODEOWNERS

@@ -255,10 +255,8 @@
 /kotlin-js-store/ [email protected]
 
 /kotlin-native/ @JetBrains/kotlin-native
-/kotlin-native/runtime/ [email protected] [email protected]
 /kotlin-native/runtime/src/main/kotlin/ @JetBrains/kotlin-native [email protected] [email protected] [email protected]
 /kotlin-native/runtime/test @JetBrains/kotlin-native [email protected] [email protected] [email protected]
-/kotlin-native/runtime/**/*.mm [email protected] [email protected] [email protected] [email protected]
 /kotlin-native/licenses/ @JetBrains/kotlin-build-infrastructure
 /kotlin-native/klib/ @JetBrains/kotlin-common-backend
 /kotlin-native/tools/benchmarks @JetBrains/kotlin-native @JetBrains/kotlin-performance-qa

.idea/kotlinTestDataPluginTestDataPaths.xml

@@ -293,10 +293,8 @@
 /kotlin-js-store/ [email protected]
 
 /kotlin-native/ "Kotlin Native"
-/kotlin-native/runtime/ [email protected] [email protected]
 /kotlin-native/runtime/src/main/kotlin/ "Kotlin Native" [email protected] [email protected] [email protected]
 /kotlin-native/runtime/test "Kotlin Native" [email protected] [email protected] [email protected]
-/kotlin-native/runtime/**/*.mm [email protected] [email protected] [email protected] [email protected]
 /kotlin-native/licenses/ "Kotlin Build Infrastructure"
 /kotlin-native/klib/ "Kotlin Common Backend"
 /kotlin-native/tools/benchmarks "Kotlin Native" "Kotlin Performance QA"

.space/CODEOWNERS

@@ -61,6 +61,7 @@ internal class KaFe10FunctionType(
     override val isReflectType: Boolean
         get() = withValidityAssertion { descriptor.functionTypeKind.isReflectType }
 
+    @Deprecated("Use `parameters.size` instead. See KT-80545", ReplaceWith("parameters.size"))
     override val arity: Int
         get() = withValidityAssertion { descriptor.arity }
 

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/types/KaFe10FunctionType.kt

@@ -73,6 +73,7 @@ internal class KaFirFunctionType(
     override val isReflectType: Boolean
         get() = withValidityAssertion { coneType.functionTypeKind(builder.rootSession)?.isReflectType == true }
 
+    @Deprecated("Use `parameters.size` instead. See KT-80545", replaceWith = ReplaceWith("parameters.size"))
     override val arity: Int get() = withValidityAssertion { parameterTypes.size }
 
     @KaExperimentalApi

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/types/KaFirFunctionType.kt

@@ -5,11 +5,7 @@
 
 package org.jetbrains.kotlin.analysis.api.types
 
-import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
-import org.jetbrains.kotlin.analysis.api.KaImplementationDetail
-import org.jetbrains.kotlin.analysis.api.KaK1Unsupported
-import org.jetbrains.kotlin.analysis.api.KaNonPublicApi
-import org.jetbrains.kotlin.analysis.api.KaSession
+import org.jetbrains.kotlin.analysis.api.*
 import org.jetbrains.kotlin.analysis.api.annotations.KaAnnotated
 import org.jetbrains.kotlin.analysis.api.base.KaContextReceiversOwner
 import org.jetbrains.kotlin.analysis.api.lifetime.KaLifetimeOwner
@@ -315,6 +311,7 @@ public abstract class KaFunctionType : KaClassType(), KaContextReceiversOwner {
     /**
      * The function's arity, i.e. the number of [*parameter types*][parameterTypes].
      */
+    @Deprecated("Use `parameters.size` instead. See KT-80545", ReplaceWith("parameters.size"))
     public abstract val arity: Int
 
     /**

analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/types/KaType.kt

@@ -54,7 +54,6 @@ CONSTRUCTOR:
       returnType: KaFunctionType:
         abbreviation: null
         annotations: []
-        arity: 1
         classId: kotlin/Function1
         contextReceivers: []
         hasContextReceivers: false

analysis/analysis-api/testData/components/symbolInfoProvider/samClassBySamConstructor/samClass.dependent.fir.txt

@@ -54,7 +54,6 @@ CONSTRUCTOR:
       returnType: KaFunctionType:
         abbreviation: null
         annotations: []
-        arity: 1
         classId: kotlin/Function1
         contextReceivers: []
         hasContextReceivers: false

analysis/analysis-api/testData/components/symbolInfoProvider/samClassBySamConstructor/samClass.descriptors.txt

@@ -54,7 +54,6 @@ CONSTRUCTOR:
       returnType: KaFunctionType:
         abbreviation: null
         annotations: []
-        arity: 1
         classId: kotlin/Function1
         contextReceivers: []
         hasContextReceivers: false

analysis/analysis-api/testData/components/symbolInfoProvider/samClassBySamConstructor/samClass.txt

@@ -54,7 +54,6 @@ CONSTRUCTOR:
       returnType: KaFunctionType:
         abbreviation: null
         annotations: []
-        arity: 1
         classId: kotlin/Function1
         contextReceivers: []
         hasContextReceivers: false