[FIR] Update type parameter use-sites to use type parameter refs

This commit is contained in:
simon.ogorodnik
2020-04-09 21:38:57 +03:00
parent 7c56209cef
commit cb00a4c136
23 changed files with 98 additions and 79 deletions
@@ -182,7 +182,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
}
}
private fun List<FirTypeParameter>.renderTypeParameters() {
private fun List<FirTypeParameterRef>.renderTypeParameters() {
if (isNotEmpty()) {
print("<")
renderSeparated()
@@ -198,6 +198,10 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
}
}
override fun visitTypeParameterRef(typeParameterRef: FirTypeParameterRef) {
typeParameterRef.symbol.fir.accept(this)
}
override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration) {
memberDeclaration.annotations.renderAnnotations()
if (memberDeclaration !is FirProperty || !memberDeclaration.isLocal) {
@@ -36,13 +36,13 @@ abstract class FirDefaultPropertyAccessor(
session,
resolvePhase = FirResolvePhase.RAW_FIR,
propertyTypeRef,
typeParameters = mutableListOf(),
valueParameters,
body = null,
symbol,
isGetter,
FirDeclarationStatusImpl(visibility, Modality.FINAL),
annotations = mutableListOf(),
typeParameters = mutableListOf(),
) {
override var resolvePhase = FirResolvePhase.BODY_RESOLVE