[FIR] Replace PersistentList with MutableList in Context, simplify DeclarationConverter

This commit is contained in:
Ivan Kochurkin
2021-06-06 19:05:25 +03:00
parent 366017d267
commit 1e430b7b03
5 changed files with 82 additions and 52 deletions
@@ -89,9 +89,7 @@ internal class RawFirNonLocalDeclarationBuilder private constructor(
check(classOrObject is KtClassOrObject)
withChildClassName(classOrObject.nameAsSafeName, false) {
withCapturedTypeParameters {
if (!parent.isInner) context.capturedTypeParameters = context.capturedTypeParameters.clear()
addCapturedTypeParameters(parent.typeParameters.take(classOrObject.typeParameters.size))
withCapturedTypeParameters(parent.isInner, parent.typeParameters.subList(0, classOrObject.typeParameters.size)) {
registerSelfType(classOrObject.toDelegatedSelfType(parent))
return moveNext(iterator, parent)
}