[FIR] Use AST nodes only for lambda parameter names
Eighth step for ^KT-52615 Merge-request: KT-MR-8700 Merged-by: Egor Kulikov <Egor.Kulikov@jetbrains.com>
This commit is contained in:
+1
-1
@@ -2316,7 +2316,7 @@ class DeclarationsConverter(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val name = convertValueParameterName(identifier.nameAsSafeName(), identifier, valueParameterDeclaration)
|
val name = convertValueParameterName(identifier.nameAsSafeName(), valueParameterDeclaration) { identifier }
|
||||||
|
|
||||||
val valueParameterSource = valueParameter.toFirSourceElement()
|
val valueParameterSource = valueParameter.toFirSourceElement()
|
||||||
return ValueParameter(
|
return ValueParameter(
|
||||||
|
|||||||
@@ -578,7 +578,7 @@ open class RawFirBuilder(
|
|||||||
valueParameterDeclaration: ValueParameterDeclaration,
|
valueParameterDeclaration: ValueParameterDeclaration,
|
||||||
additionalAnnotations: List<FirAnnotation>,
|
additionalAnnotations: List<FirAnnotation>,
|
||||||
): FirValueParameter {
|
): FirValueParameter {
|
||||||
val name = convertValueParameterName(nameAsSafeName, nameIdentifier?.node?.text, valueParameterDeclaration)
|
val name = convertValueParameterName(nameAsSafeName, valueParameterDeclaration) { nameIdentifier?.node?.text }
|
||||||
return buildValueParameter {
|
return buildValueParameter {
|
||||||
source = toFirSourceElement()
|
source = toFirSourceElement()
|
||||||
moduleData = baseModuleData
|
moduleData = baseModuleData
|
||||||
@@ -2104,9 +2104,8 @@ open class RawFirBuilder(
|
|||||||
val parameter = clause.catchParameter?.let { ktParameter ->
|
val parameter = clause.catchParameter?.let { ktParameter ->
|
||||||
val name = convertValueParameterName(
|
val name = convertValueParameterName(
|
||||||
ktParameter.nameAsSafeName,
|
ktParameter.nameAsSafeName,
|
||||||
ktParameter.nameIdentifier?.node?.text,
|
|
||||||
ValueParameterDeclaration.CATCH
|
ValueParameterDeclaration.CATCH
|
||||||
)
|
) { ktParameter.nameIdentifier?.node?.text }
|
||||||
|
|
||||||
buildProperty {
|
buildProperty {
|
||||||
source = ktParameter.toFirSourceElement()
|
source = ktParameter.toFirSourceElement()
|
||||||
|
|||||||
+3
-3
@@ -1225,10 +1225,10 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
|
|||||||
|
|
||||||
protected fun convertValueParameterName(
|
protected fun convertValueParameterName(
|
||||||
safeName: Name,
|
safeName: Name,
|
||||||
rawName: String?,
|
valueParameterDeclaration: ValueParameterDeclaration,
|
||||||
valueParameterDeclaration: ValueParameterDeclaration
|
rawName: () -> String?,
|
||||||
): Name {
|
): Name {
|
||||||
return if (valueParameterDeclaration == ValueParameterDeclaration.LAMBDA && rawName == "_"
|
return if (valueParameterDeclaration == ValueParameterDeclaration.LAMBDA && rawName() == "_"
|
||||||
||
|
||
|
||||||
valueParameterDeclaration == ValueParameterDeclaration.CATCH &&
|
valueParameterDeclaration == ValueParameterDeclaration.CATCH &&
|
||||||
safeName.asString() == "_"
|
safeName.asString() == "_"
|
||||||
|
|||||||
Reference in New Issue
Block a user