azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fir] change setter parameter name to value

Browse Source
This commit is contained in:
Ilya Kirillov
2022-10-19 00:42:45 +02:00
parent ed1751bbc6
commit 068168bc3c
9 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/scopes/fileScopeTest/fileScope.txt
Vendored
+14 -14
View File
@@ -200,7 +200,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
@@ -224,7 +224,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
@@ -310,7 +310,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Long returnType: kotlin/Long
@@ -334,7 +334,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Long returnType: kotlin/Long
@@ -420,7 +420,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/String returnType: kotlin/String
@@ -444,7 +444,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/String returnType: kotlin/String
@@ -530,7 +530,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Long returnType: kotlin/Long
@@ -554,7 +554,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Long returnType: kotlin/Long
@@ -643,7 +643,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/String returnType: kotlin/String
@@ -667,7 +667,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/String returnType: kotlin/String
@@ -756,7 +756,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/String returnType: kotlin/String
@@ -780,7 +780,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/String returnType: kotlin/String
@@ -1137,7 +1137,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Long returnType: kotlin/Long
@@ -1161,7 +1161,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Long returnType: kotlin/Long
analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt
Vendored
+2 -2
View File
@@ -76,7 +76,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
@@ -103,7 +103,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt
Vendored
+4 -4
View File
@@ -175,7 +175,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
@@ -199,7 +199,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
@@ -291,7 +291,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
@@ -315,7 +315,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt
Vendored
+4 -4
View File
@@ -65,7 +65,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Long returnType: kotlin/Long
@@ -89,7 +89,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Long returnType: kotlin/Long
@@ -178,7 +178,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
@@ -202,7 +202,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt
Vendored
+2 -2
View File
@@ -69,7 +69,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
@@ -93,7 +93,7 @@ KtKotlinPropertySymbol:
isImplicitLambdaParameter: false isImplicitLambdaParameter: false
isNoinline: false isNoinline: false
isVararg: false isVararg: false
name: <set-?> name: value
origin: SOURCE origin: SOURCE
receiverType: null receiverType: null
returnType: kotlin/Int returnType: kotlin/Int
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSetterParameter.kt
+7
View File
@@ -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.annotations.computeAnnotations
import org.jetbrains.kotlin.light.classes.symbol.methods.SymbolLightMethodBase import org.jetbrains.kotlin.light.classes.symbol.methods.SymbolLightMethodBase
import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList
import org.jetbrains.kotlin.name.SpecialNames
context(KtAnalysisSession) context(KtAnalysisSession)
internal class SymbolLightSetterParameter( internal class SymbolLightSetterParameter(
@@ -25,6 +26,12 @@ internal class SymbolLightSetterParameter(
containingMethod: SymbolLightMethodBase containingMethod: SymbolLightMethodBase
) : SymbolLightParameterCommon(parameterSymbol, containingMethod) { ) : 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<PsiAnnotation> by lazyPub { private val _annotations: List<PsiAnnotation> by lazyPub {
val annotationsFromSetter = parameterSymbol.computeAnnotations( val annotationsFromSetter = parameterSymbol.computeAnnotations(
parent = this, parent = this,
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+1 -1
View File
@@ -1350,7 +1350,7 @@ class DeclarationsConverter(
moduleData = baseModuleData moduleData = baseModuleData
origin = FirDeclarationOrigin.Source origin = FirDeclarationOrigin.Source
returnTypeRef = propertyTypeRefToUse returnTypeRef = propertyTypeRefToUse
symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER) symbol = FirValueParameterSymbol(StandardNames.DEFAULT_VALUE_PARAMETER)
} }
var block: LighterASTNode? = null var block: LighterASTNode? = null
var expression: LighterASTNode? = null var expression: LighterASTNode? = null
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+2 -1
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.builder
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.IElementType
import org.jetbrains.kotlin.* import org.jetbrains.kotlin.*
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD
import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
@@ -422,7 +423,7 @@ open class RawFirBuilder(
moduleData = baseModuleData moduleData = baseModuleData
origin = FirDeclarationOrigin.Source origin = FirDeclarationOrigin.Source
returnTypeRef = propertyTypeRefToUse returnTypeRef = propertyTypeRefToUse
symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER) symbol = FirValueParameterSymbol(StandardNames.DEFAULT_VALUE_PARAMETER)
annotations += parameterAnnotationsFromProperty annotations += parameterAnnotationsFromProperty
} }
} }
compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt
+2 -1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations.impl
import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtFakeSourceElementKind
import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtSourceElement
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.EffectiveVisibility
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.descriptors.Visibility
@@ -139,7 +140,7 @@ class FirDefaultPropertySetter(
this@builder.moduleData = moduleData this@builder.moduleData = moduleData
this@builder.origin = origin this@builder.origin = origin
this@builder.returnTypeRef = propertyTypeRef this@builder.returnTypeRef = propertyTypeRef
this@builder.symbol = FirValueParameterSymbol(SpecialNames.IMPLICIT_SET_PARAMETER) this@builder.symbol = FirValueParameterSymbol(StandardNames.DEFAULT_VALUE_PARAMETER)
this@builder.annotations += parameterAnnotations this@builder.annotations += parameterAnnotations
} }
), ),