From 914620fd1f09f3b89f7543d54a188a19faddeca8 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 25 Apr 2018 21:03:11 +0300 Subject: [PATCH] FIR: introduce status & status transformer (no override resolve) So #KT-24021 Fixed --- .../kotlin/fir/builder/RawFirBuilder.kt | 38 ++--- .../FirStatusResolveTransformer.kt | 156 ++++++++++++++++++ .../FirTotalResolveTransformer.kt | 3 +- .../org/jetbrains/kotlin/fir/FirRenderer.kt | 15 +- .../fir/declarations/FirCallableMember.kt | 2 +- .../kotlin/fir/declarations/FirClass.kt | 8 +- .../fir/declarations/FirDeclarationStatus.kt | 52 ++++++ .../fir/declarations/FirMemberDeclaration.kt | 17 +- .../fir/declarations/FirNamedFunction.kt | 10 +- .../kotlin/fir/declarations/FirProperty.kt | 4 +- .../fir/declarations/FirPropertyAccessor.kt | 5 +- .../FirResolvedDeclarationStatus.kt | 15 ++ .../impl/FirAbstractCallableMember.kt | 13 +- .../impl/FirAbstractMemberDeclaration.kt | 18 +- .../fir/declarations/impl/FirClassImpl.kt | 27 +-- .../declarations/impl/FirConstructorImpl.kt | 6 +- .../impl/FirDeclarationStatusImpl.kt | 128 ++++++++++++++ .../impl/FirDefaultPropertyAccessor.kt | 22 ++- .../fir/declarations/impl/FirEnumEntryImpl.kt | 4 +- .../impl/FirMemberFunctionImpl.kt | 24 ++- .../impl/FirMemberPropertyImpl.kt | 18 +- .../impl/FirPrimaryConstructorImpl.kt | 6 +- .../impl/FirPropertyAccessorImpl.kt | 8 +- .../impl/FirResolvedDeclarationStatusImpl.kt | 34 ++++ .../fir/declarations/impl/FirTypeAliasImpl.kt | 14 +- .../fir/visitors/FirTransformerGenerated.kt | 16 ++ .../fir/visitors/FirVisitorGenerated.kt | 8 + .../fir/visitors/FirVisitorVoidGenerated.kt | 16 ++ .../fir/rawBuilder/declarations/F.txt | 2 +- .../declarations/NestedOfAliasedType.txt | 4 +- .../declarations/NestedSuperType.txt | 4 +- .../rawBuilder/declarations/complexTypes.txt | 6 +- .../rawBuilder/declarations/derivedClass.txt | 2 +- .../fir/rawBuilder/declarations/enums.txt | 8 +- .../fir/rawBuilder/declarations/enums2.txt | 8 +- .../rawBuilder/declarations/expectActual.txt | 4 +- .../declarations/genericFunctions.txt | 2 +- .../rawBuilder/declarations/nestedClass.txt | 6 +- .../declarations/noPrimaryConstructor.txt | 2 +- .../rawBuilder/declarations/simpleClass.txt | 8 +- .../declarations/simpleTypeAlias.txt | 4 +- .../declarations/typeAliasWithGeneric.txt | 4 +- .../declarations/typeParameterVsNested.txt | 6 +- .../declarations/typeParameters.txt | 4 +- compiler/testData/fir/resolve/F.txt | 8 +- .../fir/resolve/NestedOfAliasedType.txt | 18 +- .../testData/fir/resolve/NestedSuperType.txt | 20 +-- .../fir/resolve/TwoDeclarationsInSameFile.txt | 8 +- .../testData/fir/resolve/builtins/lists.txt | 12 +- compiler/testData/fir/resolve/companion.txt | 32 ++-- .../testData/fir/resolve/derivedClass.txt | 14 +- compiler/testData/fir/resolve/enum.txt | 32 ++-- .../fir/resolve/fromBuilder/complexTypes.kt | 11 ++ .../fir/resolve/fromBuilder/complexTypes.txt | 15 ++ .../testData/fir/resolve/fromBuilder/enums.kt | 33 ++++ .../fir/resolve/fromBuilder/enums.txt | 67 ++++++++ .../fromBuilder/noPrimaryConstructor.kt | 9 + .../fromBuilder/noPrimaryConstructor.txt | 11 ++ .../fir/resolve/fromBuilder/simpleClass.kt | 21 +++ .../fir/resolve/fromBuilder/simpleClass.txt | 33 ++++ .../fir/resolve/fromBuilder/typeParameters.kt | 16 ++ .../resolve/fromBuilder/typeParameters.txt | 25 +++ compiler/testData/fir/resolve/ft.txt | 4 +- .../testData/fir/resolve/functionTypes.txt | 14 +- .../testData/fir/resolve/genericFunctions.txt | 10 +- .../fir/resolve/multifile/Annotations.txt | 28 ++-- .../fir/resolve/multifile/NestedSuperType.txt | 12 +- .../resolve/multifile/TypeAliasExpansion.txt | 4 +- .../resolve/multifile/sealedStarImport.txt | 10 +- .../resolve/multifile/simpleAliasedImport.txt | 4 +- .../fir/resolve/multifile/simpleImport.txt | 4 +- .../resolve/multifile/simpleImportNested.txt | 4 +- .../resolve/multifile/simpleImportOuter.txt | 4 +- .../resolve/multifile/simpleStarImport.txt | 2 +- compiler/testData/fir/resolve/nestedClass.txt | 20 +-- compiler/testData/fir/resolve/simpleClass.txt | 30 ++-- .../testData/fir/resolve/simpleTypeAlias.txt | 8 +- .../fir/resolve/stdlib/concurrent.txt | 8 +- .../testData/fir/resolve/stdlib/functionX.txt | 14 +- .../fir/resolve/stdlib/reflectionClass.txt | 8 +- compiler/testData/fir/resolve/treeSet.txt | 4 +- .../fir/resolve/typeAliasWithGeneric.txt | 12 +- .../typeParameterInPropertyReceiver.txt | 4 +- .../fir/resolve/typeParameterVsNested.txt | 28 ++-- .../fir/FirResolveTestCaseGenerated.java | 41 ++++- .../RawFirBuilderTestCaseGenerated.java | 3 +- 86 files changed, 1080 insertions(+), 346 deletions(-) create mode 100644 compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt create mode 100644 compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt create mode 100644 compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt create mode 100644 compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDeclarationStatusImpl.kt create mode 100644 compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedDeclarationStatusImpl.kt create mode 100644 compiler/testData/fir/resolve/fromBuilder/complexTypes.kt create mode 100644 compiler/testData/fir/resolve/fromBuilder/complexTypes.txt create mode 100644 compiler/testData/fir/resolve/fromBuilder/enums.kt create mode 100644 compiler/testData/fir/resolve/fromBuilder/enums.txt create mode 100644 compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.kt create mode 100644 compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.txt create mode 100644 compiler/testData/fir/resolve/fromBuilder/simpleClass.kt create mode 100644 compiler/testData/fir/resolve/fromBuilder/simpleClass.txt create mode 100644 compiler/testData/fir/resolve/fromBuilder/typeParameters.kt create mode 100644 compiler/testData/fir/resolve/fromBuilder/typeParameters.txt diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index 3917ae96b39..2a3701f6224 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -68,15 +68,6 @@ class RawFirBuilder(val session: FirSession) { } } - private val KtDeclaration.platformStatus: FirMemberPlatformStatus - get() { - return when { - hasExpectModifier() -> FirMemberPlatformStatus.EXPECT - hasActualModifier() -> FirMemberPlatformStatus.ACTUAL - else -> FirMemberPlatformStatus.DEFAULT - } - } - private inner class Visitor : KtVisitor() { private inline fun KtElement?.convertSafe(): R? = this?.accept(this@Visitor, Unit) as? R @@ -111,9 +102,9 @@ class RawFirBuilder(val session: FirSession) { ): FirPropertyAccessor { if (this == null) { return if (isGetter) { - FirDefaultPropertyGetter(session, property, propertyType) + FirDefaultPropertyGetter(session, property, propertyType, property.visibility) } else { - FirDefaultPropertySetter(session, property, propertyType) + FirDefaultPropertySetter(session, property, propertyType, property.visibility) } } val firAccessor = FirPropertyAccessorImpl( @@ -164,7 +155,8 @@ class RawFirBuilder(val session: FirSession) { nameAsSafeName, visibility, modality, - platformStatus, + hasExpectModifier(), + hasActualModifier(), isOverride = hasModifier(KtTokens.OVERRIDE_KEYWORD), isConst = false, isLateInit = false, @@ -172,8 +164,8 @@ class RawFirBuilder(val session: FirSession) { returnType = type, isVar = isMutable, initializer = null, - getter = FirDefaultPropertyGetter(session, this, type), - setter = FirDefaultPropertySetter(session, this, type), + getter = FirDefaultPropertyGetter(session, this, type, visibility), + setter = FirDefaultPropertySetter(session, this, type, visibility), delegate = null ) extractAnnotationsTo(firProperty) @@ -269,7 +261,8 @@ class RawFirBuilder(val session: FirSession) { session, this ?: owner, this?.visibility ?: Visibilities.UNKNOWN, - this?.platformStatus ?: FirMemberPlatformStatus.DEFAULT, + this?.hasExpectModifier() ?: false, + this?.hasActualModifier() ?: false, delegatedSelfType, firDelegatedCall ) @@ -362,7 +355,8 @@ class RawFirBuilder(val session: FirSession) { classOrObject.nameAsSafeName, classOrObject.visibility, classOrObject.modality, - classOrObject.platformStatus, + classOrObject.hasExpectModifier(), + classOrObject.hasActualModifier(), classKind, isInner = classOrObject.hasModifier(KtTokens.INNER_KEYWORD), isCompanion = (classOrObject as? KtObjectDeclaration)?.isCompanion() == true, @@ -402,7 +396,8 @@ class RawFirBuilder(val session: FirSession) { FirTypeAliasSymbol(currentClassId), typeAlias.nameAsSafeName, typeAlias.visibility, - typeAlias.platformStatus, + typeAlias.hasExpectModifier(), + typeAlias.hasActualModifier(), typeAlias.getTypeReference().toFirOrErrorType() ) typeAlias.extractAnnotationsTo(firTypeAlias) @@ -424,7 +419,8 @@ class RawFirBuilder(val session: FirSession) { function.nameAsSafeName, function.visibility, function.modality, - function.platformStatus, + function.hasExpectModifier(), + function.hasActualModifier(), function.hasModifier(KtTokens.OVERRIDE_KEYWORD), function.hasModifier(KtTokens.OPERATOR_KEYWORD), function.hasModifier(KtTokens.INFIX_KEYWORD), @@ -456,7 +452,8 @@ class RawFirBuilder(val session: FirSession) { session, this, visibility, - platformStatus, + hasExpectModifier(), + hasActualModifier(), delegatedSelfType, getDelegationCall().convert(delegatedSuperType, delegatedSelfType, hasPrimaryConstructor), buildFirBody() @@ -503,7 +500,8 @@ class RawFirBuilder(val session: FirSession) { property.nameAsSafeName, property.visibility, property.modality, - property.platformStatus, + property.hasExpectModifier(), + property.hasActualModifier(), property.hasModifier(KtTokens.OVERRIDE_KEYWORD), property.hasModifier(KtTokens.CONST_KEYWORD), property.hasModifier(KtTokens.LATEINIT_KEYWORD), diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt new file mode 100644 index 00000000000..433cd3672cd --- /dev/null +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt @@ -0,0 +1,156 @@ +/* + * 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.resolve.transformers + +import org.jetbrains.kotlin.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl +import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.compose + +class FirStatusResolveTransformer : FirTransformer() { + override fun transformElement(element: E, data: Nothing?): CompositeTransformResult { + @Suppress("UNCHECKED_CAST") + return (element.transformChildren(this, data) as E).compose() + } + + private val declarationsWithStatuses = mutableListOf() + + private val classes = mutableListOf() + + private fun FirDeclaration.resolveVisibility(): Visibility { + if (this is FirConstructor) { + val klass = classes.lastOrNull() + if (klass != null && (klass.classKind == ClassKind.ENUM_CLASS || klass.modality == Modality.SEALED)) { + return Visibilities.PRIVATE + } + } + return Visibilities.PUBLIC // TODO (overrides) + } + + private fun FirDeclaration.resolveModality(): Modality { + return when (this) { + is FirEnumEntry -> Modality.FINAL + is FirClass -> if (classKind == ClassKind.INTERFACE) Modality.ABSTRACT else Modality.FINAL + is FirCallableMember -> { + val containingClass = classes.lastOrNull() + when { + containingClass == null -> Modality.FINAL + containingClass.classKind == ClassKind.INTERFACE -> { + when { + visibility == Visibilities.PRIVATE -> + Modality.FINAL + this is FirNamedFunction && body == null -> + Modality.ABSTRACT + this is FirProperty && initializer == null && getter.body == null && setter.body == null -> + Modality.ABSTRACT + else -> + Modality.OPEN + } + } + else -> { + if (isOverride && containingClass.modality != Modality.FINAL) Modality.OPEN else Modality.FINAL + } + } + } + else -> Modality.FINAL + } + } + + override fun transformDeclarationStatus( + declarationStatus: FirDeclarationStatus, + data: Nothing? + ): CompositeTransformResult { + if (declarationStatus.visibility == Visibilities.UNKNOWN || declarationStatus.modality == null) { + val declaration = declarationsWithStatuses.last() + val visibility = when (declarationStatus.visibility) { + Visibilities.UNKNOWN -> declaration.resolveVisibility() + else -> declarationStatus.visibility + } + val modality = declarationStatus.modality ?: declaration.resolveModality() + val resolvedStatus = (declarationStatus as FirDeclarationStatusImpl).resolved(visibility, modality) + return resolvedStatus.compose() + } + + return super.transformDeclarationStatus(declarationStatus, data) + } + + private inline fun storeDeclaration( + declaration: FirDeclaration, + computeResult: () -> CompositeTransformResult + ): CompositeTransformResult { + declarationsWithStatuses += declaration + val result = computeResult() + declarationsWithStatuses.removeAt(declarationsWithStatuses.lastIndex) + return result + } + + private inline fun storeClass( + klass: FirClass, + computeResult: () -> CompositeTransformResult + ): CompositeTransformResult { + classes += klass + val result = computeResult() + classes.removeAt(classes.lastIndex) + return result + } + + override fun transformClass(klass: FirClass, data: Nothing?): CompositeTransformResult { + return storeClass(klass) { + super.transformClass(klass, data) + } + } + + override fun transformMemberDeclaration( + memberDeclaration: FirMemberDeclaration, + data: Nothing? + ): CompositeTransformResult { + return storeDeclaration(memberDeclaration) { + super.transformMemberDeclaration(memberDeclaration, data) + } + } + + override fun transformPropertyAccessor( + propertyAccessor: FirPropertyAccessor, + data: Nothing? + ): CompositeTransformResult { + return storeDeclaration(propertyAccessor) { + super.transformPropertyAccessor(propertyAccessor, data) + } + } + + override fun transformConstructor( + constructor: FirConstructor, + data: Nothing? + ): CompositeTransformResult { + return storeDeclaration(constructor) { + super.transformConstructor(constructor, data) + } + } + + override fun transformNamedFunction( + namedFunction: FirNamedFunction, + data: Nothing? + ): CompositeTransformResult { + return storeDeclaration(namedFunction) { + super.transformNamedFunction(namedFunction, data) + } + } + + override fun transformProperty( + property: FirProperty, + data: Nothing? + ): CompositeTransformResult { + return storeDeclaration(property) { + super.transformProperty(property, data) + } + } +} \ No newline at end of file diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveTransformer.kt index 2b317a5c0ed..70f21910e3f 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveTransformer.kt @@ -12,7 +12,8 @@ class FirTotalResolveTransformer { private val transformers: List> = listOf( FirImportResolveTransformer(), - FirTypeResolveTransformer() + FirTypeResolveTransformer(), + FirStatusResolveTransformer() ) fun processFile(firFile: FirFile) { 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 b1ed00a9451..d7ddb3ec9a7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -124,14 +124,6 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { } } - private fun FirMemberPlatformStatus.asString(): String { - return when (this) { - FirMemberPlatformStatus.DEFAULT -> "" - FirMemberPlatformStatus.EXPECT -> "expect " - FirMemberPlatformStatus.ACTUAL -> "actual " - } - } - override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration) { memberDeclaration.annotations.renderAnnotations() if (memberDeclaration.typeParameters.isNotEmpty()) { @@ -140,7 +132,12 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { print("> ") } print(memberDeclaration.visibility.asString() + " " + memberDeclaration.modalityAsString() + " ") - print(memberDeclaration.platformStatus.asString()) + if (memberDeclaration.isExpect) { + print("expect ") + } + if (memberDeclaration.isActual) { + print("actual ") + } if (memberDeclaration is FirCallableMember && memberDeclaration.isOverride) { print("override ") } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableMember.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableMember.kt index f444354b82f..5d7da496eeb 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableMember.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableMember.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor // Good name needed (something with receiver, type parameters, return type, and name) interface FirCallableMember : @VisitedSupertype FirDeclaration, FirMemberDeclaration, FirTypedDeclaration { - val isOverride: Boolean + val isOverride: Boolean get() = status.isOverride val receiverType: FirType? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt index b3a40475370..ed1ef422e75 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt @@ -21,13 +21,13 @@ interface FirClass : FirDeclarationContainer, FirMemberDeclaration, FirSymbolOwn val classKind: ClassKind - val isInner: Boolean + val isInner: Boolean get() = status.isInner - val isCompanion: Boolean + val isCompanion: Boolean get() = status.isCompanion - val isData: Boolean + val isData: Boolean get() = status.isData - val isInline: Boolean + val isInline: Boolean get() = status.isInline override val symbol: FirClassSymbol diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt new file mode 100644 index 00000000000..890d3d8d4a9 --- /dev/null +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt @@ -0,0 +1,52 @@ +/* + * 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 com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.fir.BaseTransformedType +import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.visitors.FirVisitor + +@BaseTransformedType +interface FirDeclarationStatus : FirElement { + val visibility: Visibility + + val modality: Modality? + + val isExpect: Boolean + + val isActual: Boolean + + val isOverride: Boolean + + val isOperator: Boolean + + val isInfix: Boolean + + val isInline: Boolean + + val isTailRec: Boolean + + val isExternal: Boolean + + val isConst: Boolean + + val isLateInit: Boolean + + val isInner: Boolean + + val isCompanion: Boolean + + val isData: Boolean + + override val psi: PsiElement? + get() = null + + override fun accept(visitor: FirVisitor, data: D): R = + visitor.visitDeclarationStatus(this, data) +} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt index 1b646954af4..077b9d3cc3d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt @@ -11,15 +11,15 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationContainer import org.jetbrains.kotlin.fir.visitors.FirVisitor interface FirMemberDeclaration : FirTypeParameterContainer, FirNamedDeclaration, FirAnnotationContainer { - val visibility: Visibility + val status: FirDeclarationStatus - val modality: Modality? + val visibility: Visibility get() = status.visibility - val platformStatus: FirMemberPlatformStatus + val modality: Modality? get() = status.modality - val isExpect: Boolean get() = platformStatus == FirMemberPlatformStatus.EXPECT + val isExpect: Boolean get() = status.isExpect - val isActual: Boolean get() = platformStatus == FirMemberPlatformStatus.ACTUAL + val isActual: Boolean get() = status.isActual override fun accept(visitor: FirVisitor, data: D): R = visitor.visitMemberDeclaration(this, data) @@ -29,12 +29,7 @@ interface FirMemberDeclaration : FirTypeParameterContainer, FirNamedDeclaration, for (typeParameter in typeParameters) { typeParameter.accept(visitor, data) } + status.accept(visitor, data) super.acceptChildren(visitor, data) } } - -enum class FirMemberPlatformStatus { - DEFAULT, - EXPECT, - ACTUAL -} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirNamedFunction.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirNamedFunction.kt index eaab5cf22a8..762e1884410 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirNamedFunction.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirNamedFunction.kt @@ -11,15 +11,15 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor @BaseTransformedType interface FirNamedFunction : @VisitedSupertype FirFunction, FirCallableMember { - val isOperator: Boolean + val isOperator: Boolean get() = status.isOperator - val isInfix: Boolean + val isInfix: Boolean get() = status.isInfix - val isInline: Boolean + val isInline: Boolean get() = status.isInline - val isTailRec: Boolean + val isTailRec: Boolean get() = status.isTailRec - val isExternal: Boolean + val isExternal: Boolean get() = status.isExternal override fun accept(visitor: FirVisitor, data: D): R = visitor.visitNamedFunction(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirProperty.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirProperty.kt index 46d64e9e2ba..0713f7ce7e9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirProperty.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirProperty.kt @@ -14,9 +14,9 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor // May be should not inherit FirVariable @BaseTransformedType interface FirProperty : @VisitedSupertype FirDeclaration, FirCallableMember, FirVariable { - val isConst: Boolean + val isConst: Boolean get() = status.isConst - val isLateInit: Boolean + val isLateInit: Boolean get() = status.isLateInit // Should it be nullable or have some default? val getter: FirPropertyAccessor diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt index 803d864fd1c..768132499e0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt @@ -14,7 +14,9 @@ interface FirPropertyAccessor : @VisitedSupertype FirFunction, FirTypedDeclarati val isSetter: Boolean get() = !isGetter - val visibility: Visibility + val status: FirDeclarationStatus + + val visibility: Visibility get() = status.visibility override fun accept(visitor: FirVisitor, data: D): R = visitor.visitPropertyAccessor(this, data) @@ -25,5 +27,6 @@ interface FirPropertyAccessor : @VisitedSupertype FirFunction, FirTypedDeclarati parameter.accept(visitor, data) } body?.accept(visitor, data) + status.accept(visitor, data) } } \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt new file mode 100644 index 00000000000..40547199b5d --- /dev/null +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt @@ -0,0 +1,15 @@ +/* + * 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.descriptors.Visibility + +interface FirResolvedDeclarationStatus : FirDeclarationStatus { + override val visibility: Visibility + + override val modality: Modality +} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAbstractCallableMember.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAbstractCallableMember.kt index 27db4eb4060..6025bd03ea0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAbstractCallableMember.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAbstractCallableMember.kt @@ -11,8 +11,6 @@ import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirCallableMember -import org.jetbrains.kotlin.fir.declarations.FirMemberPlatformStatus -import org.jetbrains.kotlin.fir.transformInplace import org.jetbrains.kotlin.fir.transformSingle import org.jetbrains.kotlin.fir.types.FirType import org.jetbrains.kotlin.fir.visitors.FirTransformer @@ -24,11 +22,16 @@ abstract class FirAbstractCallableMember( name: Name, visibility: Visibility, modality: Modality?, - platformStatus: FirMemberPlatformStatus, - final override val isOverride: Boolean, + isExpect: Boolean, + isActual: Boolean, + isOverride: Boolean, final override var receiverType: FirType?, final override var returnType: FirType -) : FirAbstractMemberDeclaration(session, psi, name, visibility, modality, platformStatus), FirCallableMember { +) : FirAbstractMemberDeclaration(session, psi, name, visibility, modality, isExpect, isActual), FirCallableMember { + + init { + status.isOverride = isOverride + } override fun transformChildren(transformer: FirTransformer, data: D): FirElement { receiverType = receiverType?.transformSingle(transformer, data) 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 9a3a176f3a9..7c1b2230632 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 @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration -import org.jetbrains.kotlin.fir.declarations.FirMemberPlatformStatus import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.transformInplace import org.jetbrains.kotlin.fir.transformSingle @@ -22,14 +21,25 @@ abstract class FirAbstractMemberDeclaration( session: FirSession, psi: PsiElement?, name: Name, - final override val visibility: Visibility, - override val modality: Modality?, - override val platformStatus: FirMemberPlatformStatus + visibility: Visibility, + modality: Modality?, + isExpect: Boolean, + isActual: Boolean ) : FirAbstractNamedAnnotatedDeclaration(session, psi, name), FirMemberDeclaration { final override val typeParameters = mutableListOf() + final override var status = FirDeclarationStatusImpl( + session, + visibility, + modality + ).apply { + this.isExpect = isExpect + this.isActual = isActual + } + override fun transformChildren(transformer: FirTransformer, data: D): FirElement { typeParameters.transformInplace(transformer, data) + status = status.transformSingle(transformer, data) return super.transformChildren(transformer, data) } 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 8fc9a16b848..f7e7b70e35a 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 @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.descriptors.Visibility 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.impl.FirClassSymbol import org.jetbrains.kotlin.fir.transformInplace import org.jetbrains.kotlin.fir.types.FirType @@ -26,21 +25,23 @@ open class FirClassImpl( name: Name, visibility: Visibility, modality: Modality?, - platformStatus: FirMemberPlatformStatus, + isExpect: Boolean, + isActual: Boolean, final override val classKind: ClassKind, - final override val isInner: Boolean, - final override val isCompanion: Boolean, - final override val isData: Boolean, - override val isInline: Boolean -) : FirAbstractMemberDeclaration(session, psi, name, visibility, modality, platformStatus), FirClass { + isInner: Boolean, + isCompanion: Boolean, + isData: Boolean, + isInline: Boolean +) : FirAbstractMemberDeclaration(session, psi, name, visibility, modality, isExpect, isActual), FirClass { init { symbol.bind(this) + status.isInner = isInner + status.isCompanion = isCompanion + status.isData = isData + status.isInline = isInline } - override val modality: Modality - get() = super.modality ?: if (classKind == ClassKind.INTERFACE) Modality.ABSTRACT else Modality.FINAL - override val superTypes = mutableListOf() override val declarations = mutableListOf() @@ -48,8 +49,10 @@ open class FirClassImpl( override fun transformChildren(transformer: FirTransformer, data: D): FirClass { superTypes.transformInplace(transformer, data) - declarations.transformInplace(transformer, data) + val result = super.transformChildren(transformer, data) as FirClass - return super.transformChildren(transformer, data) as FirClass + // Transform declarations in last turn + declarations.transformInplace(transformer, data) + return result } } \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt index 72a2b49d1ec..2f6b53ee76a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirMemberPlatformStatus import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirBody import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -25,13 +24,14 @@ open class FirConstructorImpl( session: FirSession, psi: PsiElement?, visibility: Visibility, - platformStatus: FirMemberPlatformStatus, + isExpect: Boolean, + isActual: Boolean, delegatedSelfType: FirType, final override var delegatedConstructor: FirDelegatedConstructorCall?, override val body: FirBody? ) : FirAbstractCallableMember( session, psi, NAME, visibility, Modality.FINAL, - platformStatus, false, null, delegatedSelfType + isExpect, isActual, isOverride = false, receiverType = null, returnType = delegatedSelfType ), FirConstructor { override val valueParameters = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDeclarationStatusImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDeclarationStatusImpl.kt new file mode 100644 index 00000000000..1a272d33e64 --- /dev/null +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDeclarationStatusImpl.kt @@ -0,0 +1,128 @@ +/* + * 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.descriptors.Visibility +import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus +import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl.Modifier.* + +open class FirDeclarationStatusImpl( + final override val session: FirSession, + override val visibility: Visibility, + override val modality: Modality? +) : FirDeclarationStatus { + protected var flags: Int = 0 + + private operator fun get(modifier: Modifier): Boolean = (flags and modifier.mask) != 0 + + private operator fun set(modifier: Modifier, value: Boolean) { + flags = if (value) { + flags or modifier.mask + } else { + flags and modifier.mask.inv() + } + } + + override var isExpect: Boolean + get() = this[EXPECT] + set(value) { + this[EXPECT] = value + } + + override var isActual: Boolean + get() = this[ACTUAL] + set(value) { + this[ACTUAL] = value + } + + override var isOverride: Boolean + get() = this[OVERRIDE] + set(value) { + this[OVERRIDE] = value + } + + override var isOperator: Boolean + get() = this[OPERATOR] + set(value) { + this[OPERATOR] = value + } + + override var isInfix: Boolean + get() = this[INFIX] + set(value) { + this[INFIX] = value + } + + override var isInline: Boolean + get() = this[INLINE] + set(value) { + this[INLINE] = value + } + + override var isTailRec: Boolean + get() = this[TAILREC] + set(value) { + this[TAILREC] = value + } + + override var isExternal: Boolean + get() = this[EXTERNAL] + set(value) { + this[EXTERNAL] = value + } + + override var isConst: Boolean + get() = this[CONST] + set(value) { + this[CONST] = value + } + + override var isLateInit: Boolean + get() = this[LATEINIT] + set(value) { + this[LATEINIT] = value + } + + override var isInner: Boolean + get() = this[INNER] + set(value) { + this[INNER] = value + } + + override var isCompanion: Boolean + get() = this[COMPANION] + set(value) { + this[COMPANION] = value + } + + override var isData: Boolean + get() = this[DATA] + set(value) { + this[DATA] = value + } + + private enum class Modifier(val mask: Int) { + EXPECT(0x1), + ACTUAL(0x2), + OVERRIDE(0x4), + OPERATOR(0x8), + INFIX(0x10), + INLINE(0x20), + TAILREC(0x40), + EXTERNAL(0x80), + CONST(0x100), + LATEINIT(0x200), + INNER(0x400), + COMPANION(0x800), + DATA(0x1000) + } + + fun resolved(visibility: Visibility, modality: Modality): FirDeclarationStatus { + return FirResolvedDeclarationStatusImpl(session, visibility, modality, flags) + } +} \ No newline at end of file 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 e2fb2d06658..bdfc3cb67af 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 @@ -6,7 +6,9 @@ package org.jetbrains.kotlin.fir.declarations.impl import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor @@ -22,10 +24,12 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer abstract class FirDefaultPropertyAccessor( final override val session: FirSession, final override val psi: PsiElement?, - final override val isGetter: Boolean + final override val isGetter: Boolean, + visibility: Visibility ) : FirPropertyAccessor { - final override val visibility = - Visibilities.UNKNOWN + override var status = FirDeclarationStatusImpl( + session, visibility, Modality.FINAL + ) final override val body: FirBody? = null @@ -37,14 +41,16 @@ abstract class FirDefaultPropertyAccessor( class FirDefaultPropertyGetter( session: FirSession, psi: PsiElement?, - propertyType: FirType -) : FirDefaultPropertyAccessor(session, psi, isGetter = true) { + propertyType: FirType, + visibility: Visibility +) : FirDefaultPropertyAccessor(session, psi, isGetter = true, visibility = visibility) { override val valueParameters: List = emptyList() override var returnType: FirType = propertyType override fun transformChildren(transformer: FirTransformer, data: D): FirElement { returnType = returnType.transformSingle(transformer, data) + status = status.transformSingle(transformer, data) return this } @@ -53,8 +59,9 @@ class FirDefaultPropertyGetter( class FirDefaultPropertySetter( session: FirSession, psi: PsiElement?, - propertyType: FirType -) : FirDefaultPropertyAccessor(session, psi, isGetter = false) { + propertyType: FirType, + visibility: Visibility +) : FirDefaultPropertyAccessor(session, psi, isGetter = false, visibility = visibility) { override val valueParameters = mutableListOf(FirDefaultSetterValueParameter(session, psi, propertyType)) override var returnType: FirType = FirImplicitUnitType(session, psi) @@ -62,6 +69,7 @@ class FirDefaultPropertySetter( override fun transformChildren(transformer: FirTransformer, data: D): FirElement { valueParameters.transformInplace(transformer, data) returnType = returnType.transformSingle(transformer, data) + status = status.transformSingle(transformer, data) return this } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt index c6c1d75bff3..302cc4b1866 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirEnumEntry -import org.jetbrains.kotlin.fir.declarations.FirMemberPlatformStatus import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.name.Name @@ -28,7 +27,8 @@ class FirEnumEntryImpl( name, visibility = Visibilities.UNKNOWN, modality = Modality.FINAL, - platformStatus = FirMemberPlatformStatus.DEFAULT, + isExpect = false, + isActual = false, classKind = ClassKind.ENUM_ENTRY, isInner = false, isCompanion = false, 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 774de6b2394..f173a5805ea 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 @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.declarations.FirMemberPlatformStatus import org.jetbrains.kotlin.fir.declarations.FirNamedFunction import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirBody @@ -25,20 +24,29 @@ class FirMemberFunctionImpl( name: Name, visibility: Visibility, modality: Modality?, - platformStatus: FirMemberPlatformStatus, + isExpect: Boolean, + isActual: Boolean, isOverride: Boolean, - override val isOperator: Boolean, - override val isInfix: Boolean, - override val isInline: Boolean, - override val isTailRec: Boolean, - override val isExternal: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isInline: Boolean, + isTailRec: Boolean, + isExternal: Boolean, receiverType: FirType?, returnType: FirType, override val body: FirBody? ) : FirAbstractCallableMember( session, psi, name, visibility, modality, - platformStatus, isOverride, receiverType, returnType + isExpect, isActual, isOverride, receiverType, returnType ), FirNamedFunction { + init { + status.isOperator = isOperator + status.isInfix = isInfix + status.isInline = isInline + status.isTailRec = isTailRec + status.isExternal = isExternal + } + 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/FirMemberPropertyImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirMemberPropertyImpl.kt index de4f9dd7d5a..444f063d98a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirMemberPropertyImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirMemberPropertyImpl.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.declarations.FirMemberPlatformStatus import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -25,10 +24,11 @@ class FirMemberPropertyImpl( name: Name, visibility: Visibility, modality: Modality?, - platformStatus: FirMemberPlatformStatus, + isExpect: Boolean, + isActual: Boolean, isOverride: Boolean, - override val isConst: Boolean, - override val isLateInit: Boolean, + isConst: Boolean, + isLateInit: Boolean, receiverType: FirType?, returnType: FirType, override val isVar: Boolean, @@ -36,8 +36,14 @@ class FirMemberPropertyImpl( override var getter: FirPropertyAccessor, override var setter: FirPropertyAccessor, override val delegate: FirExpression? -) : FirAbstractCallableMember(session, psi, name, visibility, modality, platformStatus, isOverride, receiverType, returnType), - FirProperty { +) : FirAbstractCallableMember( + session, psi, name, visibility, modality, isExpect, isActual, isOverride, receiverType, returnType +), FirProperty { + init { + status.isConst = isConst + status.isLateInit = isLateInit + } + override fun transformChildren(transformer: FirTransformer, data: D): FirElement { getter = getter.transformSingle(transformer, data) setter = setter.transformSingle(transformer, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructorImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructorImpl.kt index ed5448a7e76..44ad539706d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructorImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructorImpl.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.declarations.impl import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.declarations.FirMemberPlatformStatus import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.types.FirType @@ -16,7 +15,8 @@ class FirPrimaryConstructorImpl( session: FirSession, psi: PsiElement?, visibility: Visibility, - platformStatus: FirMemberPlatformStatus, + isExpect: Boolean, + isActual: Boolean, delegatedSelfType: FirType, delegatedConstructor: FirDelegatedConstructorCall? -) : FirConstructorImpl(session, psi, visibility, platformStatus, delegatedSelfType, delegatedConstructor, body = null) \ No newline at end of file +) : FirConstructorImpl(session, psi, visibility, isExpect, isActual, delegatedSelfType, delegatedConstructor, body = null) \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt index 90cb05896f8..2b23f551b49 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession @@ -19,12 +20,17 @@ class FirPropertyAccessorImpl( session: FirSession, psi: PsiElement?, override val isGetter: Boolean, - override val visibility: Visibility, + visibility: Visibility, override var returnType: FirType, body: FirBody? ) : FirAbstractFunction(session, psi, body), FirPropertyAccessor { + override var status = FirDeclarationStatusImpl( + session, visibility, Modality.FINAL + ) + override fun transformChildren(transformer: FirTransformer, data: D): FirElement { returnType = returnType.transformSingle(transformer, data) + status = status.transformSingle(transformer, data) return super.transformChildren(transformer, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedDeclarationStatusImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedDeclarationStatusImpl.kt new file mode 100644 index 00000000000..1eb30728b10 --- /dev/null +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedDeclarationStatusImpl.kt @@ -0,0 +1,34 @@ +/* + * 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 com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.declarations.FirResolvedDeclarationStatus + +class FirResolvedDeclarationStatusImpl( + session: FirSession, + visibility: Visibility, + modality: Modality +) : FirDeclarationStatusImpl(session, visibility, modality), FirResolvedDeclarationStatus { + + internal constructor( + session: FirSession, + visibility: Visibility, + modality: Modality, + flags: Int + ) : this(session, visibility, modality) { + this.flags = flags + } + + override val visibility: Visibility + get() = super.visibility + + override val modality: Modality + get() = super.modality!! +} \ 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 d92a7868cf3..2a4e7295572 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 @@ -10,10 +10,8 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.declarations.FirMemberPlatformStatus import org.jetbrains.kotlin.fir.declarations.FirTypeAlias import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol -import org.jetbrains.kotlin.fir.transformInplace import org.jetbrains.kotlin.fir.transformSingle import org.jetbrains.kotlin.fir.types.FirType import org.jetbrains.kotlin.fir.visitors.FirTransformer @@ -25,22 +23,18 @@ class FirTypeAliasImpl( override val symbol: FirTypeAliasSymbol, name: Name, visibility: Visibility, - platformStatus: FirMemberPlatformStatus, + isExpect: Boolean, + isActual: Boolean, override var expandedType: FirType -) : FirAbstractMemberDeclaration(session, psi, name, visibility, Modality.FINAL, platformStatus), FirTypeAlias { +) : FirAbstractMemberDeclaration(session, psi, name, visibility, Modality.FINAL, isExpect, isActual), FirTypeAlias { init { symbol.bind(this) } - override val modality: Modality - get() = super.modality ?: Modality.FINAL - override fun transformChildren(transformer: FirTransformer, data: D): FirElement { - annotations.transformInplace(transformer, data) - typeParameters.transformInplace(transformer, data) expandedType = expandedType.transformSingle(transformer, data) - return this + return super.transformChildren(transformer, data) } } \ No newline at end of file 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 510cfaa7afa..c0e36dd9cc7 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 @@ -90,6 +90,14 @@ abstract class FirTransformer : FirVisitor { + return transformElement(declarationStatus, data) + } + + open fun transformResolvedDeclarationStatus(resolvedDeclarationStatus: FirResolvedDeclarationStatus, data: D): CompositeTransformResult { + return transformDeclarationStatus(resolvedDeclarationStatus, data) + } + open fun transformImport(import: FirImport, data: D): CompositeTransformResult { return transformElement(import, data) } @@ -198,6 +206,10 @@ abstract class FirTransformer : FirVisitor { + return transformDeclarationStatus(declarationStatus, data) + } + final override fun visitDeclarationWithBody(declarationWithBody: FirDeclarationWithBody, data: D): CompositeTransformResult { return transformDeclarationWithBody(declarationWithBody, data) } @@ -286,6 +298,10 @@ abstract class FirTransformer : FirVisitor { + return transformResolvedDeclarationStatus(resolvedDeclarationStatus, data) + } + final override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: D): CompositeTransformResult { return transformAnonymousInitializer(anonymousInitializer, 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 9dd72d2fba7..63e460e8798 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 @@ -90,6 +90,14 @@ abstract class FirVisitor { return visitDeclaration(variable, data) } + open fun visitDeclarationStatus(declarationStatus: FirDeclarationStatus, data: D): R { + return visitElement(declarationStatus, data) + } + + open fun visitResolvedDeclarationStatus(resolvedDeclarationStatus: FirResolvedDeclarationStatus, data: D): R { + return visitDeclarationStatus(resolvedDeclarationStatus, data) + } + open fun visitImport(import: FirImport, data: D): R { return visitElement(import, 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 d548bdfb334..bf1a17e39dd 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 @@ -90,6 +90,14 @@ abstract class FirVisitorVoid : FirVisitor() { visitDeclaration(variable, null) } + open fun visitDeclarationStatus(declarationStatus: FirDeclarationStatus) { + visitElement(declarationStatus, null) + } + + open fun visitResolvedDeclarationStatus(resolvedDeclarationStatus: FirResolvedDeclarationStatus) { + visitDeclarationStatus(resolvedDeclarationStatus, null) + } + open fun visitImport(import: FirImport) { visitElement(import, null) } @@ -198,6 +206,10 @@ abstract class FirVisitorVoid : FirVisitor() { visitDeclaration(declaration) } + final override fun visitDeclarationStatus(declarationStatus: FirDeclarationStatus, data: Nothing?) { + visitDeclarationStatus(declarationStatus) + } + final override fun visitDeclarationWithBody(declarationWithBody: FirDeclarationWithBody, data: Nothing?) { visitDeclarationWithBody(declarationWithBody) } @@ -286,6 +298,10 @@ abstract class FirVisitorVoid : FirVisitor() { visitVariable(variable) } + final override fun visitResolvedDeclarationStatus(resolvedDeclarationStatus: FirResolvedDeclarationStatus, data: Nothing?) { + visitResolvedDeclarationStatus(resolvedDeclarationStatus) + } + final override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: Nothing?) { visitAnonymousInitializer(anonymousInitializer) } diff --git a/compiler/testData/fir/rawBuilder/declarations/F.txt b/compiler/testData/fir/rawBuilder/declarations/F.txt index f3afb5219e0..e15742b8cdd 100644 --- a/compiler/testData/fir/rawBuilder/declarations/F.txt +++ b/compiler/testData/fir/rawBuilder/declarations/F.txt @@ -3,7 +3,7 @@ FILE: F.kt public? constructor(): super() } - public? final class B : A { + public? final? class B : A { public? constructor(): super() } diff --git a/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt b/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt index a85a0f197de..010271b41d5 100644 --- a/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt +++ b/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt @@ -9,10 +9,10 @@ FILE: NestedOfAliasedType.kt } public? final typealias TA = A - public? final class B : TA { + public? final? class B : TA { public? constructor(): super() - public? final class NestedInB : Nested { + public? final? class NestedInB : Nested { public? constructor(): super() } diff --git a/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt b/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt index a89d7850810..81ac2b8e8ad 100644 --- a/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt +++ b/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt @@ -13,10 +13,10 @@ FILE: NestedSuperType.kt } } - public? final class Your : My { + public? final? class Your : My { public? constructor(): super() - public? final class NestedThree : NestedOne { + public? final? class NestedThree : NestedOne { public? constructor(): super() } diff --git a/compiler/testData/fir/rawBuilder/declarations/complexTypes.txt b/compiler/testData/fir/rawBuilder/declarations/complexTypes.txt index de69f6718b0..74acdbbb397 100644 --- a/compiler/testData/fir/rawBuilder/declarations/complexTypes.txt +++ b/compiler/testData/fir/rawBuilder/declarations/complexTypes.txt @@ -1,14 +1,14 @@ FILE: complexTypes.kt - public? final class C { + public? final? class C { public? constructor(): super() - public? final inner class D { + public? final? inner class D { public? constructor(): super() } } - public? abstract interface Test { + public? final? 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 dfc66446da1..eafe374800b 100644 --- a/compiler/testData/fir/rawBuilder/declarations/derivedClass.txt +++ b/compiler/testData/fir/rawBuilder/declarations/derivedClass.txt @@ -6,7 +6,7 @@ FILE: derivedClass.kt public? get(): T } - public? final class Derived : Base { + public? final? class Derived : Base { public? constructor(x: T): super>() } diff --git a/compiler/testData/fir/rawBuilder/declarations/enums.txt b/compiler/testData/fir/rawBuilder/declarations/enums.txt index 5bc8f9684fb..7b4d11d639b 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? constructor(): super() public? final enum entry FIRST { @@ -18,14 +18,14 @@ FILE: enums.kt } } - public? final enum class Planet { + public? final? enum class Planet { public? constructor(m: Double, r: Double): super() public? final? property m(val): Double public? get(): Double internal final? property r(val): Double - public? get(): Double + internal get(): Double public? final enum entry MERCURY : Planet { public? constructor(): super() @@ -56,7 +56,7 @@ FILE: enums.kt public? abstract function sayHello(): kotlin.Unit - public? final companion object Companion { + public? final? companion object Companion { public? constructor(): super() public? final? const property G(val): = STUB diff --git a/compiler/testData/fir/rawBuilder/declarations/enums2.txt b/compiler/testData/fir/rawBuilder/declarations/enums2.txt index 6f09f54cf9c..8ae53bee10d 100644 --- a/compiler/testData/fir/rawBuilder/declarations/enums2.txt +++ b/compiler/testData/fir/rawBuilder/declarations/enums2.txt @@ -1,15 +1,15 @@ FILE: enums2.kt - public? abstract interface Some { + public? final? interface Some { } - public? final object O1 : Some { + public? final? object O1 : Some { public? constructor(): super() } - public? final object O2 : Some { + public? final? object O2 : Some { public? constructor(): super() } - public? final enum class SomeEnum { + public? final? enum class SomeEnum { public? constructor(x: Some): super() public? final? property x(val): Some diff --git a/compiler/testData/fir/rawBuilder/declarations/expectActual.txt b/compiler/testData/fir/rawBuilder/declarations/expectActual.txt index a857431f433..632cb484a76 100644 --- a/compiler/testData/fir/rawBuilder/declarations/expectActual.txt +++ b/compiler/testData/fir/rawBuilder/declarations/expectActual.txt @@ -1,12 +1,12 @@ FILE: expectActual.kt - public? final expect class MyClass { + public? final? expect class MyClass { public? constructor(): super() } 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? constructor(): super() } diff --git a/compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt b/compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt index d0c75850ea8..d7add662bdb 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? abstract interface Any { + public? final? interface Any { } public? final? inline function safeAs Any.(): T? { STUB diff --git a/compiler/testData/fir/rawBuilder/declarations/nestedClass.txt b/compiler/testData/fir/rawBuilder/declarations/nestedClass.txt index 32153a043f4..2c601955c9d 100644 --- a/compiler/testData/fir/rawBuilder/declarations/nestedClass.txt +++ b/compiler/testData/fir/rawBuilder/declarations/nestedClass.txt @@ -6,15 +6,15 @@ FILE: nestedClass.kt public? get(): String } - public? final class Outer { + public? final? class Outer { public? constructor(): super() - public? final class Derived : Base { + public? final? class Derived : Base { public? constructor(s: String): super() } - public? final object Obj : Base { + public? final? object Obj : Base { public? constructor(): super() } diff --git a/compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.txt b/compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.txt index 2070bc9fe4b..fb1263f5289 100644 --- a/compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.txt +++ b/compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.txt @@ -1,5 +1,5 @@ FILE: noPrimaryConstructor.kt - public? final class NoPrimary { + public? final? class NoPrimary { public? final? property x(val): String public? get(): String diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt b/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt index 66d4591837b..d635b61313c 100644 --- a/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt +++ b/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt @@ -1,16 +1,16 @@ FILE: simpleClass.kt - public? abstract interface SomeInterface { + public? final? 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 { public? constructor(): super() private final? property baz(val): = STUB - public? get(): + private get(): public? open? override function foo(x: Int, y: String): String { } @@ -27,7 +27,7 @@ FILE: simpleClass.kt public? set(value: Double): kotlin.Unit } - public? final inline class InlineClass { + public? final? inline class InlineClass { public? constructor(): super() } diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt b/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt index aa966b48654..62f0092765d 100644 --- a/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt +++ b/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt @@ -1,8 +1,8 @@ FILE: simpleTypeAlias.kt - public? abstract interface B { + public? final? interface B { } public? final typealias C = B - public? final class D : C { + public? final? class D : C { public? constructor(): super() } diff --git a/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt b/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt index f756abd86d9..4f0b84cca60 100644 --- a/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt +++ b/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt @@ -3,10 +3,10 @@ FILE: typeAliasWithGeneric.kt public? constructor(): super() } - public? abstract interface B { + public? final? interface B { } public? final typealias C = B - public? final class D : C { + public? final? class D : C { public? constructor(): super() } diff --git a/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt index 7a0f4f01a5e..510ae1cbdb1 100644 --- a/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt +++ b/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt @@ -1,10 +1,10 @@ FILE: typeParameterVsNested.kt - public? abstract interface Some { + public? final? interface Some { } public? abstract class My { public? constructor(): super() - public? final inner class T { + public? final? inner class T { public? constructor(): super() } @@ -20,7 +20,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 { public? constructor(): super() } diff --git a/compiler/testData/fir/rawBuilder/declarations/typeParameters.txt b/compiler/testData/fir/rawBuilder/declarations/typeParameters.txt index 8887b0a62bf..d5b135e2721 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? abstract interface List { + public? final? interface List { public? final? operator function get(index: Int): T public? final? infix function concat(other: List): List @@ -11,7 +11,7 @@ FILE: typeParameters.kt public? constructor(): super() } - public? final class SomeList : AbstractList { + public? final? class SomeList : AbstractList { public? constructor(): super>() public? open? override function get(index: Int): Int { diff --git a/compiler/testData/fir/resolve/F.txt b/compiler/testData/fir/resolve/F.txt index c1896ec5f08..ae7294982d1 100644 --- a/compiler/testData/fir/resolve/F.txt +++ b/compiler/testData/fir/resolve/F.txt @@ -1,9 +1,9 @@ FILE: F.kt - public? open class A { - public? constructor(): super() + public open class A { + public constructor(): super() } - public? final class B : R|A| { - public? constructor(): super() + public final class B : R|A| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/NestedOfAliasedType.txt b/compiler/testData/fir/resolve/NestedOfAliasedType.txt index 9e2d4dd99dc..eb24b3b87d3 100644 --- a/compiler/testData/fir/resolve/NestedOfAliasedType.txt +++ b/compiler/testData/fir/resolve/NestedOfAliasedType.txt @@ -1,19 +1,19 @@ FILE: NestedOfAliasedType.kt - public? abstract class A { - public? constructor(): super() + public abstract class A { + public constructor(): super() - public? abstract class Nested { - public? constructor(): super() + public abstract class Nested { + public constructor(): super() } } - public? final typealias TA = R|A| - public? final class B : R|TA = A| { - public? constructor(): super() + public final typealias TA = R|A| + public final class B : R|TA = A| { + public constructor(): super() - public? final class NestedInB : R|A.Nested| { - public? constructor(): super() + public final class NestedInB : R|A.Nested| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/NestedSuperType.txt b/compiler/testData/fir/resolve/NestedSuperType.txt index 204e31216ed..fc9100aa4d6 100644 --- a/compiler/testData/fir/resolve/NestedSuperType.txt +++ b/compiler/testData/fir/resolve/NestedSuperType.txt @@ -1,23 +1,23 @@ FILE: NestedSuperType.kt - public? abstract class My { - public? constructor(): super() + public abstract class My { + public constructor(): super() - public? abstract class NestedOne : R|p/My| { - public? constructor(): super() + public abstract class NestedOne : R|p/My| { + public constructor(): super() - public? abstract class NestedTwo : R|p/My.NestedOne| { - public? constructor(): super() + public abstract class NestedTwo : R|p/My.NestedOne| { + public constructor(): super() } } } - public? final class Your : R|p/My| { - public? constructor(): super() + public final class Your : R|p/My| { + public constructor(): super() - public? final class NestedThree : R|p/My.NestedOne| { - public? constructor(): super() + public final class NestedThree : R|p/My.NestedOne| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt b/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt index 95fbcfa7540..40982ac7346 100644 --- a/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt +++ b/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt @@ -1,9 +1,9 @@ FILE: TwoDeclarationsInSameFile.kt - public? open class A { - public? constructor(): super() + public open class A { + public constructor(): super() } - public? final class B : R|p/A| { - public? constructor(): super() + public final class B : R|p/A| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/builtins/lists.txt b/compiler/testData/fir/resolve/builtins/lists.txt index fb8132ee806..12d841a2ea0 100644 --- a/compiler/testData/fir/resolve/builtins/lists.txt +++ b/compiler/testData/fir/resolve/builtins/lists.txt @@ -1,15 +1,15 @@ FILE: lists.kt - public? abstract class MyStringList : R|kotlin/collections/List| { - public? constructor(): super() + public abstract class MyStringList : R|kotlin/collections/List| { + public constructor(): super() } - public? abstract class MyMutableStringList : R|kotlin/collections/MutableList| { - public? constructor(): super() + public abstract class MyMutableStringList : R|kotlin/collections/MutableList| { + public constructor(): super() } - public? final? function convert R|kotlin/collections/List|.(): R|MyStringList| { + public final function convert R|kotlin/collections/List|.(): R|MyStringList| { STUB } - public? final? function ret(l: R|kotlin/collections/MutableList|): R|MyMutableStringList| { + public final function ret(l: R|kotlin/collections/MutableList|): R|MyMutableStringList| { STUB } diff --git a/compiler/testData/fir/resolve/companion.txt b/compiler/testData/fir/resolve/companion.txt index 1951fe68b61..920e02396ec 100644 --- a/compiler/testData/fir/resolve/companion.txt +++ b/compiler/testData/fir/resolve/companion.txt @@ -1,35 +1,35 @@ FILE: companion.kt - public? abstract class Some { - public? constructor(): super() + public abstract class Some { + public constructor(): super() - public? final companion object Companion { - public? constructor(): super() + public final companion object Companion { + public constructor(): super() - public? final class InCompanion { - public? constructor(): super() + public final class InCompanion { + public constructor(): super() } } - public? abstract property x(val): R|test/Some.Companion.InCompanion| - public? get(): R|test/Some.Companion.InCompanion| + public abstract property x(val): R|test/Some.Companion.InCompanion| + public get(): R|test/Some.Companion.InCompanion| } - public? abstract class Another { - public? constructor(): super() + public abstract class Another { + public constructor(): super() - public? final companion object NamedCompanion { - public? constructor(): super() + public final companion object NamedCompanion { + public constructor(): super() - public? final class InCompanion { - public? constructor(): super() + public final class InCompanion { + public constructor(): super() } } - public? abstract property x(val): R|test/Another.NamedCompanion.InCompanion| - public? get(): R|test/Another.NamedCompanion.InCompanion| + public abstract property x(val): R|test/Another.NamedCompanion.InCompanion| + public get(): R|test/Another.NamedCompanion.InCompanion| } diff --git a/compiler/testData/fir/resolve/derivedClass.txt b/compiler/testData/fir/resolve/derivedClass.txt index 3e4b9bc361c..4f22951e1a9 100644 --- a/compiler/testData/fir/resolve/derivedClass.txt +++ b/compiler/testData/fir/resolve/derivedClass.txt @@ -1,15 +1,15 @@ FILE: derivedClass.kt - public? open class Base { - public? constructor(x: R|T|): super() + public open class Base { + public constructor(x: R|T|): super() - public? final? property x(val): R|T| - public? get(): R|T| + public final property x(val): R|T| + public get(): R|T| } - public? final class Derived : R|Base| { - public? constructor(x: R|T|): super|>() + public final class Derived : R|Base| { + public constructor(x: R|T|): super|>() } - public? final? function create(x: R|T|): R|Derived| { + public final function create(x: R|T|): R|Derived| { STUB } diff --git a/compiler/testData/fir/resolve/enum.txt b/compiler/testData/fir/resolve/enum.txt index 3a472be4bdd..3b47887abd6 100644 --- a/compiler/testData/fir/resolve/enum.txt +++ b/compiler/testData/fir/resolve/enum.txt @@ -1,38 +1,38 @@ FILE: enum.kt - public? abstract interface Some { + public abstract interface Some { } - public? final object O1 : R|Some| { - public? constructor(): super() + public final object O1 : R|Some| { + public constructor(): super() } - public? final object O2 : R|Some| { - public? constructor(): super() + public final object O2 : R|Some| { + public constructor(): super() } - public? final enum class SomeEnum { - public? constructor(x: R|Some|): super() + public final enum class SomeEnum { + private constructor(x: R|Some|): super() - public? final? property x(val): R|Some| - public? get(): R|Some| + public final property x(val): R|Some| + public get(): R|Some| - public? final enum entry FIRST : R|SomeEnum| { - public? constructor(): super() + public final enum entry FIRST : R|SomeEnum| { + public constructor(): super() - public? open? override function check(y: R|Some|): R|kotlin/Boolean| { + public final override function check(y: R|Some|): R|kotlin/Boolean| { STUB } } - public? final enum entry SECOND : R|SomeEnum| { - public? constructor(): super() + public final enum entry SECOND : R|SomeEnum| { + public constructor(): super() - public? open? override function check(y: R|Some|): R|kotlin/Boolean| { + public final override function check(y: R|Some|): R|kotlin/Boolean| { STUB } } - public? abstract function check(y: R|Some|): R|kotlin/Boolean| + public abstract function check(y: R|Some|): R|kotlin/Boolean| } diff --git a/compiler/testData/fir/resolve/fromBuilder/complexTypes.kt b/compiler/testData/fir/resolve/fromBuilder/complexTypes.kt new file mode 100644 index 00000000000..4ff9238e2a4 --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/complexTypes.kt @@ -0,0 +1,11 @@ +package a.b + +class C { + inner class D { + + } +} + +interface Test { + val x: a.b.C.D, *> +} \ No newline at end of file diff --git a/compiler/testData/fir/resolve/fromBuilder/complexTypes.txt b/compiler/testData/fir/resolve/fromBuilder/complexTypes.txt new file mode 100644 index 00000000000..662c68dda4f --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/complexTypes.txt @@ -0,0 +1,15 @@ +FILE: complexTypes.kt + public final class C { + public constructor(): super() + + public final inner class D { + public constructor(): super() + + } + + } + public abstract interface Test { + public abstract property x(val): R|a/b/C.D, *>| + public get(): R|a/b/C.D, *>| + + } diff --git a/compiler/testData/fir/resolve/fromBuilder/enums.kt b/compiler/testData/fir/resolve/fromBuilder/enums.kt new file mode 100644 index 00000000000..d9193ae313b --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/enums.kt @@ -0,0 +1,33 @@ +import my.println + +enum class Order { + FIRST, + SECOND, + THIRD +} + +enum class Planet(val m: Double, internal val r: Double) { + MERCURY(1.0, 2.0) { + override fun sayHello() { + println("Hello!!!") + } + }, + VENERA(3.0, 4.0) { + override fun sayHello() { + println("Ola!!!") + } + }, + EARTH(5.0, 6.0) { + override fun sayHello() { + println("Privet!!!") + } + }; + + val g: Double = G * m / (r * r) + + abstract fun sayHello() + + companion object { + const val G = 6.67e-11 + } +} \ No newline at end of file diff --git a/compiler/testData/fir/resolve/fromBuilder/enums.txt b/compiler/testData/fir/resolve/fromBuilder/enums.txt new file mode 100644 index 00000000000..ae684564a38 --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/enums.txt @@ -0,0 +1,67 @@ +FILE: enums.kt + public final enum class Order { + private constructor(): super() + + public final enum entry FIRST { + public constructor(): super() + + } + + public final enum entry SECOND { + public constructor(): super() + + } + + public final enum entry THIRD { + public constructor(): super() + + } + + } + public final enum class Planet { + private constructor(m: R|kotlin/Double|, r: R|kotlin/Double|): super() + + public final property m(val): R|kotlin/Double| + public get(): R|kotlin/Double| + + internal final property r(val): R|kotlin/Double| + internal get(): R|kotlin/Double| + + public final enum entry MERCURY : R|Planet| { + public constructor(): super() + + public final override function sayHello(): R|kotlin/Unit| { + } + + } + + public final enum entry VENERA : R|Planet| { + public constructor(): super() + + public final override function sayHello(): R|kotlin/Unit| { + } + + } + + public final enum entry EARTH : R|Planet| { + public constructor(): super() + + public final override function sayHello(): R|kotlin/Unit| { + } + + } + + public final property g(val): R|kotlin/Double| = STUB + public get(): R|kotlin/Double| + + public abstract function sayHello(): R|kotlin/Unit| + + public final companion object Companion { + public constructor(): super() + + public final const property G(val): R|error: Not supported: FirImplicitTypeImpl| = STUB + public get(): R|error: Not supported: FirImplicitTypeImpl| + + } + + } diff --git a/compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.kt b/compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.kt new file mode 100644 index 00000000000..fbd6b4e236e --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.kt @@ -0,0 +1,9 @@ +class NoPrimary { + val x: String + + constructor(x: String) { + this.x = x + } + + constructor(): this("") +} \ No newline at end of file diff --git a/compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.txt b/compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.txt new file mode 100644 index 00000000000..3d36c220922 --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.txt @@ -0,0 +1,11 @@ +FILE: noPrimaryConstructor.kt + public final class NoPrimary { + public final property x(val): R|kotlin/String| + public get(): R|kotlin/String| + + public constructor(x: R|kotlin/String|): super() { + } + + public constructor(): this() + + } diff --git a/compiler/testData/fir/resolve/fromBuilder/simpleClass.kt b/compiler/testData/fir/resolve/fromBuilder/simpleClass.kt new file mode 100644 index 00000000000..018c484f32b --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/simpleClass.kt @@ -0,0 +1,21 @@ +interface SomeInterface { + fun foo(x: Int, y: String): String + + val bar: Boolean +} + +class SomeClass : SomeInterface { + private val baz = 42 + + override fun foo(x: Int, y: String): String { + return y + x + baz + } + + override var bar: Boolean + get() = true + set(value) {} + + lateinit var fau: Double +} + +inline class InlineClass \ No newline at end of file diff --git a/compiler/testData/fir/resolve/fromBuilder/simpleClass.txt b/compiler/testData/fir/resolve/fromBuilder/simpleClass.txt new file mode 100644 index 00000000000..1269a7ac2e0 --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/simpleClass.txt @@ -0,0 +1,33 @@ +FILE: simpleClass.kt + public abstract interface SomeInterface { + public abstract function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| + + public abstract property bar(val): R|kotlin/Boolean| + public get(): R|kotlin/Boolean| + + } + public final class SomeClass : R|SomeInterface| { + public constructor(): super() + + private final property baz(val): R|error: Not supported: FirImplicitTypeImpl| = STUB + private get(): R|error: Not supported: FirImplicitTypeImpl| + + public final override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { + } + + public final override property bar(var): R|kotlin/Boolean| + public get(): R|kotlin/Boolean| { + STUB + } + public set(value: R|kotlin/Boolean|): R|kotlin/Unit| { + } + + public final lateinit property fau(var): R|kotlin/Double| + public get(): R|kotlin/Double| + public set(value: R|kotlin/Double|): R|kotlin/Unit| + + } + public final inline class InlineClass { + public constructor(): super() + + } diff --git a/compiler/testData/fir/resolve/fromBuilder/typeParameters.kt b/compiler/testData/fir/resolve/fromBuilder/typeParameters.kt new file mode 100644 index 00000000000..e267b1ada73 --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/typeParameters.kt @@ -0,0 +1,16 @@ +interface List { + operator fun get(index: Int): T + + infix fun concat(other: List): List +} + +typealias StringList = List +typealias AnyList = List<*> + +abstract class AbstractList : List + +class SomeList : AbstractList() { + override fun get(index: Int): Int = 42 + + override fun concat(other: List): List = this +} diff --git a/compiler/testData/fir/resolve/fromBuilder/typeParameters.txt b/compiler/testData/fir/resolve/fromBuilder/typeParameters.txt new file mode 100644 index 00000000000..45f9164f338 --- /dev/null +++ b/compiler/testData/fir/resolve/fromBuilder/typeParameters.txt @@ -0,0 +1,25 @@ +FILE: typeParameters.kt + public abstract interface List { + public abstract operator function get(index: R|kotlin/Int|): R|T| + + public abstract infix function concat(other: R|List|): R|List| + + } + public final typealias StringList = R|List| + public final typealias AnyList = R|List<*>| + public abstract class AbstractList : R|List| { + public constructor(): super() + + } + public final class SomeList : R|AbstractList| { + public constructor(): super|>() + + public final override function get(index: R|kotlin/Int|): R|kotlin/Int| { + STUB + } + + public final override function concat(other: R|List|): R|List| { + STUB + } + + } diff --git a/compiler/testData/fir/resolve/ft.txt b/compiler/testData/fir/resolve/ft.txt index b1a4c3f5428..03379ca48ab 100644 --- a/compiler/testData/fir/resolve/ft.txt +++ b/compiler/testData/fir/resolve/ft.txt @@ -1,5 +1,5 @@ FILE: ft.kt - public? abstract interface KMutableProperty1 : R|KProperty1| { + public abstract interface KMutableProperty1 : R|KProperty1| { } - public? abstract interface KProperty1 : R|(T) -> kotlin/Int| { + public abstract interface KProperty1 : R|(T) -> kotlin/Int| { } diff --git a/compiler/testData/fir/resolve/functionTypes.txt b/compiler/testData/fir/resolve/functionTypes.txt index 276f4452662..9d140cad0eb 100644 --- a/compiler/testData/fir/resolve/functionTypes.txt +++ b/compiler/testData/fir/resolve/functionTypes.txt @@ -1,17 +1,17 @@ FILE: functionTypes.kt - public? final? function simpleRun(f: R|(T) -> kotlin/Unit|): R|kotlin/Unit| { + public final function simpleRun(f: R|(T) -> kotlin/Unit|): R|kotlin/Unit| { STUB } - public? final? function simpleMap R|kotlin/collections/List|.(f: R|(T) -> R|): R|R| { + public final function simpleMap R|kotlin/collections/List|.(f: R|(T) -> R|): R|R| { } - public? final? function simpleWith(t: R|T|, f: R|T.() -> kotlin/Unit|): R|kotlin/Unit| { + public final function simpleWith(t: R|T|, f: R|T.() -> kotlin/Unit|): R|kotlin/Unit| { STUB } - public? abstract interface KMutableProperty1 : R|KProperty1|, R|KMutableProperty| { + public abstract interface KMutableProperty1 : R|KProperty1|, R|KMutableProperty| { } - public? abstract interface KProperty1 : R|KProperty|, R|(T) -> R| { + public abstract interface KProperty1 : R|KProperty|, R|(T) -> R| { } - public? abstract interface KProperty { + public abstract interface KProperty { } - public? abstract interface KMutableProperty { + public abstract interface KMutableProperty { } diff --git a/compiler/testData/fir/resolve/genericFunctions.txt b/compiler/testData/fir/resolve/genericFunctions.txt index 5ed7844a619..15712ca671d 100644 --- a/compiler/testData/fir/resolve/genericFunctions.txt +++ b/compiler/testData/fir/resolve/genericFunctions.txt @@ -1,12 +1,12 @@ FILE: genericFunctions.kt - public? abstract interface Any { + public abstract interface Any { } - public? final? inline function safeAs R|Any|.(): R|T| { + public final inline function safeAs R|Any|.(): R|T| { STUB } - public? abstract class Summator { - public? constructor(): super() + public abstract class Summator { + public constructor(): super() - public? abstract function plus(first: R|T|, second: R|T|): R|T| + public abstract function plus(first: R|T|, second: R|T|): R|T| } diff --git a/compiler/testData/fir/resolve/multifile/Annotations.txt b/compiler/testData/fir/resolve/multifile/Annotations.txt index 8086ebb13ae..a3abf050949 100644 --- a/compiler/testData/fir/resolve/multifile/Annotations.txt +++ b/compiler/testData/fir/resolve/multifile/Annotations.txt @@ -1,29 +1,29 @@ FILE: Annotations.kt @FILE:R|annotations/Simple|() - @R|annotations/WithInt|(STUB) public? abstract class First { - public? constructor(): super() + @R|annotations/WithInt|(STUB) public abstract class First { + public constructor(): super() - @R|annotations/Simple|() public? abstract function foo(@R|annotations/WithString|(STUB) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit| + @R|annotations/Simple|() public abstract function foo(@R|annotations/WithString|(STUB) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit| - @R|annotations/Complex|(STUB, STUB) public? abstract property v(val): R|kotlin/String| - public? get(): R|kotlin/String| + @R|annotations/Complex|(STUB, STUB) public abstract property v(val): R|kotlin/String| + public get(): R|kotlin/String| } - @R|annotations/WithString|(STUB) public? final class Second : @R|annotations/WithInt|(STUB) R|test/First| { - public? constructor(y: R|kotlin/Char|): super<@R|annotations/WithInt|(STUB) R|test/First|>() + @R|annotations/WithString|(STUB) public final class Second : @R|annotations/WithInt|(STUB) R|test/First| { + public constructor(y: R|kotlin/Char|): super<@R|annotations/WithInt|(STUB) R|test/First|>() - public? final? property y(val): R|kotlin/Char| - public? get(): R|kotlin/Char| + public final property y(val): R|kotlin/Char| + public get(): R|kotlin/Char| - public? open? override function foo(arg: R|kotlin/Double|): R|kotlin/Unit| { + public final override function foo(arg: R|kotlin/Double|): R|kotlin/Unit| { } - public? open? override property v(val): R|kotlin/String| - @R|annotations/Simple|() public? get(): R|kotlin/String| { + public final override property v(val): R|kotlin/String| + @R|annotations/Simple|() public get(): R|kotlin/String| { STUB } - @R|annotations/WithString|(STUB) public? constructor(): this() + @R|annotations/WithString|(STUB) public constructor(): this() } - @R|annotations/WithInt|(STUB) @R|annotations/WithInt|(STUB) public? final typealias Third = @R|annotations/Simple|() R|test/Second| + @R|annotations/WithInt|(STUB) @R|annotations/WithInt|(STUB) public final typealias Third = @R|annotations/Simple|() R|test/Second| diff --git a/compiler/testData/fir/resolve/multifile/NestedSuperType.txt b/compiler/testData/fir/resolve/multifile/NestedSuperType.txt index ff153045256..741fe382702 100644 --- a/compiler/testData/fir/resolve/multifile/NestedSuperType.txt +++ b/compiler/testData/fir/resolve/multifile/NestedSuperType.txt @@ -1,14 +1,14 @@ FILE: NestedSuperType.kt - public? final class A : R|b/B| { - public? constructor(): super() + public final class A : R|b/B| { + public constructor(): super() - public? final class NestedInA1 : R|b/B.NestedInB| { - public? constructor(): super() + public final class NestedInA1 : R|b/B.NestedInB| { + public constructor(): super() } - public? final class NestedInA2 : R|c/C.NestedInC| { - public? constructor(): super() + public final class NestedInA2 : R|c/C.NestedInC| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt b/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt index d4e5c00f0e3..9490d6d4f41 100644 --- a/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt +++ b/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt @@ -1,5 +1,5 @@ FILE: TypeAliasExpansion.kt - public? final class MyClass : R|b/TA = b/A| { - public? constructor(): super() + public final class MyClass : R|b/TA = b/A| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/multifile/sealedStarImport.txt b/compiler/testData/fir/resolve/multifile/sealedStarImport.txt index aeef5a0b0b2..5772e0bc725 100644 --- a/compiler/testData/fir/resolve/multifile/sealedStarImport.txt +++ b/compiler/testData/fir/resolve/multifile/sealedStarImport.txt @@ -1,11 +1,11 @@ FILE: sealedStarImport.kt - public? abstract class Factory { - public? constructor(): super() + public abstract class Factory { + public constructor(): super() - public? abstract function createTest(): R|error: Symbol not found| + public abstract function createTest(): R|error: Symbol not found| - public? abstract function createObj(): R|test/Test.O| + public abstract function createObj(): R|test/Test.O| - public? abstract function createExtra(): R|test/Test.Extra| + public abstract function createExtra(): R|test/Test.Extra| } diff --git a/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt b/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt index fbde8da0a17..4129d2d6620 100644 --- a/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt +++ b/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt @@ -1,5 +1,5 @@ FILE: simpleAliasedImport.kt - public? final class YourClass : R|b/MyClass| { - public? constructor(): super() + public final class YourClass : R|b/MyClass| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/multifile/simpleImport.txt b/compiler/testData/fir/resolve/multifile/simpleImport.txt index 25c6dfb546f..b36e7bd64f0 100644 --- a/compiler/testData/fir/resolve/multifile/simpleImport.txt +++ b/compiler/testData/fir/resolve/multifile/simpleImport.txt @@ -1,5 +1,5 @@ FILE: simpleImport.kt - public? final class YourClass : R|b/MyClass| { - public? constructor(): super() + public final class YourClass : R|b/MyClass| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/multifile/simpleImportNested.txt b/compiler/testData/fir/resolve/multifile/simpleImportNested.txt index 2d55acb5eb3..264dbdbc131 100644 --- a/compiler/testData/fir/resolve/multifile/simpleImportNested.txt +++ b/compiler/testData/fir/resolve/multifile/simpleImportNested.txt @@ -1,5 +1,5 @@ FILE: simpleImportNested.kt - public? final class YourClass : R|a/MyClass.MyNested| { - public? constructor(): super() + public final class YourClass : R|a/MyClass.MyNested| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt b/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt index 6d209715281..97e72331ecd 100644 --- a/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt +++ b/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt @@ -1,5 +1,5 @@ FILE: simpleImportOuter.kt - public? final class My : R|a/Outer.Nested| { - public? constructor(): super() + public final class My : R|a/Outer.Nested| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/multifile/simpleStarImport.txt b/compiler/testData/fir/resolve/multifile/simpleStarImport.txt index 95f5f7a7210..726d271253d 100644 --- a/compiler/testData/fir/resolve/multifile/simpleStarImport.txt +++ b/compiler/testData/fir/resolve/multifile/simpleStarImport.txt @@ -1,2 +1,2 @@ FILE: simpleStarImport.kt - public? final? function foo(arg: R|b/d/Other|): R|b/d/Another| + public final function foo(arg: R|b/d/Other|): R|b/d/Another| diff --git a/compiler/testData/fir/resolve/nestedClass.txt b/compiler/testData/fir/resolve/nestedClass.txt index 0c88a698396..e20c9e39631 100644 --- a/compiler/testData/fir/resolve/nestedClass.txt +++ b/compiler/testData/fir/resolve/nestedClass.txt @@ -1,21 +1,21 @@ FILE: nestedClass.kt - public? abstract class Base { - public? constructor(s: R|kotlin/String|): super() + public abstract class Base { + public constructor(s: R|kotlin/String|): super() - public? final? property s(val): R|kotlin/String| - public? get(): R|kotlin/String| + public final property s(val): R|kotlin/String| + public get(): R|kotlin/String| } - public? final class Outer { - public? constructor(): super() + public final class Outer { + public constructor(): super() - public? final class Derived : R|Base| { - public? constructor(s: R|kotlin/String|): super() + public final class Derived : R|Base| { + public constructor(s: R|kotlin/String|): super() } - public? final object Obj : R|Base| { - public? constructor(): super() + public final object Obj : R|Base| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/simpleClass.txt b/compiler/testData/fir/resolve/simpleClass.txt index 7514951b06d..bbb5a939c7b 100644 --- a/compiler/testData/fir/resolve/simpleClass.txt +++ b/compiler/testData/fir/resolve/simpleClass.txt @@ -1,29 +1,29 @@ FILE: simpleClass.kt - public? abstract interface SomeInterface { - public? final? function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| + public abstract interface SomeInterface { + public abstract 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| + public abstract property bar(val): R|kotlin/Boolean| + public get(): R|kotlin/Boolean| } - public? final class SomeClass : R|SomeInterface| { - public? constructor(): super() + public final class SomeClass : R|SomeInterface| { + public constructor(): super() - private final? property baz(val): R|error: Not supported: FirImplicitTypeImpl| = STUB - public? get(): R|error: Not supported: FirImplicitTypeImpl| + private final property baz(val): R|error: Not supported: FirImplicitTypeImpl| = STUB + private get(): R|error: Not supported: FirImplicitTypeImpl| - public? open? override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { + public final override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { } - public? open? override property bar(var): R|kotlin/Boolean| - public? get(): R|kotlin/Boolean| { + public final override property bar(var): R|kotlin/Boolean| + public get(): R|kotlin/Boolean| { STUB } - public? set(value: R|kotlin/Boolean|): R|kotlin/Unit| { + public set(value: R|kotlin/Boolean|): R|kotlin/Unit| { } - public? final? property fau(var): R|kotlin/Double| - public? get(): R|kotlin/Double| - public? set(value: R|kotlin/Double|): R|kotlin/Unit| + public final property fau(var): R|kotlin/Double| + public get(): R|kotlin/Double| + public set(value: R|kotlin/Double|): R|kotlin/Unit| } diff --git a/compiler/testData/fir/resolve/simpleTypeAlias.txt b/compiler/testData/fir/resolve/simpleTypeAlias.txt index 130b468163d..79f58e1a21f 100644 --- a/compiler/testData/fir/resolve/simpleTypeAlias.txt +++ b/compiler/testData/fir/resolve/simpleTypeAlias.txt @@ -1,8 +1,8 @@ FILE: simpleTypeAlias.kt - public? abstract interface B { + public abstract interface B { } - public? final typealias C = R|B| - public? final class D : R|C = B| { - public? constructor(): super() + public final typealias C = R|B| + public final class D : R|C = B| { + public constructor(): super() } diff --git a/compiler/testData/fir/resolve/stdlib/concurrent.txt b/compiler/testData/fir/resolve/stdlib/concurrent.txt index 1bebf1844c3..56c76b72003 100644 --- a/compiler/testData/fir/resolve/stdlib/concurrent.txt +++ b/compiler/testData/fir/resolve/stdlib/concurrent.txt @@ -1,6 +1,6 @@ FILE: concurrent.kt - @R|kotlin/jvm/Volatile|() public? final? property xx(var): R|kotlin/Int| = STUB - public? get(): R|kotlin/Int| - public? set(value: R|kotlin/Int|): R|kotlin/Unit| - @R|kotlin/jvm/Synchronized|() public? final? function foo(): R|kotlin/Unit| { + @R|kotlin/jvm/Volatile|() public final property xx(var): R|kotlin/Int| = STUB + public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + @R|kotlin/jvm/Synchronized|() public final function foo(): R|kotlin/Unit| { } diff --git a/compiler/testData/fir/resolve/stdlib/functionX.txt b/compiler/testData/fir/resolve/stdlib/functionX.txt index 443c3ac3428..a07bf62009d 100644 --- a/compiler/testData/fir/resolve/stdlib/functionX.txt +++ b/compiler/testData/fir/resolve/stdlib/functionX.txt @@ -1,12 +1,12 @@ FILE: functionX.kt - public? final? property x(val): R|kotlin/jvm/functions/Function0| = STUB - public? get(): R|kotlin/jvm/functions/Function0| - public? final? property y(val): R|kotlin/Function1| = STUB - public? get(): R|kotlin/Function1| - public? final class MyFunction : R|kotlin/Function2| { - public? constructor(): super() + public final property x(val): R|kotlin/jvm/functions/Function0| = STUB + public get(): R|kotlin/jvm/functions/Function0| + public final property y(val): R|kotlin/Function1| = STUB + public get(): R|kotlin/Function1| + public final class MyFunction : R|kotlin/Function2| { + public constructor(): super() - public? open? override function invoke(p1: R|kotlin/Int|, p2: R|kotlin/String|): R|kotlin/Unit| { + public final override function invoke(p1: R|kotlin/Int|, p2: R|kotlin/String|): R|kotlin/Unit| { } } diff --git a/compiler/testData/fir/resolve/stdlib/reflectionClass.txt b/compiler/testData/fir/resolve/stdlib/reflectionClass.txt index 986ce9f93e3..52ad077ab80 100644 --- a/compiler/testData/fir/resolve/stdlib/reflectionClass.txt +++ b/compiler/testData/fir/resolve/stdlib/reflectionClass.txt @@ -1,5 +1,5 @@ FILE: reflectionClass.kt - public? final? property javaClass(val): R|java/lang/Class| = STUB - public? get(): R|java/lang/Class| - public? final? property kotlinClass(val): R|kotlin/reflect/KClass| = STUB - public? get(): R|kotlin/reflect/KClass| + public final property javaClass(val): R|java/lang/Class| = STUB + public get(): R|java/lang/Class| + public final property kotlinClass(val): R|kotlin/reflect/KClass| = STUB + public get(): R|kotlin/reflect/KClass| diff --git a/compiler/testData/fir/resolve/treeSet.txt b/compiler/testData/fir/resolve/treeSet.txt index dddea26980c..b65d64c07ed 100644 --- a/compiler/testData/fir/resolve/treeSet.txt +++ b/compiler/testData/fir/resolve/treeSet.txt @@ -1,3 +1,3 @@ FILE: treeSet.kt - public? final? property x(val): R|java/util/SortedSet| = STUB - public? get(): R|java/util/SortedSet| + public final property x(val): R|java/util/SortedSet| = STUB + public get(): R|java/util/SortedSet| diff --git a/compiler/testData/fir/resolve/typeAliasWithGeneric.txt b/compiler/testData/fir/resolve/typeAliasWithGeneric.txt index f3b5a6d74ff..b2df61cf9d8 100644 --- a/compiler/testData/fir/resolve/typeAliasWithGeneric.txt +++ b/compiler/testData/fir/resolve/typeAliasWithGeneric.txt @@ -1,12 +1,12 @@ FILE: typeAliasWithGeneric.kt - public? open class A { - public? constructor(): super() + public open class A { + public constructor(): super() } - public? abstract interface B { + public abstract interface B { } - public? final class D : R|C = B| { - public? constructor(): super() + public final class D : R|C = B| { + public constructor(): super() } - public? final typealias C = R|B| + public final typealias C = R|B| diff --git a/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt b/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt index 56cce3ef904..9f2587eb46f 100644 --- a/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt +++ b/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt @@ -1,5 +1,5 @@ FILE: typeParameterInPropertyReceiver.kt - public? final? property self R|T|.(val): R|T| - public? get(): R|T| { + public final property self R|T|.(val): R|T| + public get(): R|T| { STUB } diff --git a/compiler/testData/fir/resolve/typeParameterVsNested.txt b/compiler/testData/fir/resolve/typeParameterVsNested.txt index f87d7e759d0..78ff0442ff2 100644 --- a/compiler/testData/fir/resolve/typeParameterVsNested.txt +++ b/compiler/testData/fir/resolve/typeParameterVsNested.txt @@ -1,27 +1,27 @@ FILE: typeParameterVsNested.kt - public? abstract interface Some { + public abstract interface Some { } - public? abstract class My { - public? constructor(): super() + public abstract class My { + public constructor(): super() - public? final inner class T { - public? constructor(): super() + public final inner class T { + public constructor(): super() } - public? abstract property x(val): R|T| - public? get(): R|T| + public abstract property x(val): R|T| + public get(): R|T| - public? abstract function foo(arg: R|T|): R|kotlin/Unit| + public abstract function foo(arg: R|T|): R|kotlin/Unit| - public? abstract property y(val): R|test/My.T| - public? get(): R|test/My.T| + public abstract property y(val): R|test/My.T| + public get(): R|test/My.T| - public? abstract property z(val): R|test/My.T| - public? get(): R|test/My.T| + public abstract property z(val): R|test/My.T| + public get(): R|test/My.T| - public? final class Some : R|test/My.T| { - public? constructor(): super() + public final class Some : R|test/My.T| { + public constructor(): super() } diff --git a/compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java b/compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java index a0627911600..5a58002d27a 100644 --- a/compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java @@ -106,8 +106,7 @@ public class FirResolveTestCaseGenerated extends AbstractFirResolveTestCase { @TestMetadata("typeParameterInPropertyReceiver.kt") public void testTypeParameterInPropertyReceiver() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/fir/resolve/typeParameterInPropertyReceiver.kt"); - doTest(fileName); + runTest("compiler/testData/fir/resolve/typeParameterInPropertyReceiver.kt"); } @TestMetadata("typeParameterVsNested.kt") @@ -133,6 +132,44 @@ public class FirResolveTestCaseGenerated extends AbstractFirResolveTestCase { } } + @TestMetadata("compiler/testData/fir/resolve/fromBuilder") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class FromBuilder extends AbstractFirResolveTestCase { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInFromBuilder() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/fir/resolve/fromBuilder"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("complexTypes.kt") + public void testComplexTypes() throws Exception { + runTest("compiler/testData/fir/resolve/fromBuilder/complexTypes.kt"); + } + + @TestMetadata("enums.kt") + public void testEnums() throws Exception { + runTest("compiler/testData/fir/resolve/fromBuilder/enums.kt"); + } + + @TestMetadata("noPrimaryConstructor.kt") + public void testNoPrimaryConstructor() throws Exception { + runTest("compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.kt"); + } + + @TestMetadata("simpleClass.kt") + public void testSimpleClass() throws Exception { + runTest("compiler/testData/fir/resolve/fromBuilder/simpleClass.kt"); + } + + @TestMetadata("typeParameters.kt") + public void testTypeParameters() throws Exception { + runTest("compiler/testData/fir/resolve/fromBuilder/typeParameters.kt"); + } + } + @TestMetadata("compiler/testData/fir/resolve/multifile") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java b/compiler/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java index 98b770d103a..ab14f36039e 100644 --- a/compiler/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java @@ -98,8 +98,7 @@ public class RawFirBuilderTestCaseGenerated extends AbstractRawFirBuilderTestCas @TestMetadata("noPrimaryConstructor.kt") public void testNoPrimaryConstructor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.kt"); - doRawFirTest(fileName); + runTest("compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.kt"); } @TestMetadata("simpleClass.kt")