FIR IDE: get rid of constructor value parameter symbols

idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirIconProvider.kt

@@ -40,7 +40,7 @@ internal object KotlinFirIconProvider {
             }
         }
 
-        if (symbol is KtParameterSymbol) return KotlinIcons.PARAMETER
+        if (symbol is KtValueParameterSymbol) return KotlinIcons.PARAMETER
 
         if (symbol is KtLocalVariableSymbol) return if (symbol.isVal) KotlinIcons.VAL else KotlinIcons.VAR
 

idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirLookupElementFactory.kt

@@ -394,7 +394,7 @@ private object ShortNamesRenderer {
     fun KtAnalysisSession.renderFunctionParameters(function: KtFunctionSymbol): String =
         function.valueParameters.joinToString(", ", "(", ")") { renderFunctionParameter(it) }
 
-    private fun KtAnalysisSession.renderFunctionParameter(param: KtFunctionParameterSymbol): String =
+    private fun KtAnalysisSession.renderFunctionParameter(param: KtValueParameterSymbol): String =
         "${if (param.isVararg) "vararg " else ""}${param.name.asString()}: ${param.annotatedType.type.render()}"
 }
 

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFunctionLikeSymbol.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 
 abstract class KtFunctionLikeSymbol : KtCallableSymbol(), KtSymbolWithKind {
-    abstract val valueParameters: List<KtParameterSymbol>
+    abstract val valueParameters: List<KtValueParameterSymbol>
 
     abstract override fun createPointer(): KtSymbolPointer<KtFunctionLikeSymbol>
 }
@@ -38,8 +38,6 @@ abstract class KtFunctionSymbol : KtFunctionLikeSymbol(),
     abstract val isInline: Boolean
     abstract val isOverride: Boolean
 
-    abstract override val valueParameters: List<KtFunctionParameterSymbol>
-
     abstract override fun createPointer(): KtSymbolPointer<KtFunctionSymbol>
 }
 
@@ -53,7 +51,5 @@ abstract class KtConstructorSymbol : KtFunctionLikeSymbol(),
 
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER
 
-    abstract override val valueParameters: List<KtConstructorParameterSymbol>
-
     abstract override fun createPointer(): KtSymbolPointer<KtConstructorSymbol>
 }

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPropertyAccessorSymbol.kt

@@ -29,7 +29,7 @@ abstract class KtPropertyGetterSymbol : KtPropertyAccessorSymbol(), KtTypedSymbo
 }
 
 abstract class KtPropertySetterSymbol : KtPropertyAccessorSymbol() {
-    abstract val parameter: KtFunctionParameterSymbol
+    abstract val parameter: KtValueParameterSymbol
 
     abstract override fun createPointer(): KtSymbolPointer<KtPropertySetterSymbol>
 }

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbolProvider.kt

@@ -30,7 +30,7 @@ abstract class KtSymbolProvider : KtAnalysisSessionComponent() {
         else -> error("Cannot build symbol for ${psi::class}")
     }
 
-    abstract fun getParameterSymbol(psi: KtParameter): KtParameterSymbol
+    abstract fun getParameterSymbol(psi: KtParameter): KtValueParameterSymbol
     abstract fun getFileSymbol(psi: KtFile): KtFileSymbol
     abstract fun getFunctionSymbol(psi: KtNamedFunction): KtFunctionSymbol
     abstract fun getConstructorSymbol(psi: KtConstructor<*>): KtConstructorSymbol
@@ -54,7 +54,7 @@ interface KtSymbolProviderMixIn : KtAnalysisSessionMixIn {
     fun KtDeclaration.getSymbol(): KtSymbol =
         analysisSession.symbolProvider.getSymbol(this)
 
-    fun KtParameter.getParameterSymbol(): KtParameterSymbol =
+    fun KtParameter.getParameterSymbol(): KtValueParameterSymbol =
         analysisSession.symbolProvider.getParameterSymbol(this)
 
     fun KtNamedFunction.getFunctionSymbol(): KtFunctionSymbol =

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt

@@ -118,27 +118,11 @@ abstract class KtLocalVariableSymbol : KtVariableSymbol(), KtSymbolWithKind {
     abstract override fun createPointer(): KtSymbolPointer<KtLocalVariableSymbol>
 }
 
-sealed class KtParameterSymbol : KtVariableLikeSymbol(), KtSymbolWithKind, KtAnnotatedSymbol {
-    abstract val hasDefaultValue: Boolean
+abstract class KtValueParameterSymbol : KtVariableLikeSymbol(), KtSymbolWithKind, KtAnnotatedSymbol {
+    final override val symbolKind: KtSymbolKind get() = KtSymbolKind.LOCAL
 
+    abstract val hasDefaultValue: Boolean
     abstract val isVararg: Boolean
 
-    abstract override fun createPointer(): KtSymbolPointer<KtParameterSymbol>
-}
-
-abstract class KtFunctionParameterSymbol : KtParameterSymbol() {
-    final override val symbolKind: KtSymbolKind get() = KtSymbolKind.NON_PROPERTY_PARAMETER
-
-    abstract override fun createPointer(): KtSymbolPointer<KtFunctionParameterSymbol>
-}
-
-abstract class KtConstructorParameterSymbol : KtParameterSymbol() {
-    abstract val constructorParameterKind: KtConstructorParameterSymbolKind
-
-    abstract override fun createPointer(): KtSymbolPointer<KtConstructorParameterSymbol>
-}
-
-
-enum class KtConstructorParameterSymbolKind {
-    VAL_PROPERTY, VAR_PROPERTY, NON_PROPERTY
+    abstract override fun createPointer(): KtSymbolPointer<KtValueParameterSymbol>
 }

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithKind.kt

@@ -15,6 +15,6 @@ interface KtSymbolWithKind : KtSymbol {
 }
 
 enum class KtSymbolKind {
-    TOP_LEVEL, MEMBER, LOCAL, NON_PROPERTY_PARAMETER
+    TOP_LEVEL, MEMBER, LOCAL
 }
 

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameterBaseForSymbol.kt

@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.*
 import org.jetbrains.kotlin.psi.KtParameter
 
 internal abstract class FirLightParameterBaseForSymbol(
-    private val parameterSymbol: KtParameterSymbol,
+    private val parameterSymbol: KtValueParameterSymbol,
     private val containingMethod: FirLightMethod
 ) : FirLightParameter(containingMethod) {
     private val _name: String = parameterSymbol.name.asString()

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightParameterForSymbol.kt

@@ -10,18 +10,19 @@ import com.intellij.psi.PsiModifierList
 import org.jetbrains.kotlin.asJava.classes.lazyPub
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.idea.frontend.api.isValid
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorParameterSymbol
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtParameterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.idea.util.ifTrue
 
 internal class FirLightParameterForSymbol(
-    private val parameterSymbol: KtParameterSymbol,
+    private val parameterSymbol: KtValueParameterSymbol,
     containingMethod: FirLightMethod
 ) : FirLightParameterBaseForSymbol(parameterSymbol, containingMethod) {
 
+    private val isConstructorParameterSymbol = containingMethod.isConstructor
+
     private val _annotations: List<PsiAnnotation> by lazyPub {
 
-        val annotationSite = (parameterSymbol is KtConstructorParameterSymbol).ifTrue {
+        val annotationSite = isConstructorParameterSymbol.ifTrue {
             AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER
         }
 

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/parameters/FirLightSetterParameterForSymbol.kt

@@ -11,12 +11,12 @@ import org.jetbrains.kotlin.asJava.classes.lazyPub
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.idea.asJava.*
 import org.jetbrains.kotlin.idea.frontend.api.isValid
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtParameterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol
 
 internal class FirLightSetterParameterForSymbol(
     private val containingPropertySymbol: KtPropertySymbol,
-    private val parameterSymbol: KtParameterSymbol,
+    private val parameterSymbol: KtValueParameterSymbol,
     containingMethod: FirLightMethod
 ) : FirLightParameterBaseForSymbol(parameterSymbol, containingMethod) {
 

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt

@@ -206,7 +206,7 @@ internal class KtSymbolByFirBuilder private constructor(
         fun buildVariableLikeSymbol(fir: FirVariable<*>): KtVariableLikeSymbol {
             return when (fir) {
                 is FirProperty -> buildVariableSymbol(fir)
-                is FirValueParameter -> buildParameterSymbol(fir)
+                is FirValueParameter -> buildValueParameterSymbol(fir)
                 is FirField -> buildFieldSymbol(fir)
                 is FirEnumEntry -> buildEnumEntrySymbol(fir) // TODO enum entry should not be callable
                 else -> throwUnexpectedElementError(fir)
@@ -242,24 +242,12 @@ internal class KtSymbolByFirBuilder private constructor(
             }
         }
 
-        fun buildParameterSymbol(fir: FirValueParameter): KtParameterSymbol {
-            @Suppress("IntroduceWhenSubject")
-            return when {
-                fir.isConstructorParameter == true -> buildConstructorParameterSymbol(fir)
-                else -> buildFunctionParameterSymbol(fir)
+        fun buildValueParameterSymbol(fir: FirValueParameter): KtValueParameterSymbol {
+            return symbolsCache.cache(fir) {
+                KtFirValueParameterSymbol(fir, resolveState, token, this@KtSymbolByFirBuilder)
             }
         }
 
-        fun buildConstructorParameterSymbol(fir: FirValueParameter): KtFirConstructorValueParameterSymbol {
-            checkRequirementForBuildingSymbol<KtFirConstructorValueParameterSymbol>(fir, fir.isConstructorParameter == true)
-            return symbolsCache.cache(fir) { KtFirConstructorValueParameterSymbol(fir, resolveState, token, this@KtSymbolByFirBuilder) }
-        }
-
-        fun buildFunctionParameterSymbol(fir: FirValueParameter): KtFirFunctionParameterSymbol {
-            checkRequirementForBuildingSymbol<KtFirFunctionParameterSymbol>(fir, fir.isConstructorParameter != true)
-            return symbolsCache.cache(fir) { KtFirFunctionParameterSymbol(fir, resolveState, token, this@KtSymbolByFirBuilder) }
-        }
-
 
         fun buildFieldSymbol(fir: FirField): KtFirJavaFieldSymbol {
             checkRequirementForBuildingSymbol<KtFirJavaFieldSymbol>(fir, fir.isJavaFieldOrSubstitutionOverrideOfJavaField())
@@ -364,7 +352,7 @@ internal class KtSymbolByFirBuilder private constructor(
                 returns() implies requirement
             }
             require(requirement) {
-                "Cannot build ${S::class.simpleName} for ${fir.renderWithType(FirRenderer.RenderMode.WithDeclarationAttributes)}"
+                "Cannot build ${S::class.simpleName} for ${fir.renderWithType(FirRenderer.RenderMode.WithResolvePhases)}"
             }
         }
     }

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt

@@ -801,14 +801,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
     }
     add(FirErrors.KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE) { firDiagnostic ->
         KclassWithNullableTypeParameterInSignatureImpl(
-            firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir),
+            firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir),
             firDiagnostic as FirPsiDiagnostic<*>,
             token,
         )
     }
     add(FirErrors.TYPE_PARAMETER_AS_REIFIED) { firDiagnostic ->
         TypeParameterAsReifiedImpl(
-            firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir),
+            firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir),
             firDiagnostic as FirPsiDiagnostic<*>,
             token,
         )
@@ -833,7 +833,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
     }
     add(FirErrors.EXPRESSION_OF_NULLABLE_TYPE_IN_CLASS_LITERAL_LHS) { firDiagnostic ->
         ExpressionOfNullableTypeInClassLiteralLhsImpl(
-            firSymbolBuilder.buildKtType(firDiagnostic.a),
+            firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a),
             firDiagnostic as FirPsiDiagnostic<*>,
             token,
         )
@@ -1231,14 +1231,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
     }
     add(FirErrors.VAL_REASSIGNMENT_VIA_BACKING_FIELD) { firDiagnostic ->
         ValReassignmentViaBackingFieldImpl(
-            firSymbolBuilder.buildVariableSymbol(firDiagnostic.a.fir as FirProperty),
+            firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir as FirProperty),
             firDiagnostic as FirPsiDiagnostic<*>,
             token,
         )
     }
     add(FirErrors.VAL_REASSIGNMENT_VIA_BACKING_FIELD_ERROR) { firDiagnostic ->
         ValReassignmentViaBackingFieldErrorImpl(
-            firSymbolBuilder.buildVariableSymbol(firDiagnostic.a.fir as FirProperty),
+            firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir as FirProperty),
             firDiagnostic as FirPsiDiagnostic<*>,
             token,
         )
@@ -1314,14 +1314,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
     }
     add(FirErrors.TYPE_PARAMETER_IS_NOT_AN_EXPRESSION) { firDiagnostic ->
         TypeParameterIsNotAnExpressionImpl(
-            firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir),
+            firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir),
             firDiagnostic as FirPsiDiagnostic<*>,
             token,
         )
     }
     add(FirErrors.TYPE_PARAMETER_ON_LHS_OF_DOT) { firDiagnostic ->
         TypeParameterOnLhsOfDotImpl(
-            firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir),
+            firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir),
             firDiagnostic as FirPsiDiagnostic<*>,
             token,
         )

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt

@@ -34,9 +34,9 @@ internal class KtFirAnonymousFunctionSymbol(
         firRef.returnTypeAndAnnotations(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 
-    override val valueParameters: List<KtParameterSymbol> by firRef.withFirAndCache { fir ->
+    override val valueParameters: List<KtValueParameterSymbol> by firRef.withFirAndCache { fir ->
         fir.valueParameters.map { valueParameter ->
-            builder.variableLikeBuilder.buildParameterSymbol(valueParameter)
+            builder.variableLikeBuilder.buildValueParameterSymbol(valueParameter)
         }
     }
 

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt

@@ -21,8 +21,8 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignatu
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
@@ -48,9 +48,9 @@ internal class KtFirConstructorSymbol(
         firRef.returnTypeAndAnnotations(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 
-    override val valueParameters: List<KtConstructorParameterSymbol> by firRef.withFirAndCache { fir ->
+    override val valueParameters: List<KtValueParameterSymbol> by firRef.withFirAndCache { fir ->
         fir.valueParameters.map { valueParameter ->
-            builder.variableLikeBuilder.buildConstructorParameterSymbol(valueParameter)
+            builder.variableLikeBuilder.buildValueParameterSymbol(valueParameter)
         }
     }
 

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorValueParameterSymbol.kt

@@ -1,74 +0,0 @@
-/*
- * Copyright 2010-2020 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.idea.frontend.api.fir.symbols
-
-import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.declarations.FirValueParameter
-import org.jetbrains.kotlin.idea.fir.findPsi
-import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
-import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
-import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
-import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation
-import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds
-import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList
-import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached
-import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
-import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorParameterSymbol
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorParameterSymbolKind
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations
-import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
-import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.Name
-
-internal class KtFirConstructorValueParameterSymbol(
-    fir: FirValueParameter,
-    resolveState: FirModuleResolveState,
-    override val token: ValidityToken,
-    _builder: KtSymbolByFirBuilder
-) : KtConstructorParameterSymbol(), KtFirSymbol<FirValueParameter> {
-    private val builder by weakRef(_builder)
-    override val firRef = firRef(fir, resolveState)
-    override val psi: PsiElement? by firRef.withFirAndCache { fir -> fir.findPsi(fir.session) }
-
-    override val name: Name get() = firRef.withFir { it.name }
-    override val annotatedType: KtTypeAndAnnotations by cached {
-        firRef.returnTypeAndAnnotations(FirResolvePhase.TYPES, builder)
-    }
-    override val symbolKind: KtSymbolKind
-        get() = firRef.withFir { fir ->
-            when {
-                fir.isVal || fir.isVal -> KtSymbolKind.MEMBER
-                else -> KtSymbolKind.NON_PROPERTY_PARAMETER
-            }
-        }
-
-    override val annotations: List<KtAnnotationCall> by cached { firRef.toAnnotationsList() }
-    override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId)
-    override val annotationClassIds: Collection<ClassId> by cached { firRef.getAnnotationClassIds() }
-
-    override val constructorParameterKind: KtConstructorParameterSymbolKind
-        get() = firRef.withFir { fir ->
-            when {
-                fir.isVal -> KtConstructorParameterSymbolKind.VAL_PROPERTY
-                fir.isVar -> KtConstructorParameterSymbolKind.VAR_PROPERTY
-                else -> KtConstructorParameterSymbolKind.NON_PROPERTY
-            }
-        }
-
-    override val hasDefaultValue: Boolean get() = firRef.withFir { it.defaultValue != null }
-
-    override val isVararg: Boolean get() = firRef.withFir { it.isVararg }
-
-    override fun createPointer(): KtSymbolPointer<KtConstructorParameterSymbol> {
-        KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
-        TODO("Creating symbols for library constructor parameters is not supported yet")
-    }
-}

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt

@@ -16,13 +16,13 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAn
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirMemberFunctionSymbolPointer
-import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirMemberPropertySymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirTopLevelFunctionSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignature
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
@@ -45,11 +45,13 @@ internal class KtFirFunctionSymbol(
     override val annotatedType: KtTypeAndAnnotations by cached {
         firRef.returnTypeAndAnnotations(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
-    override val valueParameters: List<KtFirFunctionValueParameterSymbol> by firRef.withFirAndCache { fir ->
+
+    override val valueParameters: List<KtValueParameterSymbol> by firRef.withFirAndCache { fir ->
         fir.valueParameters.map { valueParameter ->
-            builder.variableLikeBuilder.buildFunctionParameterSymbol(valueParameter)
+            builder.variableLikeBuilder.buildValueParameterSymbol(valueParameter)
         }
     }
+
     override val typeParameters by firRef.withFirAndCache { fir ->
         fir.typeParameters.map { typeParameter ->
             builder.classifierBuilder.buildTypeParameterSymbol(typeParameter.symbol.fir)
@@ -97,14 +99,13 @@ internal class KtFirFunctionSymbol(
             KtSymbolKind.TOP_LEVEL -> firRef.withFir { fir ->
                 KtFirTopLevelFunctionSymbolPointer(fir.symbol.callableId, fir.createSignature())
             }
-            KtSymbolKind.MEMBER ->  firRef.withFir { fir ->
+            KtSymbolKind.MEMBER -> firRef.withFir { fir ->
                 KtFirMemberFunctionSymbolPointer(
                     fir.containingClass()?.classId ?: error("ClassId should not be null for member function"),
                     fir.name,
                     fir.createSignature()
                 )
             }
-            KtSymbolKind.NON_PROPERTY_PARAMETER -> error("KtFunction could not be a parameter")
             KtSymbolKind.LOCAL -> throw CanNotCreateSymbolPointerForLocalLibraryDeclarationException(
                 callableIdIfNonLocal?.asString() ?: name.asString()
             )

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt

@@ -110,7 +110,6 @@ internal class KtFirKotlinPropertySymbol(
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         return when (symbolKind) {
             KtSymbolKind.TOP_LEVEL -> TODO("Creating symbol for top level properties is not supported yet")
-            KtSymbolKind.NON_PROPERTY_PARAMETER -> TODO("Creating symbol for top level parameters is not supported yet")
             KtSymbolKind.MEMBER -> firRef.withFir { fir ->
                 KtFirMemberPropertySymbolPointer(
                     fir.containingClass()?.classId ?: error("ClassId should not be null for member property"),

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt

@@ -18,8 +18,8 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotati
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySetterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
@@ -52,8 +52,8 @@ internal class KtFirPropertySetterSymbol(
     override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId)
     override val annotationClassIds: Collection<ClassId> by cached { firRef.getAnnotationClassIds() }
 
-    override val parameter: KtFunctionParameterSymbol by firRef.withFirAndCache { fir ->
-        builder.variableLikeBuilder.buildFunctionParameterSymbol(fir.valueParameters.single())
+    override val parameter: KtValueParameterSymbol by firRef.withFirAndCache { fir ->
+        builder.variableLikeBuilder.buildValueParameterSymbol(fir.valueParameters.single())
     }
 
     override val annotatedType: KtTypeAndAnnotations by cached {

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbolProvider.kt

@@ -33,9 +33,9 @@ internal class KtFirSymbolProvider(
 ) : KtSymbolProvider(), ValidityTokenOwner {
     private val firSymbolProvider by weakRef(firSymbolProvider)
 
-    override fun getParameterSymbol(psi: KtParameter): KtParameterSymbol = withValidityAssertion {
-        psi.withFirDeclarationOfType<FirValueParameter, KtParameterSymbol>(resolveState) {
-            firSymbolBuilder.variableLikeBuilder.buildParameterSymbol(it)
+    override fun getParameterSymbol(psi: KtParameter): KtValueParameterSymbol = withValidityAssertion {
+        psi.withFirDeclarationOfType<FirValueParameter, KtValueParameterSymbol>(resolveState) {
+            firSymbolBuilder.variableLikeBuilder.buildValueParameterSymbol(it)
         }
     }
 

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirValueParameterSymbol.kt

@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotati
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionParameterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
@@ -26,12 +26,12 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 
-internal class KtFirFunctionValueParameterSymbol(
+internal class KtFirValueParameterSymbol(
     fir: FirValueParameter,
     resolveState: FirModuleResolveState,
     override val token: ValidityToken,
     _builder: KtSymbolByFirBuilder
-) : KtFunctionParameterSymbol(), KtFirSymbol<FirValueParameter> {
+) : KtValueParameterSymbol(), KtFirSymbol<FirValueParameter> {
     private val builder by weakRef(_builder)
     override val firRef = firRef(fir, resolveState)
     override val psi: PsiElement? by firRef.withFirAndCache { fir -> fir.findPsi(fir.session) }
@@ -48,7 +48,7 @@ internal class KtFirFunctionValueParameterSymbol(
     override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId)
     override val annotationClassIds: Collection<ClassId> by cached { firRef.getAnnotationClassIds() }
 
-    override fun createPointer(): KtSymbolPointer<KtFunctionParameterSymbol> {
+    override fun createPointer(): KtSymbolPointer<KtValueParameterSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         TODO("Creating pointers for functions parameters from library is not supported yet")
     }

idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt

@@ -23,7 +23,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -44,7 +44,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -65,7 +65,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -86,7 +86,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -107,7 +107,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -128,7 +128,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -149,7 +149,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -191,7 +191,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -212,7 +212,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -233,7 +233,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -254,7 +254,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -275,7 +275,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -296,7 +296,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -359,7 +359,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -380,7 +380,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -401,7 +401,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -422,7 +422,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -443,7 +443,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -464,7 +464,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -485,7 +485,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -506,7 +506,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -527,7 +527,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -548,7 +548,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -569,7 +569,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -590,7 +590,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -611,7 +611,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -632,7 +632,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -653,7 +653,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -674,7 +674,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -695,7 +695,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -716,7 +716,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -737,7 +737,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -758,7 +758,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -779,7 +779,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -800,7 +800,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -821,7 +821,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -842,7 +842,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
+  valueParameters: [KtFirValueParameterSymbol(bitCount)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -863,7 +863,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
+  valueParameters: [KtFirValueParameterSymbol(bitCount)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -884,7 +884,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -905,7 +905,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -926,7 +926,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -947,7 +947,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -968,7 +968,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -989,7 +989,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -1199,7 +1199,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
+  valueParameters: [KtFirValueParameterSymbol(bitCount)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -1220,7 +1220,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -1241,7 +1241,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:

idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.kt

@@ -20,7 +20,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  valueParameters: [KtFirValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -41,7 +41,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(element)]
+  valueParameters: [KtFirValueParameterSymbol(index), KtFirValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -62,7 +62,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(elements)]
+  valueParameters: [KtFirValueParameterSymbol(index), KtFirValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -83,7 +83,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  valueParameters: [KtFirValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -146,7 +146,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  valueParameters: [KtFirValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -167,7 +167,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  valueParameters: [KtFirValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -188,7 +188,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  valueParameters: [KtFirValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -209,7 +209,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  valueParameters: [KtFirValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -230,7 +230,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  valueParameters: [KtFirValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -251,7 +251,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(element)]
+  valueParameters: [KtFirValueParameterSymbol(index), KtFirValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -272,7 +272,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(fromIndex), KtFirFunctionValueParameterSymbol(toIndex)]
+  valueParameters: [KtFirValueParameterSymbol(fromIndex), KtFirValueParameterSymbol(toIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -293,7 +293,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  valueParameters: [KtFirValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -314,7 +314,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  valueParameters: [KtFirValueParameterSymbol(elements)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -335,7 +335,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  valueParameters: [KtFirValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -356,7 +356,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  valueParameters: [KtFirValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -419,7 +419,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  valueParameters: [KtFirValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirKotlinPropertySymbol:
@@ -464,7 +464,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:

idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt

@@ -118,7 +118,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  valueParameters: [KtFirValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -139,7 +139,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  valueParameters: [KtFirValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -160,7 +160,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  valueParameters: [KtFirValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -181,7 +181,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex), KtFirFunctionValueParameterSymbol(endIndex)]
+  valueParameters: [KtFirValueParameterSymbol(beginIndex), KtFirValueParameterSymbol(endIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -202,7 +202,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(codePointOffset)]
+  valueParameters: [KtFirValueParameterSymbol(index), KtFirValueParameterSymbol(codePointOffset)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -223,7 +223,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(dst), KtFirFunctionValueParameterSymbol(dstBegin)]
+  valueParameters: [KtFirValueParameterSymbol(dst), KtFirValueParameterSymbol(dstBegin)]
   visibility: UNKNOWN
 
 KtFirFunctionSymbol:
@@ -244,7 +244,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(srcBegin), KtFirFunctionValueParameterSymbol(srcEnd), KtFirFunctionValueParameterSymbol(dst), KtFirFunctionValueParameterSymbol(dstBegin)]
+  valueParameters: [KtFirValueParameterSymbol(srcBegin), KtFirValueParameterSymbol(srcEnd), KtFirValueParameterSymbol(dst), KtFirValueParameterSymbol(dstBegin)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -265,7 +265,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(srcBegin), KtFirFunctionValueParameterSymbol(srcEnd), KtFirFunctionValueParameterSymbol(dst), KtFirFunctionValueParameterSymbol(dstBegin)]
+  valueParameters: [KtFirValueParameterSymbol(srcBegin), KtFirValueParameterSymbol(srcEnd), KtFirValueParameterSymbol(dst), KtFirValueParameterSymbol(dstBegin)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -286,7 +286,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(charsetName)]
+  valueParameters: [KtFirValueParameterSymbol(charsetName)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -307,7 +307,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(charset)]
+  valueParameters: [KtFirValueParameterSymbol(charset)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -349,7 +349,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(anObject)]
+  valueParameters: [KtFirValueParameterSymbol(anObject)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -370,7 +370,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(sb)]
+  valueParameters: [KtFirValueParameterSymbol(sb)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -391,7 +391,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(cs)]
+  valueParameters: [KtFirValueParameterSymbol(cs)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -412,7 +412,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(anotherString)]
+  valueParameters: [KtFirValueParameterSymbol(anotherString)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -433,7 +433,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(anotherString)]
+  valueParameters: [KtFirValueParameterSymbol(anotherString)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -454,7 +454,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(str)]
+  valueParameters: [KtFirValueParameterSymbol(str)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -475,7 +475,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(toffset), KtFirFunctionValueParameterSymbol(other), KtFirFunctionValueParameterSymbol(ooffset), KtFirFunctionValueParameterSymbol(len)]
+  valueParameters: [KtFirValueParameterSymbol(toffset), KtFirValueParameterSymbol(other), KtFirValueParameterSymbol(ooffset), KtFirValueParameterSymbol(len)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -496,7 +496,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(ignoreCase), KtFirFunctionValueParameterSymbol(toffset), KtFirFunctionValueParameterSymbol(other), KtFirFunctionValueParameterSymbol(ooffset), KtFirFunctionValueParameterSymbol(len)]
+  valueParameters: [KtFirValueParameterSymbol(ignoreCase), KtFirValueParameterSymbol(toffset), KtFirValueParameterSymbol(other), KtFirValueParameterSymbol(ooffset), KtFirValueParameterSymbol(len)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -517,7 +517,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(prefix), KtFirFunctionValueParameterSymbol(toffset)]
+  valueParameters: [KtFirValueParameterSymbol(prefix), KtFirValueParameterSymbol(toffset)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -538,7 +538,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(prefix)]
+  valueParameters: [KtFirValueParameterSymbol(prefix)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -559,7 +559,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(suffix)]
+  valueParameters: [KtFirValueParameterSymbol(suffix)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -601,7 +601,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(ch)]
+  valueParameters: [KtFirValueParameterSymbol(ch)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -622,7 +622,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
+  valueParameters: [KtFirValueParameterSymbol(ch), KtFirValueParameterSymbol(fromIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -643,7 +643,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(str)]
+  valueParameters: [KtFirValueParameterSymbol(str)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -664,7 +664,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(str), KtFirFunctionValueParameterSymbol(fromIndex)]
+  valueParameters: [KtFirValueParameterSymbol(str), KtFirValueParameterSymbol(fromIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -685,7 +685,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
+  valueParameters: [KtFirValueParameterSymbol(ch), KtFirValueParameterSymbol(fromIndex)]
   visibility: PRIVATE
 
 KtFirFunctionSymbol:
@@ -706,7 +706,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(ch)]
+  valueParameters: [KtFirValueParameterSymbol(ch)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -727,7 +727,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
+  valueParameters: [KtFirValueParameterSymbol(ch), KtFirValueParameterSymbol(fromIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -748,7 +748,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(str)]
+  valueParameters: [KtFirValueParameterSymbol(str)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -769,7 +769,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(str), KtFirFunctionValueParameterSymbol(fromIndex)]
+  valueParameters: [KtFirValueParameterSymbol(str), KtFirValueParameterSymbol(fromIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -790,7 +790,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
+  valueParameters: [KtFirValueParameterSymbol(ch), KtFirValueParameterSymbol(fromIndex)]
   visibility: PRIVATE
 
 KtFirFunctionSymbol:
@@ -811,7 +811,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex)]
+  valueParameters: [KtFirValueParameterSymbol(beginIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -832,7 +832,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex), KtFirFunctionValueParameterSymbol(endIndex)]
+  valueParameters: [KtFirValueParameterSymbol(beginIndex), KtFirValueParameterSymbol(endIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -853,7 +853,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex), KtFirFunctionValueParameterSymbol(endIndex)]
+  valueParameters: [KtFirValueParameterSymbol(beginIndex), KtFirValueParameterSymbol(endIndex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -874,7 +874,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(str)]
+  valueParameters: [KtFirValueParameterSymbol(str)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -895,7 +895,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(oldChar), KtFirFunctionValueParameterSymbol(newChar)]
+  valueParameters: [KtFirValueParameterSymbol(oldChar), KtFirValueParameterSymbol(newChar)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -916,7 +916,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(target), KtFirFunctionValueParameterSymbol(replacement)]
+  valueParameters: [KtFirValueParameterSymbol(target), KtFirValueParameterSymbol(replacement)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -937,7 +937,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(regex)]
+  valueParameters: [KtFirValueParameterSymbol(regex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -958,7 +958,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(s)]
+  valueParameters: [KtFirValueParameterSymbol(s)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -979,7 +979,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(regex), KtFirFunctionValueParameterSymbol(replacement)]
+  valueParameters: [KtFirValueParameterSymbol(regex), KtFirValueParameterSymbol(replacement)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -1000,7 +1000,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(regex), KtFirFunctionValueParameterSymbol(replacement)]
+  valueParameters: [KtFirValueParameterSymbol(regex), KtFirValueParameterSymbol(replacement)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -1021,7 +1021,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(regex), KtFirFunctionValueParameterSymbol(limit)]
+  valueParameters: [KtFirValueParameterSymbol(regex), KtFirValueParameterSymbol(limit)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -1042,7 +1042,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(regex)]
+  valueParameters: [KtFirValueParameterSymbol(regex)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -1063,7 +1063,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(locale)]
+  valueParameters: [KtFirValueParameterSymbol(locale)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -1105,7 +1105,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(locale)]
+  valueParameters: [KtFirValueParameterSymbol(locale)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -1231,7 +1231,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  valueParameters: [KtFirValueParameterSymbol(index)]
   visibility: PUBLIC
 
 KtFirNamedClassOrObjectSymbol:
@@ -1276,7 +1276,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(original)]
+  valueParameters: [KtFirValueParameterSymbol(original)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1289,7 +1289,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(value)]
+  valueParameters: [KtFirValueParameterSymbol(value)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1302,7 +1302,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(value), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(count)]
+  valueParameters: [KtFirValueParameterSymbol(value), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1315,7 +1315,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(codePoints), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(count)]
+  valueParameters: [KtFirValueParameterSymbol(codePoints), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1328,7 +1328,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(ascii), KtFirConstructorValueParameterSymbol(hibyte), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(count)]
+  valueParameters: [KtFirValueParameterSymbol(ascii), KtFirValueParameterSymbol(hibyte), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1341,7 +1341,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(ascii), KtFirConstructorValueParameterSymbol(hibyte)]
+  valueParameters: [KtFirValueParameterSymbol(ascii), KtFirValueParameterSymbol(hibyte)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1354,7 +1354,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(length), KtFirConstructorValueParameterSymbol(charsetName)]
+  valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(length), KtFirValueParameterSymbol(charsetName)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1367,7 +1367,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(length), KtFirConstructorValueParameterSymbol(charset)]
+  valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(length), KtFirValueParameterSymbol(charset)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1380,7 +1380,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(charsetName)]
+  valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(charsetName)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1393,7 +1393,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(charset)]
+  valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(charset)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1406,7 +1406,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(length)]
+  valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(length)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1419,7 +1419,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(bytes)]
+  valueParameters: [KtFirValueParameterSymbol(bytes)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1432,7 +1432,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(buffer)]
+  valueParameters: [KtFirValueParameterSymbol(buffer)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1445,7 +1445,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(builder)]
+  valueParameters: [KtFirValueParameterSymbol(builder)]
   visibility: PUBLIC
 
 KtFirConstructorSymbol:
@@ -1458,7 +1458,7 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(value), KtFirConstructorValueParameterSymbol(share)]
+  valueParameters: [KtFirValueParameterSymbol(value), KtFirValueParameterSymbol(share)]
   visibility: UNKNOWN
 
 KtFirConstructorSymbol:
@@ -1471,6 +1471,6 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(count), KtFirConstructorValueParameterSymbol(value)]
+  valueParameters: [KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count), KtFirValueParameterSymbol(value)]
   visibility: UNKNOWN
 */

idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.kt

@@ -22,7 +22,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(p1), KtFirFunctionValueParameterSymbol(p2)]
+  valueParameters: [KtFirValueParameterSymbol(p1), KtFirValueParameterSymbol(p2)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -43,7 +43,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(other)]
+  valueParameters: [KtFirValueParameterSymbol(other)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:

idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.kt

@@ -22,7 +22,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: TOP_LEVEL
   typeParameters: [KtFirTypeParameterSymbol(T)]
-  valueParameters: [KtFirFunctionValueParameterSymbol(element)]
+  valueParameters: [KtFirValueParameterSymbol(element)]
   visibility: PUBLIC
 
 KtFirFunctionSymbol:
@@ -64,6 +64,6 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: TOP_LEVEL
   typeParameters: [KtFirTypeParameterSymbol(T)]
-  valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
+  valueParameters: [KtFirValueParameterSymbol(elements)]
   visibility: PUBLIC
 */

idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.kt

@@ -20,6 +20,6 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  valueParameters: [KtFirValueParameterSymbol(index)]
   visibility: PUBLIC
 */

idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt

@@ -41,6 +41,6 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(index)]
+  valueParameters: [KtFirValueParameterSymbol(index)]
   visibility: PUBLIC
 */

idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt

@@ -1,4 +1,3 @@
-
 annotation class Anno(val param1: String, val param2: Int)
 
 @Anno(param1 = "param", 2)
@@ -11,7 +10,7 @@ class X {
 
 // RESULT
 /*
-KtFirFunctionValueParameterSymbol:
+KtFirValueParameterSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
@@ -19,9 +18,9 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: param1
   origin: SOURCE
-  symbolKind: NON_PROPERTY_PARAMETER
+  symbolKind: LOCAL
 
-KtFirFunctionValueParameterSymbol:
+KtFirValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -29,7 +28,7 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: param2
   origin: SOURCE
-  symbolKind: NON_PROPERTY_PARAMETER
+  symbolKind: LOCAL
 
 KtFirConstructorSymbol:
   annotatedType: [] Anno
@@ -41,7 +40,7 @@ KtFirConstructorSymbol:
   origin: SOURCE
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
+  valueParameters: [KtFirValueParameterSymbol(param1), KtFirValueParameterSymbol(param2)]
   visibility: PUBLIC
 
 KtFirNamedClassOrObjectSymbol:

idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt

@@ -18,7 +18,7 @@ KtFirConstructorSymbol:
   valueParameters: []
   visibility: PUBLIC
 
-KtFirFunctionValueParameterSymbol:
+KtFirValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -26,7 +26,7 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: x
   origin: SOURCE
-  symbolKind: NON_PROPERTY_PARAMETER
+  symbolKind: LOCAL
 
 KtFirConstructorSymbol:
   annotatedType: [] A
@@ -38,10 +38,10 @@ KtFirConstructorSymbol:
   origin: SOURCE
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
+  valueParameters: [KtFirValueParameterSymbol(x)]
   visibility: PUBLIC
 
-KtFirFunctionValueParameterSymbol:
+KtFirValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -49,9 +49,9 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: y
   origin: SOURCE
-  symbolKind: NON_PROPERTY_PARAMETER
+  symbolKind: LOCAL
 
-KtFirFunctionValueParameterSymbol:
+KtFirValueParameterSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
@@ -59,7 +59,7 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: z
   origin: SOURCE
-  symbolKind: NON_PROPERTY_PARAMETER
+  symbolKind: LOCAL
 
 KtFirConstructorSymbol:
   annotatedType: [] A
@@ -71,7 +71,7 @@ KtFirConstructorSymbol:
   origin: SOURCE
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
+  valueParameters: [KtFirValueParameterSymbol(y), KtFirValueParameterSymbol(z)]
   visibility: PUBLIC
 
 KtFirNamedClassOrObjectSymbol:

idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt

@@ -2,7 +2,7 @@ fun foo(x: Int) {}
 
 // RESULT
 /*
-KtFirFunctionValueParameterSymbol:
+KtFirValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -10,7 +10,7 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: x
   origin: SOURCE
-  symbolKind: NON_PROPERTY_PARAMETER
+  symbolKind: LOCAL
 
 KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
@@ -30,6 +30,6 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: TOP_LEVEL
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(x)]
+  valueParameters: [KtFirValueParameterSymbol(x)]
   visibility: PUBLIC
 */

idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt

@@ -9,7 +9,7 @@ KtFirTypeParameterSymbol:
   upperBounds: [kotlin/Any?]
   variance: INVARIANT
 
-KtFirFunctionValueParameterSymbol:
+KtFirValueParameterSymbol:
   annotatedType: [] X
   annotationClassIds: []
   annotations: []
@@ -17,7 +17,7 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: x
   origin: SOURCE
-  symbolKind: NON_PROPERTY_PARAMETER
+  symbolKind: LOCAL
 
 KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
@@ -37,6 +37,6 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: TOP_LEVEL
   typeParameters: [KtFirTypeParameterSymbol(X)]
-  valueParameters: [KtFirFunctionValueParameterSymbol(x)]
+  valueParameters: [KtFirValueParameterSymbol(x)]
   visibility: PUBLIC
 */

idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt

@@ -1,4 +1,3 @@
-
 @Target(AnnotationTarget.TYPE)
 annotation class Anno1
 @Target(AnnotationTarget.TYPE)
@@ -112,7 +111,7 @@ KtFirNamedClassOrObjectSymbol:
   typeParameters: []
   visibility: PUBLIC
 
-KtFirFunctionValueParameterSymbol:
+KtFirValueParameterSymbol:
   annotatedType: [Anno2()] I
   annotationClassIds: []
   annotations: []
@@ -120,7 +119,7 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: arg
   origin: SOURCE
-  symbolKind: NON_PROPERTY_PARAMETER
+  symbolKind: LOCAL
 
 KtFirFunctionSymbol:
   annotatedType: [Anno3()] I
@@ -140,7 +139,7 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: MEMBER
   typeParameters: []
-  valueParameters: [KtFirFunctionValueParameterSymbol(arg)]
+  valueParameters: [KtFirValueParameterSymbol(arg)]
   visibility: PUBLIC
 
 KtFirKotlinPropertySymbol:

idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt

@@ -17,6 +17,6 @@ KtFirConstructorSymbol:
   origin: JAVA
   symbolKind: MEMBER
   typeParameters: [KtFirTypeParameterSymbol(E)]
-  valueParameters: [KtFirConstructorValueParameterSymbol(c)]
+  valueParameters: [KtFirValueParameterSymbol(c)]
   visibility: PUBLIC
 */

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt

@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.idea.frontend.api.calls.KtErrorCallTarget
 import org.jetbrains.kotlin.idea.frontend.api.calls.KtSuccessCallTarget
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionLikeSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtParameterSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtCallExpression
@@ -108,7 +108,7 @@ private fun KtCall.stringRepresentation(): String {
             append(")")
             append(": ${annotatedType.type.render()}")
         }
-        is KtParameterSymbol -> "$name: ${annotatedType.type.render()}"
+        is KtValueParameterSymbol -> "$name: ${annotatedType.type.render()}"
         is KtSuccessCallTarget -> symbol.stringValue()
         is KtErrorCallTarget -> "ERR<${this.diagnostic.defaultMessage}, [${candidates.joinToString { it.stringValue() }}]>"
         is Boolean -> toString()