diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt b/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt index 1a50e854581..48a14085868 100644 --- a/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt +++ b/analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt @@ -200,7 +200,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int @@ -224,7 +224,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int @@ -310,7 +310,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Long @@ -334,7 +334,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Long @@ -420,7 +420,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/String @@ -444,7 +444,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/String @@ -530,7 +530,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Long @@ -554,7 +554,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Long @@ -643,7 +643,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/String @@ -667,7 +667,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/String @@ -756,7 +756,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/String @@ -780,7 +780,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/String @@ -1137,7 +1137,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Long @@ -1161,7 +1161,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Long diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt index 8da1a4edd8f..286ec8c555a 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt @@ -76,7 +76,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int @@ -103,7 +103,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt index acc3ad3462c..d91710bff50 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt @@ -175,7 +175,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int @@ -199,7 +199,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int @@ -291,7 +291,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int @@ -315,7 +315,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt index 738ea37cbc0..e6e49f41fe8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt @@ -65,7 +65,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Long @@ -89,7 +89,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Long @@ -178,7 +178,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int @@ -202,7 +202,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt index 07c278b1d52..0ff84cc30cf 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt @@ -69,7 +69,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int @@ -93,7 +93,7 @@ KtKotlinPropertySymbol: isImplicitLambdaParameter: false isNoinline: false isVararg: false - name: + name: value origin: SOURCE receiverType: null returnType: kotlin/Int diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSetterParameter.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSetterParameter.kt index 9089e838945..fa3f7746eeb 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSetterParameter.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSetterParameter.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.light.classes.symbol.NullabilityType import org.jetbrains.kotlin.light.classes.symbol.annotations.computeAnnotations import org.jetbrains.kotlin.light.classes.symbol.methods.SymbolLightMethodBase import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList +import org.jetbrains.kotlin.name.SpecialNames context(KtAnalysisSession) internal class SymbolLightSetterParameter( @@ -25,6 +26,12 @@ internal class SymbolLightSetterParameter( containingMethod: SymbolLightMethodBase ) : SymbolLightParameterCommon(parameterSymbol, containingMethod) { + override fun getName(): String { + if (containingPropertySymbol.setter?.isDefault != false) + return SpecialNames.IMPLICIT_SET_PARAMETER.asString() + return super.getName() + } + private val _annotations: List by lazyPub { val annotationsFromSetter = parameterSymbol.computeAnnotations( parent = this, diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt index 400b9abcde3..21397724726 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt @@ -1350,7 +1350,7 @@ class DeclarationsConverter( moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = propertyTypeRefToUse - symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER) + symbol = FirValueParameterSymbol(StandardNames.DEFAULT_VALUE_PARAMETER) } var block: LighterASTNode? = null var expression: LighterASTNode? = null diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index 4d103d054bd..0308be4a745 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.builder import com.intellij.psi.PsiElement import com.intellij.psi.tree.IElementType import org.jetbrains.kotlin.* +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality @@ -422,7 +423,7 @@ open class RawFirBuilder( moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = propertyTypeRefToUse - symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER) + symbol = FirValueParameterSymbol(StandardNames.DEFAULT_VALUE_PARAMETER) annotations += parameterAnnotationsFromProperty } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt index 6b2b1f070d3..1b7e295aa42 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility @@ -139,7 +140,7 @@ class FirDefaultPropertySetter( this@builder.moduleData = moduleData this@builder.origin = origin this@builder.returnTypeRef = propertyTypeRef - this@builder.symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER) + this@builder.symbol = FirValueParameterSymbol(StandardNames.DEFAULT_VALUE_PARAMETER) this@builder.annotations += parameterAnnotations } ),