diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedClassImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedClassImpl.kt index a598c544f52..963f8f3c46f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedClassImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedClassImpl.kt @@ -11,6 +11,7 @@ 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, FirClass by delegate { @@ -22,6 +23,10 @@ class FirResolvedClassImpl(val delegate: FirClass, override val descriptor: FirB override val modality: Modality get() = delegate.modality ?: if (classKind == ClassKind.INTERFACE) Modality.ABSTRACT else Modality.FINAL + override fun accept(visitor: FirVisitorVoid) { + super.accept(visitor) + } + override fun accept(visitor: FirVisitor, data: D): R { return super.accept(visitor, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedTypeAliasImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedTypeAliasImpl.kt index 7664e35d75f..f55e7c86390 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedTypeAliasImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedTypeAliasImpl.kt @@ -10,6 +10,7 @@ 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, FirTypeAlias by delegate { @@ -21,6 +22,10 @@ class FirResolvedTypeAliasImpl(val delegate: FirTypeAlias, override val descript descriptor.bind(this) } + override fun accept(visitor: FirVisitorVoid) { + return super.accept(visitor) + } + override fun accept(visitor: FirVisitor, data: D): R { return super.accept(visitor, data) } diff --git a/compiler/testData/fir/resolve/NestedOfAliasedType.txt b/compiler/testData/fir/resolve/NestedOfAliasedType.txt index 5338f57d0b0..a9609ce84c1 100644 --- a/compiler/testData/fir/resolve/NestedOfAliasedType.txt +++ b/compiler/testData/fir/resolve/NestedOfAliasedType.txt @@ -1,12 +1,12 @@ FILE: NestedOfAliasedType.kt (resolved) public? abstract class A() { - public? abstract class Nested() { + (resolved) public? abstract class Nested() { } } (resolved) public? final typealias TA = R/.A/ (resolved) public? final class B() : R/.TA = .A/ { - public? final? class NestedInB() : R/.A.Nested/ { + (resolved) public? final class NestedInB() : R/.A.Nested/ { } } diff --git a/compiler/testData/fir/resolve/NestedSuperType.txt b/compiler/testData/fir/resolve/NestedSuperType.txt index b6894af8aad..c31ada7b645 100644 --- a/compiler/testData/fir/resolve/NestedSuperType.txt +++ b/compiler/testData/fir/resolve/NestedSuperType.txt @@ -1,14 +1,14 @@ FILE: NestedSuperType.kt (resolved) public? abstract class My() { - public? abstract class NestedOne() : R/p.My/ { - public? abstract class NestedTwo() : R/p.My.NestedOne/ { + (resolved) public? abstract class NestedOne() : R/p.My/ { + (resolved) public? abstract class NestedTwo() : R/p.My.NestedOne/ { } } } (resolved) public? final class Your() : R/p.My/ { - public? final? class NestedThree() : R/p.My.NestedOne/ { + (resolved) public? final class NestedThree() : R/p.My.NestedOne/ { } } diff --git a/compiler/testData/fir/resolve/multifile/NestedSuperType.txt b/compiler/testData/fir/resolve/multifile/NestedSuperType.txt index bc4eb4b1674..bd7fc695fb9 100644 --- a/compiler/testData/fir/resolve/multifile/NestedSuperType.txt +++ b/compiler/testData/fir/resolve/multifile/NestedSuperType.txt @@ -1,9 +1,9 @@ FILE: NestedSuperType.kt (resolved) public? final class A() : R/b.B/ { - public? final? class NestedInA1() : R/b.B.NestedInB/ { + (resolved) public? final class NestedInA1() : R/b.B.NestedInB/ { } - public? final? class NestedInA2() : R/c.C.NestedInC/ { + (resolved) public? final class NestedInA2() : R/c.C.NestedInC/ { } }