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

FIR Java: use different names for anonymous parameters (p0, p1, p2, ...)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-11-11 13:43:46 +03:00
parent c657d46437
commit 26281bfe89
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
+6 -6
View File
@@ -223,9 +223,9 @@ class JavaSymbolProvider(
).apply {
this.typeParameters += javaMethod.typeParameters.convertTypeParameters(javaTypeParameterStack)
addAnnotationsFrom(this@JavaSymbolProvider.session, javaMethod, javaTypeParameterStack)
for (valueParameter in javaMethod.valueParameters) {
valueParameters += valueParameter.toFirValueParameters(
this@JavaSymbolProvider.session, javaTypeParameterStack
for ((index, valueParameter) in javaMethod.valueParameters.withIndex()) {
valueParameters += valueParameter.toFirValueParameter(
this@JavaSymbolProvider.session, index, javaTypeParameterStack
)
}
}
@@ -271,9 +271,9 @@ class JavaSymbolProvider(
).apply {
this.typeParameters += javaConstructor.typeParameters.convertTypeParameters(javaTypeParameterStack)
addAnnotationsFrom(this@JavaSymbolProvider.session, javaConstructor, javaTypeParameterStack)
for (valueParameter in javaConstructor.valueParameters) {
valueParameters += valueParameter.toFirValueParameters(
this@JavaSymbolProvider.session, javaTypeParameterStack
for ((index, valueParameter) in javaConstructor.valueParameters.withIndex()) {
valueParameters += valueParameter.toFirValueParameter(
this@JavaSymbolProvider.session, index, javaTypeParameterStack
)
}
}
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
+4 -4
View File
@@ -197,15 +197,15 @@ internal fun FirAbstractAnnotatedElement.addAnnotationsFrom(
}
}
internal fun JavaValueParameter.toFirValueParameters(
session: FirSession, javaTypeParameterStack: JavaTypeParameterStack
internal fun JavaValueParameter.toFirValueParameter(
session: FirSession, index: Int, javaTypeParameterStack: JavaTypeParameterStack
): FirValueParameter {
return FirJavaValueParameter(
session, (this as? JavaElementImpl<*>)?.psi?.toFirSourceElement(), name ?: Name.special("<anonymous Java parameter>"),
session, (this as? JavaElementImpl<*>)?.psi?.toFirSourceElement(), name ?: Name.identifier("p$index"),
returnTypeRef = type.toFirJavaTypeRef(session, javaTypeParameterStack),
isVararg = isVararg
).apply {
addAnnotationsFrom(session, this@toFirValueParameters, javaTypeParameterStack)
addAnnotationsFrom(session, this@toFirValueParameter, javaTypeParameterStack)
}
}