Get rid of descriptors, resolved classifiers, + some cleanup

2018-03-23 10:59:07 +03:00
parent 8035be07e2
commit 284b21b2a6
72 changed files with 126 additions and 702 deletions
@@ -1,13 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir
-
-import org.jetbrains.kotlin.fir.descriptors.ConeDescriptor
-
-interface FirBasedDescriptor<E> : ConeDescriptor where E : FirElement, E : FirDescriptorOwner<E> {
-    val fir: E
-    fun bind(e: E)
-}
@@ -1,10 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir
-
-interface FirDescriptorOwner<TElem> where TElem : FirElement, TElem : FirDescriptorOwner<TElem> {
-    val descriptor: FirBasedDescriptor<TElem>
-}
@@ -182,20 +182,10 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
        )
    }

-    override fun visitResolvedEnumEntry(resolvedEnumEntry: FirResolvedEnumEntry) {
-        print("(resolved) ")
-        visitEnumEntry(resolvedEnumEntry)
-    }
-
    override fun visitEnumEntry(enumEntry: FirEnumEntry) {
        visitClass(enumEntry)
    }

-    override fun visitResolvedClass(resolvedClass: FirResolvedClass) {
-        print("(resolved) ")
-        visitClass(resolvedClass)
-    }
-
    override fun visitClass(klass: FirClass) {
        visitMemberDeclaration(klass)
        val attributes = listOfNotNull(
@@ -298,11 +288,6 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
        println("}")
    }

-    override fun visitResolvedTypeAlias(resolvedTypeAlias: FirResolvedTypeAlias) {
-        print("(resolved) ")
-        visitTypeAlias(resolvedTypeAlias)
-    }
-
    override fun visitTypeAlias(typeAlias: FirTypeAlias) {
        typeAlias.annotations.renderAnnotations()
        visitMemberDeclaration(typeAlias)
@@ -311,11 +296,6 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
        println()
    }

-    override fun visitResolvedTypeParameter(resolvedTypeParameter: FirResolvedTypeParameter) {
-        print("(resolved) ")
-        visitTypeParameter(resolvedTypeParameter)
-    }
-
    override fun visitTypeParameter(typeParameter: FirTypeParameter) {
        typeParameter.annotations.renderAnnotations()
        if (typeParameter.isReified) {
@@ -6,10 +6,8 @@
 package org.jetbrains.kotlin.fir.declarations

 import org.jetbrains.kotlin.fir.BaseTransformedType
-import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.VisitedSupertype
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationContainer
-import org.jetbrains.kotlin.fir.visitors.FirTransformer
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
 import org.jetbrains.kotlin.name.FqName

@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.declarations
-
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.fir.FirDescriptorOwner
-import org.jetbrains.kotlin.fir.visitors.FirVisitor
-
-interface FirResolvedClass : FirClass, FirDescriptorOwner<FirResolvedClass> {
-    override val modality: Modality
-
-    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
-        visitor.visitResolvedClass(this, data)
-}
-
-interface FirResolvedEnumEntry : FirEnumEntry, FirDescriptorOwner<FirResolvedEnumEntry> {
-    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
-        visitor.visitResolvedEnumEntry(this, data)
-}
@@ -1,17 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.declarations
-
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.fir.FirDescriptorOwner
-import org.jetbrains.kotlin.fir.visitors.FirVisitor
-
-interface FirResolvedTypeAlias : FirTypeAlias, FirDescriptorOwner<FirResolvedTypeAlias> {
-    override val modality: Modality
-
-    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
-        visitor.visitResolvedTypeAlias(this, data)
-}
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.declarations
-
-import org.jetbrains.kotlin.fir.FirDescriptorOwner
-import org.jetbrains.kotlin.fir.visitors.FirVisitor
-
-interface FirResolvedTypeParameter : FirTypeParameter, FirDescriptorOwner<FirResolvedTypeParameter> {
-
-    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
-        visitor.visitResolvedTypeParameter(this, data)
-}
@@ -19,7 +19,7 @@ abstract class FirAbstractMemberDeclaration(
    psi: PsiElement?,
    name: Name,
    final override val visibility: Visibility,
-    final override val modality: Modality?,
+    override val modality: Modality?,
    override val platformStatus: FirMemberPlatformStatus
 ) : FirAbstractNamedAnnotatedDeclaration(session, psi, name), FirMemberDeclaration {
    final override val typeParameters = mutableListOf<FirTypeParameter>()
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirClass
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirMemberPlatformStatus
-import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.transformInplace
 import org.jetbrains.kotlin.fir.types.FirType
@@ -38,6 +37,9 @@ open class FirClassImpl(
        symbol.bind(this)
    }

+    override val modality: Modality
+        get() = super.modality ?: if (classKind == ClassKind.INTERFACE) Modality.ABSTRACT else Modality.FINAL
+
    override val superTypes = mutableListOf<FirType>()

    override val declarations = mutableListOf<FirDeclaration>()
@@ -38,7 +38,7 @@ class FirDefaultPropertyGetter(
    session: FirSession,
    psi: PsiElement?,
    propertyType: FirType
-): FirDefaultPropertyAccessor(session, psi, isGetter = true) {
+) : FirDefaultPropertyAccessor(session, psi, isGetter = true) {
    override val valueParameters: List<FirValueParameter> = emptyList()

    override var returnType: FirType = propertyType
@@ -54,7 +54,7 @@ class FirDefaultPropertySetter(
    session: FirSession,
    psi: PsiElement?,
    propertyType: FirType
-): FirDefaultPropertyAccessor(session, psi, isGetter = false) {
+) : FirDefaultPropertyAccessor(session, psi, isGetter = false) {
    override val valueParameters = mutableListOf(FirDefaultSetterValueParameter(session, psi, propertyType))

    override var returnType: FirType = FirUnitType(session, psi)
@@ -35,8 +35,10 @@ class FirMemberFunctionImpl(
    receiverType: FirType?,
    returnType: FirType,
    override val body: FirBody?
-) : FirAbstractCallableMember(session, psi, name, visibility, modality, platformStatus, isOverride, receiverType, returnType),
-    FirNamedFunction {
+) : FirAbstractCallableMember(
+    session, psi, name, visibility, modality,
+    platformStatus, isOverride, receiverType, returnType
+), FirNamedFunction {
    override val valueParameters = mutableListOf<FirValueParameter>()

    override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirElement {
@@ -1,21 +0,0 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.declarations.impl
-
-import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.declarations.FirNamedDeclaration
-import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
-import org.jetbrains.kotlin.fir.expressions.FirAnnotationContainer
-import org.jetbrains.kotlin.name.Name
-
-class FirAbstractNamedDeclaration(
-    override val session: FirSession,
-    override val psi: PsiElement?,
-    override val name: Name
-) : FirNamedDeclaration, FirAnnotationContainer {
-    override val annotations = mutableListOf<FirAnnotationCall>()
-}
@@ -1,4 +0,0 @@
-package org.jetbrains.kotlin.fir.declarations.impl
-
-class FirPackageFragmentImpl {
-}
@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.declarations.impl
-
-import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.fir.FirBasedDescriptor
-import org.jetbrains.kotlin.fir.declarations.FirClass
-import org.jetbrains.kotlin.fir.declarations.FirResolvedClass
-import org.jetbrains.kotlin.fir.visitors.FirVisitor
-import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
-
-class FirResolvedClassImpl(val delegate: FirClass, override val descriptor: FirBasedDescriptor<FirResolvedClass>) :
-    FirResolvedClass, FirClass by delegate {
-
-    init {
-        symbol.bind(this)
-        descriptor.bind(this)
-    }
-
-    override val modality: Modality
-        get() = delegate.modality ?: if (classKind == ClassKind.INTERFACE) Modality.ABSTRACT else Modality.FINAL
-
-    override fun accept(visitor: FirVisitorVoid) {
-        super<FirResolvedClass>.accept(visitor)
-    }
-
-    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R {
-        return super<FirResolvedClass>.accept(visitor, data)
-    }
-}
@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.declarations.impl
-
-import org.jetbrains.kotlin.fir.FirBasedDescriptor
-import org.jetbrains.kotlin.fir.declarations.FirEnumEntry
-import org.jetbrains.kotlin.fir.declarations.FirResolvedEnumEntry
-import org.jetbrains.kotlin.fir.visitors.FirVisitor
-import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
-
-class FirResolvedEnumEntryImpl(
-    val delegate: FirEnumEntry,
-    override val descriptor: FirBasedDescriptor<FirResolvedEnumEntry>
-) : FirResolvedEnumEntry, FirEnumEntry by delegate {
-
-    init {
-        symbol.bind(this)
-        descriptor.bind(this)
-    }
-
-    override fun accept(visitor: FirVisitorVoid) {
-        super<FirResolvedEnumEntry>.accept(visitor)
-    }
-
-    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R {
-        return super<FirResolvedEnumEntry>.accept(visitor, data)
-    }
-}
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.declarations.impl
-
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.fir.FirBasedDescriptor
-import org.jetbrains.kotlin.fir.declarations.FirResolvedTypeAlias
-import org.jetbrains.kotlin.fir.declarations.FirTypeAlias
-import org.jetbrains.kotlin.fir.visitors.FirVisitor
-import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
-
-class FirResolvedTypeAliasImpl(val delegate: FirTypeAlias, override val descriptor: FirBasedDescriptor<FirResolvedTypeAlias>) :
-    FirResolvedTypeAlias, FirTypeAlias by delegate {
-
-    override val modality: Modality
-        get() = delegate.modality ?: Modality.FINAL
-
-    init {
-        symbol.bind(this)
-        descriptor.bind(this)
-    }
-
-    override fun accept(visitor: FirVisitorVoid) {
-        return super<FirResolvedTypeAlias>.accept(visitor)
-    }
-
-    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R {
-        return super<FirResolvedTypeAlias>.accept(visitor, data)
-    }
-}
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.declarations.impl
-
-import org.jetbrains.kotlin.fir.FirBasedDescriptor
-import org.jetbrains.kotlin.fir.declarations.FirResolvedTypeParameter
-import org.jetbrains.kotlin.fir.declarations.FirTypeParameter
-import org.jetbrains.kotlin.fir.visitors.FirVisitor
-import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
-
-class FirResolvedTypeParameterImpl(val delegate: FirTypeParameter, override val descriptor: FirBasedDescriptor<FirResolvedTypeParameter>) :
-    FirResolvedTypeParameter, FirTypeParameter by delegate {
-
-    init {
-        symbol.bind(this)
-        descriptor.bind(this)
-    }
-
-    override fun accept(visitor: FirVisitorVoid) {
-        return super<FirResolvedTypeParameter>.accept(visitor)
-    }
-
-    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R {
-        return super<FirResolvedTypeParameter>.accept(visitor, data)
-    }
-}
@@ -33,6 +33,9 @@ class FirTypeAliasImpl(
        symbol.bind(this)
    }

+    override val modality: Modality
+        get() = super.modality ?: Modality.FINAL
+
    override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirElement {
        typeParameters.transformInplace(transformer, data)
        expandedType = expandedType.transformSingle(transformer, data)
@@ -9,7 +9,6 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
-import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.types.FirType

 class FirAnnotationCallImpl(
@@ -11,9 +11,7 @@ import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.ConeClassSymbol
 import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterSymbol
 import org.jetbrains.kotlin.fir.types.ConeClassLikeType
-import org.jetbrains.kotlin.fir.types.ConeTypeParameterType
 import org.jetbrains.kotlin.fir.types.coneTypeSafe
-import org.jetbrains.kotlin.fir.types.coneTypeUnsafe
 import org.jetbrains.kotlin.name.ClassId

 class FirClassSymbol(override val classId: ClassId) : ConeClassSymbol, AbstractFirBasedSymbol<FirClass>() {
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.fir.types.FirQualifierPart
 import org.jetbrains.kotlin.fir.types.FirTypeProjection
 import org.jetbrains.kotlin.fir.types.FirUserType
 import org.jetbrains.kotlin.fir.visitors.FirTransformer
-import org.jetbrains.kotlin.types.TypeProjectionBase
 import java.util.*

 class FirUserTypeImpl(
@@ -66,30 +66,14 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
        return transformClass(enumEntry, data)
    }

-    open fun transformResolvedEnumEntry(resolvedEnumEntry: FirResolvedEnumEntry, data: D): CompositeTransformResult<FirDeclaration> {
-        return transformEnumEntry(resolvedEnumEntry, data)
-    }
-
-    open fun transformResolvedClass(resolvedClass: FirResolvedClass, data: D): CompositeTransformResult<FirDeclaration> {
-        return transformClass(resolvedClass, data)
-    }
-
    open fun transformTypeAlias(typeAlias: FirTypeAlias, data: D): CompositeTransformResult<FirDeclaration> {
        return transformMemberDeclaration(typeAlias, data)
    }

-    open fun transformResolvedTypeAlias(resolvedTypeAlias: FirResolvedTypeAlias, data: D): CompositeTransformResult<FirDeclaration> {
-        return transformTypeAlias(resolvedTypeAlias, data)
-    }
-
    open fun transformTypeParameter(typeParameter: FirTypeParameter, data: D): CompositeTransformResult<FirDeclaration> {
        return transformNamedDeclaration(typeParameter, data)
    }

-    open fun transformResolvedTypeParameter(resolvedTypeParameter: FirResolvedTypeParameter, data: D): CompositeTransformResult<FirDeclaration> {
-        return transformTypeParameter(resolvedTypeParameter, data)
-    }
-
    open fun transformProperty(property: FirProperty, data: D): CompositeTransformResult<FirDeclaration> {
        return transformDeclaration(property, data)
    }
@@ -218,10 +202,6 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
        return transformElement(element, data)
    }

-    final override fun visitEnumEntry(enumEntry: FirEnumEntry, data: D): CompositeTransformResult<FirElement> {
-        return transformEnumEntry(enumEntry, data)
-    }
-
    final override fun visitExpression(expression: FirExpression, data: D): CompositeTransformResult<FirElement> {
        return transformExpression(expression, data)
    }
@@ -254,14 +234,6 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
        return transformType(type, data)
    }

-    final override fun visitTypeAlias(typeAlias: FirTypeAlias, data: D): CompositeTransformResult<FirElement> {
-        return transformTypeAlias(typeAlias, data)
-    }
-
-    final override fun visitTypeParameter(typeParameter: FirTypeParameter, data: D): CompositeTransformResult<FirElement> {
-        return transformTypeParameter(typeParameter, data)
-    }
-
    final override fun visitTypeProjection(typeProjection: FirTypeProjection, data: D): CompositeTransformResult<FirElement> {
        return transformTypeProjection(typeProjection, data)
    }
@@ -278,8 +250,8 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
        return transformDelegatedConstructorCall(delegatedConstructorCall, data)
    }

-    final override fun visitResolvedClass(resolvedClass: FirResolvedClass, data: D): CompositeTransformResult<FirElement> {
-        return transformResolvedClass(resolvedClass, data)
+    final override fun visitEnumEntry(enumEntry: FirEnumEntry, data: D): CompositeTransformResult<FirElement> {
+        return transformEnumEntry(enumEntry, data)
    }

    final override fun visitCallableMember(callableMember: FirCallableMember, data: D): CompositeTransformResult<FirElement> {
@@ -310,10 +282,6 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
        return transformAnonymousInitializer(anonymousInitializer, data)
    }

-    final override fun visitResolvedEnumEntry(resolvedEnumEntry: FirResolvedEnumEntry, data: D): CompositeTransformResult<FirElement> {
-        return transformResolvedEnumEntry(resolvedEnumEntry, data)
-    }
-
    final override fun visitBody(body: FirBody, data: D): CompositeTransformResult<FirElement> {
        return transformBody(body, data)
    }
@@ -338,6 +306,14 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
        return transformResolvedImport(resolvedImport, data)
    }

+    final override fun visitTypeAlias(typeAlias: FirTypeAlias, data: D): CompositeTransformResult<FirElement> {
+        return transformTypeAlias(typeAlias, data)
+    }
+
+    final override fun visitTypeParameter(typeParameter: FirTypeParameter, data: D): CompositeTransformResult<FirElement> {
+        return transformTypeParameter(typeParameter, data)
+    }
+
    final override fun visitFile(file: FirFile, data: D): CompositeTransformResult<FirElement> {
        return transformFile(file, data)
    }
@@ -354,14 +330,6 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
        return transformImplicitType(implicitType, data)
    }

-    final override fun visitResolvedTypeAlias(resolvedTypeAlias: FirResolvedTypeAlias, data: D): CompositeTransformResult<FirElement> {
-        return transformResolvedTypeAlias(resolvedTypeAlias, data)
-    }
-
-    final override fun visitResolvedTypeParameter(resolvedTypeParameter: FirResolvedTypeParameter, data: D): CompositeTransformResult<FirElement> {
-        return transformResolvedTypeParameter(resolvedTypeParameter, data)
-    }
-
    final override fun visitStarProjection(starProjection: FirStarProjection, data: D): CompositeTransformResult<FirElement> {
        return transformStarProjection(starProjection, data)
    }
@@ -66,30 +66,14 @@ abstract class FirVisitor<out R, in D> {
        return visitClass(enumEntry, data)
    }

-    open fun visitResolvedEnumEntry(resolvedEnumEntry: FirResolvedEnumEntry, data: D): R {
-        return visitEnumEntry(resolvedEnumEntry, data)
-    }
-
-    open fun visitResolvedClass(resolvedClass: FirResolvedClass, data: D): R {
-        return visitClass(resolvedClass, data)
-    }
-
    open fun visitTypeAlias(typeAlias: FirTypeAlias, data: D): R {
        return visitMemberDeclaration(typeAlias, data)
    }

-    open fun visitResolvedTypeAlias(resolvedTypeAlias: FirResolvedTypeAlias, data: D): R {
-        return visitTypeAlias(resolvedTypeAlias, data)
-    }
-
    open fun visitTypeParameter(typeParameter: FirTypeParameter, data: D): R {
        return visitNamedDeclaration(typeParameter, data)
    }

-    open fun visitResolvedTypeParameter(resolvedTypeParameter: FirResolvedTypeParameter, data: D): R {
-        return visitTypeParameter(resolvedTypeParameter, data)
-    }
-
    open fun visitProperty(property: FirProperty, data: D): R {
        return visitDeclaration(property, data)
    }
@@ -66,30 +66,14 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
        visitClass(enumEntry, null)
    }

-    open fun visitResolvedEnumEntry(resolvedEnumEntry: FirResolvedEnumEntry) {
-        visitEnumEntry(resolvedEnumEntry, null)
-    }
-
-    open fun visitResolvedClass(resolvedClass: FirResolvedClass) {
-        visitClass(resolvedClass, null)
-    }
-
    open fun visitTypeAlias(typeAlias: FirTypeAlias) {
        visitMemberDeclaration(typeAlias, null)
    }

-    open fun visitResolvedTypeAlias(resolvedTypeAlias: FirResolvedTypeAlias) {
-        visitTypeAlias(resolvedTypeAlias, null)
-    }
-
    open fun visitTypeParameter(typeParameter: FirTypeParameter) {
        visitNamedDeclaration(typeParameter, null)
    }

-    open fun visitResolvedTypeParameter(resolvedTypeParameter: FirResolvedTypeParameter) {
-        visitTypeParameter(resolvedTypeParameter, null)
-    }
-
    open fun visitProperty(property: FirProperty) {
        visitDeclaration(property, null)
    }
@@ -218,10 +202,6 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
        visitElement(element)
    }

-    final override fun visitEnumEntry(enumEntry: FirEnumEntry, data: Nothing?) {
-        visitEnumEntry(enumEntry)
-    }
-
    final override fun visitExpression(expression: FirExpression, data: Nothing?) {
        visitExpression(expression)
    }
@@ -254,14 +234,6 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
        visitType(type)
    }

-    final override fun visitTypeAlias(typeAlias: FirTypeAlias, data: Nothing?) {
-        visitTypeAlias(typeAlias)
-    }
-
-    final override fun visitTypeParameter(typeParameter: FirTypeParameter, data: Nothing?) {
-        visitTypeParameter(typeParameter)
-    }
-
    final override fun visitTypeProjection(typeProjection: FirTypeProjection, data: Nothing?) {
        visitTypeProjection(typeProjection)
    }
@@ -278,8 +250,8 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
        visitDelegatedConstructorCall(delegatedConstructorCall)
    }

-    final override fun visitResolvedClass(resolvedClass: FirResolvedClass, data: Nothing?) {
-        visitResolvedClass(resolvedClass)
+    final override fun visitEnumEntry(enumEntry: FirEnumEntry, data: Nothing?) {
+        visitEnumEntry(enumEntry)
    }

    final override fun visitCallableMember(callableMember: FirCallableMember, data: Nothing?) {
@@ -310,10 +282,6 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
        visitAnonymousInitializer(anonymousInitializer)
    }

-    final override fun visitResolvedEnumEntry(resolvedEnumEntry: FirResolvedEnumEntry, data: Nothing?) {
-        visitResolvedEnumEntry(resolvedEnumEntry)
-    }
-
    final override fun visitBody(body: FirBody, data: Nothing?) {
        visitBody(body)
    }
@@ -338,6 +306,14 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
        visitResolvedImport(resolvedImport)
    }

+    final override fun visitTypeAlias(typeAlias: FirTypeAlias, data: Nothing?) {
+        visitTypeAlias(typeAlias)
+    }
+
+    final override fun visitTypeParameter(typeParameter: FirTypeParameter, data: Nothing?) {
+        visitTypeParameter(typeParameter)
+    }
+
    final override fun visitFile(file: FirFile, data: Nothing?) {
        visitFile(file)
    }
@@ -354,14 +330,6 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
        visitImplicitType(implicitType)
    }

-    final override fun visitResolvedTypeAlias(resolvedTypeAlias: FirResolvedTypeAlias, data: Nothing?) {
-        visitResolvedTypeAlias(resolvedTypeAlias)
-    }
-
-    final override fun visitResolvedTypeParameter(resolvedTypeParameter: FirResolvedTypeParameter, data: Nothing?) {
-        visitResolvedTypeParameter(resolvedTypeParameter)
-    }
-
    final override fun visitStarProjection(starProjection: FirStarProjection, data: Nothing?) {
        visitStarProjection(starProjection)
    }