diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/descriptors/ConeDescriptors.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/descriptors/ConeDescriptors.kt deleted file mode 100644 index a134726ef67..00000000000 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/descriptors/ConeDescriptors.kt +++ /dev/null @@ -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.descriptors - -import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.name.ClassId - -interface ConeDescriptor - -interface ConeClassifierDescriptor : ConeDescriptor - -interface ConeClassifierDescriptorWithTypeParameters : ConeClassifierDescriptor { - val typeParameters: List - - val classId: ClassId -} - -interface ConeTypeParameterDescriptor : ConeClassifierDescriptor { - val symbol: ConeTypeParameterSymbol -} - -interface ConeTypeAliasDescriptor : ConeClassifierDescriptorWithTypeParameters { - val expandedType: ConeKotlinType -} - -interface ConeClassDescriptor : ConeClassifierDescriptorWithTypeParameters { - val superTypes: List - val nestedClassifiers: List -} diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt index f525b3427e3..3ea7460e9e7 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt @@ -35,7 +35,7 @@ class ConeKotlinErrorType(val reason: String) : ConeKotlinType() { } } -class ConeClassErrorType(val reason: String): ConeClassLikeType() { +class ConeClassErrorType(val reason: String) : ConeClassLikeType() { override val symbol: ConeClassLikeSymbol get() = error("!") override val typeArguments: List diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/AbstractFirBasedDescriptor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/AbstractFirBasedDescriptor.kt deleted file mode 100644 index e42b098626a..00000000000 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/AbstractFirBasedDescriptor.kt +++ /dev/null @@ -1,19 +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.descriptors - -import org.jetbrains.kotlin.fir.FirBasedDescriptor -import org.jetbrains.kotlin.fir.FirDescriptorOwner -import org.jetbrains.kotlin.fir.FirElement - -abstract class AbstractFirBasedDescriptor : FirBasedDescriptor where E : FirElement, E : FirDescriptorOwner { - - override lateinit var fir: E - - override fun bind(e: E) { - fir = e - } -} \ No newline at end of file diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/ConeClassDescriptorImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/ConeClassDescriptorImpl.kt deleted file mode 100644 index 5d86f7551a9..00000000000 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/ConeClassDescriptorImpl.kt +++ /dev/null @@ -1,28 +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.descriptors - -import org.jetbrains.kotlin.fir.declarations.FirResolvedClass -import org.jetbrains.kotlin.fir.declarations.FirResolvedEnumEntry -import org.jetbrains.kotlin.fir.descriptors.ConeClassDescriptor -import org.jetbrains.kotlin.fir.descriptors.ConeClassifierDescriptor -import org.jetbrains.kotlin.fir.descriptors.ConeTypeParameterDescriptor -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.name.ClassId - -class ConeClassDescriptorImpl( - override val typeParameters: List, - override val classId: ClassId, - override val superTypes: List, - override val nestedClassifiers: List -) : ConeClassDescriptor, AbstractFirBasedDescriptor() - -class ConeEnumEntryDescriptorImpl( - override val typeParameters: List, - override val classId: ClassId, - override val superTypes: List, - override val nestedClassifiers: List -) : ConeClassDescriptor, AbstractFirBasedDescriptor() \ No newline at end of file diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/ConeTypeAliasDescriptorImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/ConeTypeAliasDescriptorImpl.kt deleted file mode 100644 index 9b8ec5ccc6d..00000000000 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/ConeTypeAliasDescriptorImpl.kt +++ /dev/null @@ -1,18 +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.descriptors - -import org.jetbrains.kotlin.fir.declarations.FirResolvedTypeAlias -import org.jetbrains.kotlin.fir.descriptors.ConeTypeAliasDescriptor -import org.jetbrains.kotlin.fir.descriptors.ConeTypeParameterDescriptor -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.name.ClassId - -class ConeTypeAliasDescriptorImpl( - override val typeParameters: List, - override val classId: ClassId, - override val expandedType: ConeKotlinType -) : ConeTypeAliasDescriptor, AbstractFirBasedDescriptor() \ No newline at end of file diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/ConeTypeParameterDescriptorImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/ConeTypeParameterDescriptorImpl.kt deleted file mode 100644 index a15a5127782..00000000000 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/ConeTypeParameterDescriptorImpl.kt +++ /dev/null @@ -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.descriptors - -import org.jetbrains.kotlin.fir.declarations.FirResolvedTypeParameter -import org.jetbrains.kotlin.fir.descriptors.ConeTypeParameterDescriptor -import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterSymbol -import org.jetbrains.kotlin.name.Name - -class ConeTypeParameterDescriptorImpl( - override val symbol: ConeTypeParameterSymbol -) : ConeTypeParameterDescriptor, AbstractFirBasedDescriptor() \ No newline at end of file diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirClassifierResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirClassifierResolveTransformer.kt deleted file mode 100644 index 5ef2d2bf791..00000000000 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirClassifierResolveTransformer.kt +++ /dev/null @@ -1,125 +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.descriptors - -import org.jetbrains.kotlin.fir.FirDescriptorOwner -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedClassImpl -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedEnumEntryImpl -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedTypeAliasImpl -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedTypeParameterImpl -import org.jetbrains.kotlin.fir.descriptors.ConeClassifierDescriptor -import org.jetbrains.kotlin.fir.descriptors.ConeTypeParameterDescriptor -import org.jetbrains.kotlin.fir.types.FirResolvedType -import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult -import org.jetbrains.kotlin.fir.visitors.FirTransformer -import org.jetbrains.kotlin.fir.visitors.compose -import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.name.Name - -class FirClassifierResolveTransformer : FirTransformer() { - override fun transformElement(element: E, data: Nothing?): CompositeTransformResult { - return element.compose() - } - - lateinit var packageFqName: FqName - - override fun transformFile(file: FirFile, data: Nothing?): CompositeTransformResult { - packageFqName = file.packageFqName - return file.also { it.transformChildren(this, null) }.compose() - } - - private var classLikeName: FqName = FqName.ROOT - - override fun transformClass(klass: FirClass, data: Nothing?): CompositeTransformResult { - val actualClassName = classLikeName.child(klass.name) - classLikeName = actualClassName - - klass.transformChildren(this, data) - - val superTypes = klass.superTypes.map { - (it as FirResolvedType).type - } - - classLikeName = classLikeName.parent() - - val typeParameters = - klass.typeParameters.filterIsInstance>().mapNotNull { it.descriptor as? ConeTypeParameterDescriptor } - - val nestedClassifiers = - klass.declarations.filterIsInstance>().mapNotNull { it.descriptor as? ConeClassifierDescriptor } - - val classId = ClassId(packageFqName, actualClassName, false) - - return when (klass) { - is FirEnumEntry -> { - val descriptor = ConeEnumEntryDescriptorImpl(typeParameters, classId, superTypes, nestedClassifiers) - FirResolvedEnumEntryImpl(klass, descriptor).compose() - } - else -> { - val descriptor = ConeClassDescriptorImpl(typeParameters, classId, superTypes, nestedClassifiers) - FirResolvedClassImpl(klass, descriptor).compose() - } - } - } - - override fun transformResolvedClass(resolvedClass: FirResolvedClass, data: Nothing?): CompositeTransformResult { - return resolvedClass.compose() - } - - var memberName: Name? = null - - override fun transformNamedFunction(namedFunction: FirNamedFunction, data: Nothing?): CompositeTransformResult { - memberName = namedFunction.name - return super.transformNamedFunction(namedFunction, data).also { - memberName = null - } - } - - override fun transformTypeAlias(typeAlias: FirTypeAlias, data: Nothing?): CompositeTransformResult { - val actualClassName = classLikeName.child(typeAlias.name) - classLikeName = actualClassName - - typeAlias.transformChildren(this, data) - - classLikeName = classLikeName.parent() - - val expandedType = (typeAlias.expandedType as FirResolvedType).type - val typeParameters = - typeAlias.typeParameters.filterIsInstance>().mapNotNull { it.descriptor as? ConeTypeParameterDescriptor } - - val descriptor = ConeTypeAliasDescriptorImpl( - typeParameters, - ClassId(packageFqName, classLikeName.child(typeAlias.name), false), - expandedType - ) - - return FirResolvedTypeAliasImpl(typeAlias, descriptor).compose() - } - - override fun transformResolvedTypeAlias( - resolvedTypeAlias: FirResolvedTypeAlias, - data: Nothing? - ): CompositeTransformResult { - return resolvedTypeAlias.compose() - } - - override fun transformResolvedTypeParameter( - resolvedTypeParameter: FirResolvedTypeParameter, - data: Nothing? - ): CompositeTransformResult { - return resolvedTypeParameter.compose() - } - - override fun transformTypeParameter(typeParameter: FirTypeParameter, data: Nothing?): CompositeTransformResult { - typeParameter.transformChildren(this, data) - - val descriptor = ConeTypeParameterDescriptorImpl(typeParameter.symbol) - return FirResolvedTypeParameterImpl(typeParameter, descriptor).compose() - } -} \ No newline at end of file diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirLibrarySymbolProviderImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirLibrarySymbolProviderImpl.kt index b03a32ad9e6..ae078ec5ca9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirLibrarySymbolProviderImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirLibrarySymbolProviderImpl.kt @@ -44,7 +44,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession) : FirSymbolProvider ProtoBuf.PackageFragment.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry) } - protected val nameResolver = NameResolverImpl(packageProto.strings, packageProto.qualifiedNames) + private val nameResolver = NameResolverImpl(packageProto.strings, packageProto.qualifiedNames) val classDataFinder = ProtoBasedClassDataFinder(packageProto, nameResolver, version) { SourceElement.NO_SOURCE } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirProviderImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirProviderImpl.kt index b6e92277428..8e20d0953b3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirProviderImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirProviderImpl.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.name.FqName class FirProviderImpl(val session: FirSession) : FirProvider { override fun getFirClassifierBySymbol(symbol: ConeSymbol): FirNamedDeclaration? { - return when(symbol) { + return when (symbol) { is FirBasedSymbol<*> -> symbol.fir as? FirNamedDeclaration is ConeClassLikeSymbol -> getFirClassifierByFqName(symbol.classId) else -> error("!") diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirQualifierResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirQualifierResolverImpl.kt index 183e3d520ae..5b6740f7195 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirQualifierResolverImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirQualifierResolverImpl.kt @@ -6,11 +6,9 @@ package org.jetbrains.kotlin.fir.resolve.impl import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.resolve.FirProvider import org.jetbrains.kotlin.fir.resolve.FirQualifierResolver import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider import org.jetbrains.kotlin.fir.symbols.ConeSymbol -import org.jetbrains.kotlin.fir.symbols.FirSymbolOwner import org.jetbrains.kotlin.fir.types.FirQualifierPart import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirTypeResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirTypeResolverImpl.kt index 7c82aac27c6..3d2ef560545 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirTypeResolverImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirTypeResolverImpl.kt @@ -5,11 +5,6 @@ package org.jetbrains.kotlin.fir.resolve.impl -import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.declarations.FirClass -import org.jetbrains.kotlin.fir.declarations.FirTypeAlias -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.resolve.FirProvider import org.jetbrains.kotlin.fir.resolve.FirQualifierResolver import org.jetbrains.kotlin.fir.resolve.FirTypeResolver import org.jetbrains.kotlin.fir.scopes.FirPosition @@ -39,7 +34,7 @@ class FirTypeResolverImpl : FirTypeResolver { } } - private fun ConeSymbol.toConeKotlinType(parts: List, session: FirSession): ConeKotlinType? { + private fun ConeSymbol.toConeKotlinType(parts: List): ConeKotlinType? { return when (this) { is ConeTypeParameterSymbol -> { @@ -94,7 +89,7 @@ class FirTypeResolverImpl : FirTypeResolver { override fun resolveUserType(type: FirUserType, symbol: ConeSymbol?, scope: FirScope): ConeKotlinType { symbol ?: return ConeKotlinErrorType("Symbol not found") - return symbol.toConeKotlinType(type.qualifier, type.session) ?: ConeKotlinErrorType("Failed to resolve qualified type") + return symbol.toConeKotlinType(type.qualifier) ?: ConeKotlinErrorType("Failed to resolve qualified type") } override fun resolveType( diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirImportResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirImportResolveTransformer.kt similarity index 96% rename from compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirImportResolveTransformer.kt rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirImportResolveTransformer.kt index 14b691621b8..a68ceb89902 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirImportResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirImportResolveTransformer.kt @@ -3,14 +3,13 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.descriptors +package org.jetbrains.kotlin.fir.resolve.transformers import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedImportImpl import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedPackageStarImport -import org.jetbrains.kotlin.fir.resolve.FirProvider import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult import org.jetbrains.kotlin.fir.visitors.FirTransformer diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirTotalResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveTransformer.kt similarity index 87% rename from compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirTotalResolveTransformer.kt rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveTransformer.kt index b7cdcc51b3e..2b317a5c0ed 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirTotalResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveTransformer.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.descriptors +package org.jetbrains.kotlin.fir.resolve.transformers import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.visitors.FirTransformer @@ -12,8 +12,7 @@ class FirTotalResolveTransformer { private val transformers: List> = listOf( FirImportResolveTransformer(), - FirTypeResolveTransformer(), - FirClassifierResolveTransformer() + FirTypeResolveTransformer() ) fun processFile(firFile: FirFile) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirTypeResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt similarity index 98% rename from compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirTypeResolveTransformer.kt rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt index 465bd91b803..a678b85c72b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/descriptors/FirTypeResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt @@ -3,8 +3,9 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.descriptors +package org.jetbrains.kotlin.fir.resolve.transformers +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.render @@ -161,7 +162,9 @@ open class FirTypeResolveTransformer : FirTransformer() { firProvider.getFirClassifierByFqName(it)!! } - val transformer = SuperTypeResolveTransformer(firElementsToVisit.iterator()) + val transformer = SuperTypeResolveTransformer( + firElementsToVisit.iterator() + ) file.transformSingle(transformer, null) } else { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirBasedDescriptor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirBasedDescriptor.kt deleted file mode 100644 index 42fe2a60f6b..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirBasedDescriptor.kt +++ /dev/null @@ -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 : ConeDescriptor where E : FirElement, E : FirDescriptorOwner { - val fir: E - fun bind(e: E) -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirDescriptorOwner.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirDescriptorOwner.kt deleted file mode 100644 index c9570fb214d..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirDescriptorOwner.kt +++ /dev/null @@ -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 where TElem : FirElement, TElem : FirDescriptorOwner { - val descriptor: FirBasedDescriptor -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index a95fae9c77d..187124fdc0d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -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) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFile.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFile.kt index 6117db4c9cd..8bb2b166577 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFile.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFile.kt @@ -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 diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedClass.kt deleted file mode 100644 index 2553e6fb25c..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedClass.kt +++ /dev/null @@ -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 { - override val modality: Modality - - override fun accept(visitor: FirVisitor, data: D): R = - visitor.visitResolvedClass(this, data) -} - -interface FirResolvedEnumEntry : FirEnumEntry, FirDescriptorOwner { - override fun accept(visitor: FirVisitor, data: D): R = - visitor.visitResolvedEnumEntry(this, data) -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedTypeAlias.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedTypeAlias.kt deleted file mode 100644 index 2e65c2ef77c..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedTypeAlias.kt +++ /dev/null @@ -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 { - override val modality: Modality - - override fun accept(visitor: FirVisitor, data: D): R = - visitor.visitResolvedTypeAlias(this, data) -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedTypeParameter.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedTypeParameter.kt deleted file mode 100644 index e1d6cdec4ca..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedTypeParameter.kt +++ /dev/null @@ -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 { - - override fun accept(visitor: FirVisitor, data: D): R = - visitor.visitResolvedTypeParameter(this, data) -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAbstractMemberDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAbstractMemberDeclaration.kt index 5d957e8ce9e..0044441c1d9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAbstractMemberDeclaration.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAbstractMemberDeclaration.kt @@ -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() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt index 47305ec2c4a..3d2bfd58ebd 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt @@ -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() override val declarations = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt index 169bdea466f..ae024fbcad7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt @@ -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 = 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) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirMemberFunctionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirMemberFunctionImpl.kt index cb21f7c58f4..774de6b2394 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirMemberFunctionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirMemberFunctionImpl.kt @@ -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() override fun transformChildren(transformer: FirTransformer, data: D): FirElement { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirNamedAnnotatedDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirNamedAnnotatedDeclaration.kt deleted file mode 100644 index b71f8e6db53..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirNamedAnnotatedDeclaration.kt +++ /dev/null @@ -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() -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPackageFragmentImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPackageFragmentImpl.kt deleted file mode 100644 index fad13b1770b..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPackageFragmentImpl.kt +++ /dev/null @@ -1,4 +0,0 @@ -package org.jetbrains.kotlin.fir.declarations.impl - -class FirPackageFragmentImpl { -} \ No newline at end of file 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 deleted file mode 100644 index 718107f0c50..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedClassImpl.kt +++ /dev/null @@ -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, 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.accept(visitor) - } - - override fun accept(visitor: FirVisitor, data: D): R { - return super.accept(visitor, data) - } -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedEnumEntryImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedEnumEntryImpl.kt deleted file mode 100644 index 28849396dba..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedEnumEntryImpl.kt +++ /dev/null @@ -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, FirEnumEntry by delegate { - - init { - symbol.bind(this) - descriptor.bind(this) - } - - override fun accept(visitor: FirVisitorVoid) { - super.accept(visitor) - } - - override fun accept(visitor: FirVisitor, data: D): R { - return super.accept(visitor, data) - } -} \ No newline at end of file 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 deleted file mode 100644 index 38e5bbd353f..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedTypeAliasImpl.kt +++ /dev/null @@ -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, 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.accept(visitor) - } - - override fun accept(visitor: FirVisitor, data: D): R { - return super.accept(visitor, data) - } -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedTypeParameterImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedTypeParameterImpl.kt deleted file mode 100644 index 95801dbe3fe..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedTypeParameterImpl.kt +++ /dev/null @@ -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, FirTypeParameter by delegate { - - init { - symbol.bind(this) - 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) - } -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt index 6f2962b0f26..3f40cb0d4c6 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt @@ -33,6 +33,9 @@ class FirTypeAliasImpl( symbol.bind(this) } + override val modality: Modality + get() = super.modality ?: Modality.FINAL + override fun transformChildren(transformer: FirTransformer, data: D): FirElement { typeParameters.transformInplace(transformer, data) expandedType = expandedType.transformSingle(transformer, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt index 74891a98009..09c034207e0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt @@ -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( diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassSymbol.kt index f0a8688fd46..681e3ffacf4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassSymbol.kt @@ -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() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeImpl.kt index aa389aa1360..f210300eccf 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeImpl.kt @@ -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( diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirTransformerGenerated.kt b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirTransformerGenerated.kt index e62092330ed..9b98def04c6 100644 --- a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirTransformerGenerated.kt +++ b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirTransformerGenerated.kt @@ -66,30 +66,14 @@ abstract class FirTransformer : FirVisitor { - return transformEnumEntry(resolvedEnumEntry, data) - } - - open fun transformResolvedClass(resolvedClass: FirResolvedClass, data: D): CompositeTransformResult { - return transformClass(resolvedClass, data) - } - open fun transformTypeAlias(typeAlias: FirTypeAlias, data: D): CompositeTransformResult { return transformMemberDeclaration(typeAlias, data) } - open fun transformResolvedTypeAlias(resolvedTypeAlias: FirResolvedTypeAlias, data: D): CompositeTransformResult { - return transformTypeAlias(resolvedTypeAlias, data) - } - open fun transformTypeParameter(typeParameter: FirTypeParameter, data: D): CompositeTransformResult { return transformNamedDeclaration(typeParameter, data) } - open fun transformResolvedTypeParameter(resolvedTypeParameter: FirResolvedTypeParameter, data: D): CompositeTransformResult { - return transformTypeParameter(resolvedTypeParameter, data) - } - open fun transformProperty(property: FirProperty, data: D): CompositeTransformResult { return transformDeclaration(property, data) } @@ -218,10 +202,6 @@ abstract class FirTransformer : FirVisitor { - return transformEnumEntry(enumEntry, data) - } - final override fun visitExpression(expression: FirExpression, data: D): CompositeTransformResult { return transformExpression(expression, data) } @@ -254,14 +234,6 @@ abstract class FirTransformer : FirVisitor { - return transformTypeAlias(typeAlias, data) - } - - final override fun visitTypeParameter(typeParameter: FirTypeParameter, data: D): CompositeTransformResult { - return transformTypeParameter(typeParameter, data) - } - final override fun visitTypeProjection(typeProjection: FirTypeProjection, data: D): CompositeTransformResult { return transformTypeProjection(typeProjection, data) } @@ -278,8 +250,8 @@ abstract class FirTransformer : FirVisitor { - return transformResolvedClass(resolvedClass, data) + final override fun visitEnumEntry(enumEntry: FirEnumEntry, data: D): CompositeTransformResult { + return transformEnumEntry(enumEntry, data) } final override fun visitCallableMember(callableMember: FirCallableMember, data: D): CompositeTransformResult { @@ -310,10 +282,6 @@ abstract class FirTransformer : FirVisitor { - return transformResolvedEnumEntry(resolvedEnumEntry, data) - } - final override fun visitBody(body: FirBody, data: D): CompositeTransformResult { return transformBody(body, data) } @@ -338,6 +306,14 @@ abstract class FirTransformer : FirVisitor { + return transformTypeAlias(typeAlias, data) + } + + final override fun visitTypeParameter(typeParameter: FirTypeParameter, data: D): CompositeTransformResult { + return transformTypeParameter(typeParameter, data) + } + final override fun visitFile(file: FirFile, data: D): CompositeTransformResult { return transformFile(file, data) } @@ -354,14 +330,6 @@ abstract class FirTransformer : FirVisitor { - return transformResolvedTypeAlias(resolvedTypeAlias, data) - } - - final override fun visitResolvedTypeParameter(resolvedTypeParameter: FirResolvedTypeParameter, data: D): CompositeTransformResult { - return transformResolvedTypeParameter(resolvedTypeParameter, data) - } - final override fun visitStarProjection(starProjection: FirStarProjection, data: D): CompositeTransformResult { return transformStarProjection(starProjection, data) } diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorGenerated.kt b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorGenerated.kt index 8f232174e23..9d85229d8d6 100644 --- a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorGenerated.kt +++ b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorGenerated.kt @@ -66,30 +66,14 @@ abstract class FirVisitor { 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) } diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorVoidGenerated.kt b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorVoidGenerated.kt index 582284d33cc..7318924b9eb 100644 --- a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorVoidGenerated.kt +++ b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorVoidGenerated.kt @@ -66,30 +66,14 @@ abstract class FirVisitorVoid : FirVisitor() { 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() { 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() { 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() { 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() { 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() { 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() { 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) } diff --git a/compiler/testData/fir/rawBuilder/declarations/F.txt b/compiler/testData/fir/rawBuilder/declarations/F.txt index 06ba4f52f3e..30143e6164a 100644 --- a/compiler/testData/fir/rawBuilder/declarations/F.txt +++ b/compiler/testData/fir/rawBuilder/declarations/F.txt @@ -1,5 +1,5 @@ FILE: F.kt public? open class A() { } - public? final? class B() : A { + public? final class B() : A { } diff --git a/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt b/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt index fd797732fbf..3e0ec055264 100644 --- a/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt +++ b/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt @@ -5,8 +5,8 @@ FILE: NestedOfAliasedType.kt } public? final typealias TA = A - public? final? class B() : TA { - public? final? class NestedInB() : Nested { + public? final class B() : TA { + public? final class NestedInB() : Nested { } } diff --git a/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt b/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt index 9e55929fca7..0c91eb38958 100644 --- a/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt +++ b/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt @@ -7,8 +7,8 @@ FILE: NestedSuperType.kt } } - public? final? class Your() : My { - public? final? class NestedThree() : NestedOne { + public? final class Your() : My { + public? final class NestedThree() : NestedOne { } } diff --git a/compiler/testData/fir/rawBuilder/declarations/complexTypes.txt b/compiler/testData/fir/rawBuilder/declarations/complexTypes.txt index ba2c91b12af..df66d927ce3 100644 --- a/compiler/testData/fir/rawBuilder/declarations/complexTypes.txt +++ b/compiler/testData/fir/rawBuilder/declarations/complexTypes.txt @@ -1,10 +1,10 @@ FILE: complexTypes.kt - public? final? class C() { - public? final? class D(inner) { + public? final class C() { + public? final class D(inner) { } } - public? final? interface Test() { + public? abstract interface Test() { public? final? property x(val): a.b.C.D, *> public? get(): a.b.C.D, *> diff --git a/compiler/testData/fir/rawBuilder/declarations/derivedClass.txt b/compiler/testData/fir/rawBuilder/declarations/derivedClass.txt index b984dbefd10..a53ad3c0a85 100644 --- a/compiler/testData/fir/rawBuilder/declarations/derivedClass.txt +++ b/compiler/testData/fir/rawBuilder/declarations/derivedClass.txt @@ -3,7 +3,7 @@ FILE: derivedClass.kt public? constructor(x: T) } - public? final? class Derived() : Base { + public? final class Derived() : Base { public? constructor(x: T)STUB } diff --git a/compiler/testData/fir/rawBuilder/declarations/enums.txt b/compiler/testData/fir/rawBuilder/declarations/enums.txt index 25cf5c23b74..f09048dbe96 100644 --- a/compiler/testData/fir/rawBuilder/declarations/enums.txt +++ b/compiler/testData/fir/rawBuilder/declarations/enums.txt @@ -1,5 +1,5 @@ FILE: enums.kt - public? final? enum class Order() { + public? final enum class Order() { public? final enum entry FIRST() { } @@ -10,7 +10,7 @@ FILE: enums.kt } } - public? final? enum class Planet() { + public? final enum class Planet() { public? constructor(m: Double, r: Double) public? final enum entry MERCURY() : Planet { @@ -36,7 +36,7 @@ FILE: enums.kt public? abstract function sayHello(): - public? final? object Companion(companion) { + public? final object Companion(companion) { public? final? const property G(val): = STUB public? get(): diff --git a/compiler/testData/fir/rawBuilder/declarations/enums2.txt b/compiler/testData/fir/rawBuilder/declarations/enums2.txt index 96872380478..c7057a6708a 100644 --- a/compiler/testData/fir/rawBuilder/declarations/enums2.txt +++ b/compiler/testData/fir/rawBuilder/declarations/enums2.txt @@ -1,11 +1,11 @@ FILE: enums2.kt - public? final? interface Some() { + public? abstract interface Some() { } - public? final? object O1() : Some { + public? final object O1() : Some { } - public? final? object O2() : Some { + public? final object O2() : Some { } - public? final? enum class SomeEnum() { + public? final enum class SomeEnum() { public? constructor(x: Some) public? final enum entry FIRST() : SomeEnum { diff --git a/compiler/testData/fir/rawBuilder/declarations/expectActual.txt b/compiler/testData/fir/rawBuilder/declarations/expectActual.txt index 829aacef364..cc63fc74116 100644 --- a/compiler/testData/fir/rawBuilder/declarations/expectActual.txt +++ b/compiler/testData/fir/rawBuilder/declarations/expectActual.txt @@ -1,10 +1,10 @@ FILE: expectActual.kt - public? final? expect class MyClass() { + public? final expect class MyClass() { } public? final? expect function foo(): String public? final? expect property x(val): Int public? get(): Int - public? final? actual class MyClass() { + public? final actual class MyClass() { } public? final? actual function foo(): { STUB diff --git a/compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt b/compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt index d710b2eb7d3..b6f253f9be5 100644 --- a/compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt +++ b/compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt @@ -1,5 +1,5 @@ FILE: genericFunctions.kt - public? final? interface Any() { + public? abstract interface Any() { } public? final? inline function safeAsAny.(): T? { STUB diff --git a/compiler/testData/fir/rawBuilder/declarations/nestedClass.txt b/compiler/testData/fir/rawBuilder/declarations/nestedClass.txt index c94e3145b97..801754239e9 100644 --- a/compiler/testData/fir/rawBuilder/declarations/nestedClass.txt +++ b/compiler/testData/fir/rawBuilder/declarations/nestedClass.txt @@ -3,13 +3,13 @@ FILE: nestedClass.kt public? constructor(s: String) } - public? final? class Outer() { - public? final? class Derived() : Base { + public? final class Outer() { + public? final class Derived() : Base { public? constructor(s: String)STUB } - public? final? object Obj() : Base { + public? final object Obj() : Base { } } diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt b/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt index f7eb78b5b93..46e9951f49e 100644 --- a/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt +++ b/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt @@ -1,12 +1,12 @@ FILE: simpleClass.kt - public? final? interface SomeInterface() { + public? abstract interface SomeInterface() { public? final? function foo(x: Int, y: String): String public? final? property bar(val): Boolean public? get(): Boolean } - public? final? class SomeClass() : SomeInterface { + public? final class SomeClass() : SomeInterface { private final? property baz(val): = STUB public? get(): diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt b/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt index cc32e8c96a3..3c3c6fa7fe8 100644 --- a/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt +++ b/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt @@ -1,6 +1,6 @@ FILE: simpleTypeAlias.kt - public? final? interface B() { + public? abstract interface B() { } public? final typealias C = B - public? final? class D() : C { + public? final class D() : C { } diff --git a/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt b/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt index bdd46713318..05d3363fe8a 100644 --- a/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt +++ b/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt @@ -1,8 +1,8 @@ FILE: typeAliasWithGeneric.kt public? open class A() { } - public? final? interface B() { + public? abstract interface B() { } public? final typealias C = B - public? final? class D() : C { + public? final class D() : C { } diff --git a/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt index ef6e4f21622..6acbdc89c14 100644 --- a/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt +++ b/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt @@ -1,8 +1,8 @@ FILE: typeParameterVsNested.kt - public? final? interface Some() { + public? abstract interface Some() { } public? abstract class My() { - public? final? class T(inner) { + public? final class T(inner) { } public? abstract property x(val): T @@ -16,7 +16,7 @@ FILE: typeParameterVsNested.kt public? abstract property z(val): test.My.T public? get(): test.My.T - public? final? class Some() : T { + public? final class Some() : T { } } diff --git a/compiler/testData/fir/rawBuilder/declarations/typeParameters.txt b/compiler/testData/fir/rawBuilder/declarations/typeParameters.txt index 6b5672752c4..d8029dde048 100644 --- a/compiler/testData/fir/rawBuilder/declarations/typeParameters.txt +++ b/compiler/testData/fir/rawBuilder/declarations/typeParameters.txt @@ -1,5 +1,5 @@ FILE: typeParameters.kt - public? final? interface List() { + public? abstract interface List() { public? final? operator function get(index: Int): T public? final? infix function concat(other: List): List @@ -9,7 +9,7 @@ FILE: typeParameters.kt public? final typealias AnyList = List<*> public? abstract class AbstractList() : List { } - public? final? class SomeList() : AbstractList { + public? final class SomeList() : AbstractList { public? open? override function get(index: Int): Int { STUB } diff --git a/compiler/testData/fir/resolve/F.txt b/compiler/testData/fir/resolve/F.txt index 8145d6eb076..41fe1474ba5 100644 --- a/compiler/testData/fir/resolve/F.txt +++ b/compiler/testData/fir/resolve/F.txt @@ -1,5 +1,5 @@ FILE: F.kt - (resolved) public? open class A() { + public? open class A() { } - (resolved) public? final class B() : R/A/ { + public? final class B() : R/A/ { } diff --git a/compiler/testData/fir/resolve/NestedOfAliasedType.txt b/compiler/testData/fir/resolve/NestedOfAliasedType.txt index e45727ff829..33517da711b 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() { - (resolved) public? abstract class Nested() { + public? abstract class A() { + public? abstract class Nested() { } } - (resolved) public? final typealias TA = R/A/ - (resolved) public? final class B() : R/TA = A/ { - (resolved) public? final class NestedInB() : R/A.Nested/ { + public? final typealias TA = R/A/ + public? final class B() : R/TA = A/ { + public? final class NestedInB() : R/A.Nested/ { } } diff --git a/compiler/testData/fir/resolve/NestedSuperType.txt b/compiler/testData/fir/resolve/NestedSuperType.txt index 28fc4b341f6..7adf7f6ab1d 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() { - (resolved) public? abstract class NestedOne() : R/p/My/ { - (resolved) public? abstract class NestedTwo() : R/p/My.NestedOne/ { + public? abstract class My() { + public? abstract class NestedOne() : R/p/My/ { + public? abstract class NestedTwo() : R/p/My.NestedOne/ { } } } - (resolved) public? final class Your() : R/p/My/ { - (resolved) public? final class NestedThree() : R/p/My.NestedOne/ { + public? final class Your() : R/p/My/ { + public? final class NestedThree() : R/p/My.NestedOne/ { } } diff --git a/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt b/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt index 519c60acd84..dc3c57fdc16 100644 --- a/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt +++ b/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt @@ -1,5 +1,5 @@ FILE: TwoDeclarationsInSameFile.kt - (resolved) public? open class A() { + public? open class A() { } - (resolved) public? final class B() : R/p/A/ { + public? final class B() : R/p/A/ { } diff --git a/compiler/testData/fir/resolve/builtins/lists.txt b/compiler/testData/fir/resolve/builtins/lists.txt index 4c626b8bdf2..4a6d07ca6b3 100644 --- a/compiler/testData/fir/resolve/builtins/lists.txt +++ b/compiler/testData/fir/resolve/builtins/lists.txt @@ -1,7 +1,7 @@ FILE: lists.kt - (resolved) public? abstract class MyStringList() : R/kotlin/collections/List/ { + public? abstract class MyStringList() : R/kotlin/collections/List/ { } - (resolved) public? abstract class MyMutableStringList() : R/kotlin/collections/MutableList/ { + public? abstract class MyMutableStringList() : R/kotlin/collections/MutableList/ { } public? final? function convertR/kotlin/collections/List/.(): R/MyStringList/ { STUB diff --git a/compiler/testData/fir/resolve/enum.txt b/compiler/testData/fir/resolve/enum.txt index ff11b048e8d..bc2b76e785a 100644 --- a/compiler/testData/fir/resolve/enum.txt +++ b/compiler/testData/fir/resolve/enum.txt @@ -1,21 +1,21 @@ FILE: enum.kt - (resolved) public? abstract interface Some() { + public? abstract interface Some() { } - (resolved) public? final object O1() : R/Some/ { + public? final object O1() : R/Some/ { } - (resolved) public? final object O2() : R/Some/ { + public? final object O2() : R/Some/ { } - (resolved) public? final enum class SomeEnum() { + public? final enum class SomeEnum() { public? constructor(x: R/Some/) - (resolved) public? final enum entry FIRST() : R/SomeEnum/ { + public? final enum entry FIRST() : R/SomeEnum/ { public? open? override function check(y: R/Some/): R/error: Symbol not found/ { STUB } } - (resolved) public? final enum entry SECOND() : R/SomeEnum/ { + public? final enum entry SECOND() : R/SomeEnum/ { public? open? override function check(y: R/Some/): R/error: Symbol not found/ { STUB } diff --git a/compiler/testData/fir/resolve/genericFunctions.txt b/compiler/testData/fir/resolve/genericFunctions.txt index 8418801ee01..8d3f434656d 100644 --- a/compiler/testData/fir/resolve/genericFunctions.txt +++ b/compiler/testData/fir/resolve/genericFunctions.txt @@ -1,10 +1,10 @@ FILE: genericFunctions.kt - (resolved) public? abstract interface Any() { + public? abstract interface Any() { } public? final? inline function safeAsR/Any/.(): R/T/ { STUB } - (resolved) public? abstract class Summator() { + public? abstract class Summator() { public? abstract function plus(first: R/T/, second: R/T/): R/T/ } diff --git a/compiler/testData/fir/resolve/multifile/NestedSuperType.txt b/compiler/testData/fir/resolve/multifile/NestedSuperType.txt index 4c9ef9c49e1..cfe37d579b6 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/ { - (resolved) public? final class NestedInA1() : R/b/B.NestedInB/ { + public? final class A() : R/b/B/ { + public? final class NestedInA1() : R/b/B.NestedInB/ { } - (resolved) public? final class NestedInA2() : R/c/C.NestedInC/ { + public? final class NestedInA2() : R/c/C.NestedInC/ { } } diff --git a/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt b/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt index 3e8f5c625e0..00092bc97f5 100644 --- a/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt +++ b/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt @@ -1,3 +1,3 @@ FILE: TypeAliasExpansion.kt - (resolved) public? final class MyClass() : R/b/TA = b/A/ { + public? final class MyClass() : R/b/TA = b/A/ { } diff --git a/compiler/testData/fir/resolve/multifile/sealedStarImport.txt b/compiler/testData/fir/resolve/multifile/sealedStarImport.txt index 235f8b4b3b6..24b7995c1e5 100644 --- a/compiler/testData/fir/resolve/multifile/sealedStarImport.txt +++ b/compiler/testData/fir/resolve/multifile/sealedStarImport.txt @@ -1,5 +1,5 @@ FILE: sealedStarImport.kt - (resolved) public? abstract class Factory() { + public? abstract class Factory() { public? abstract function createTest(): R/error: Symbol not found/ public? abstract function createObj(): R/test/Test.O/ diff --git a/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt b/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt index f24d433d31f..3c2e7d86429 100644 --- a/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt +++ b/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt @@ -1,3 +1,3 @@ FILE: simpleAliasedImport.kt - (resolved) public? final class YourClass() : R/b/MyClass/ { + public? final class YourClass() : R/b/MyClass/ { } diff --git a/compiler/testData/fir/resolve/multifile/simpleImport.txt b/compiler/testData/fir/resolve/multifile/simpleImport.txt index 8191fdff2d6..7d8f50e25a4 100644 --- a/compiler/testData/fir/resolve/multifile/simpleImport.txt +++ b/compiler/testData/fir/resolve/multifile/simpleImport.txt @@ -1,3 +1,3 @@ FILE: simpleImport.kt - (resolved) public? final class YourClass() : R/b/MyClass/ { + public? final class YourClass() : R/b/MyClass/ { } diff --git a/compiler/testData/fir/resolve/multifile/simpleImportNested.txt b/compiler/testData/fir/resolve/multifile/simpleImportNested.txt index d4e1de13ad1..3a3eba52ac6 100644 --- a/compiler/testData/fir/resolve/multifile/simpleImportNested.txt +++ b/compiler/testData/fir/resolve/multifile/simpleImportNested.txt @@ -1,3 +1,3 @@ FILE: simpleImportNested.kt - (resolved) public? final class YourClass() : R/a/MyClass.MyNested/ { + public? final class YourClass() : R/a/MyClass.MyNested/ { } diff --git a/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt b/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt index 12a1a122eab..e473601c3bc 100644 --- a/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt +++ b/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt @@ -1,3 +1,3 @@ FILE: simpleImportOuter.kt - (resolved) public? final class My() : R/a/Outer.Nested/ { + public? final class My() : R/a/Outer.Nested/ { } diff --git a/compiler/testData/fir/resolve/simpleClass.txt b/compiler/testData/fir/resolve/simpleClass.txt index bd27761ddd4..ebc9cb4cc78 100644 --- a/compiler/testData/fir/resolve/simpleClass.txt +++ b/compiler/testData/fir/resolve/simpleClass.txt @@ -1,12 +1,12 @@ FILE: simpleClass.kt - (resolved) public? abstract interface SomeInterface() { + public? abstract interface SomeInterface() { public? final? function foo(x: R/kotlin/Int/, y: R/kotlin/String/): R/kotlin/String/ public? final? property bar(val): R/kotlin/Boolean/ public? get(): R/kotlin/Boolean/ } - (resolved) public? final class SomeClass() : R/SomeInterface/ { + public? final class SomeClass() : R/SomeInterface/ { private final? property baz(val): R/error: Not supported: FirImplicitTypeImpl/ = STUB public? get(): R/error: Not supported: FirImplicitTypeImpl/ diff --git a/compiler/testData/fir/resolve/simpleTypeAlias.txt b/compiler/testData/fir/resolve/simpleTypeAlias.txt index 2e730b73240..25480a8e789 100644 --- a/compiler/testData/fir/resolve/simpleTypeAlias.txt +++ b/compiler/testData/fir/resolve/simpleTypeAlias.txt @@ -1,6 +1,6 @@ FILE: simpleTypeAlias.kt - (resolved) public? abstract interface B() { + public? abstract interface B() { } - (resolved) public? final typealias C = R/B/ - (resolved) public? final class D() : R/C = B/ { + public? final typealias C = R/B/ + public? final class D() : R/C = B/ { } diff --git a/compiler/testData/fir/resolve/typeAliasWithGeneric.txt b/compiler/testData/fir/resolve/typeAliasWithGeneric.txt index abce0826692..74624461b65 100644 --- a/compiler/testData/fir/resolve/typeAliasWithGeneric.txt +++ b/compiler/testData/fir/resolve/typeAliasWithGeneric.txt @@ -1,8 +1,8 @@ FILE: typeAliasWithGeneric.kt - (resolved) public? open class A() { + public? open class A() { } - (resolved) <(resolved) S, (resolved) T : R/A/> public? abstract interface B() { + public? abstract interface B() { } - (resolved) public? final class D() : R/C = B/ { + public? final class D() : R/C = B/ { } - (resolved) <(resolved) T> public? final typealias C = R/B/ + public? final typealias C = R/B/ diff --git a/compiler/testData/fir/resolve/typeParameterVsNested.txt b/compiler/testData/fir/resolve/typeParameterVsNested.txt index 986265859c7..376c8e16cd1 100644 --- a/compiler/testData/fir/resolve/typeParameterVsNested.txt +++ b/compiler/testData/fir/resolve/typeParameterVsNested.txt @@ -1,8 +1,8 @@ FILE: typeParameterVsNested.kt - (resolved) public? abstract interface Some() { + public? abstract interface Some() { } - (resolved) <(resolved) T : R/test/Some/> public? abstract class My() { - (resolved) public? final class T(inner) { + public? abstract class My() { + public? final class T(inner) { } public? abstract property x(val): R/T/ @@ -16,7 +16,7 @@ FILE: typeParameterVsNested.kt public? abstract property z(val): R/test/My.T/ public? get(): R/test/My.T/ - (resolved) public? final class Some() : R/test/My.T/ { + public? final class Some() : R/test/My.T/ { } } diff --git a/compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCase.kt b/compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCase.kt index 2961b83e6c2..8446246e19a 100644 --- a/compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCase.kt +++ b/compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCase.kt @@ -6,18 +6,14 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.descriptors.FirTotalResolveTransformer +import org.jetbrains.kotlin.fir.resolve.transformers.FirTotalResolveTransformer import org.jetbrains.kotlin.fir.builder.RawFirBuilder import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.resolve.FirProvider -import org.jetbrains.kotlin.fir.resolve.FirQualifierResolver -import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider -import org.jetbrains.kotlin.fir.resolve.FirTypeResolver import org.jetbrains.kotlin.fir.resolve.impl.* import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.test.KotlinTestWithEnvironment import java.io.File abstract class AbstractFirResolveTestCase : AbstractFirResolveWithSessionTestCase() {